From owner-svn-src-user@FreeBSD.ORG  Sat May 23 02:48:15 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B0A0106566B;
	Sat, 23 May 2009 02:48:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59C598FC13;
	Sat, 23 May 2009 02:48:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4N2mFxj026605;
	Sat, 23 May 2009 02:48:15 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4N2mFQp026604;
	Sat, 23 May 2009 02:48:15 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905230248.n4N2mFQp026604@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 23 May 2009 02:48:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192619 - user/kmacy/releng_7_2_fcs/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 May 2009 02:48:15 -0000

Author: kmacy
Date: Sat May 23 02:48:15 2009
New Revision: 192619
URL: http://svn.freebsd.org/changeset/base/192619

Log:
  allow non-sleepable lock in cv_wait

Modified:
  user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Sat May 23 02:31:41 2009	(r192618)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Sat May 23 02:48:15 2009	(r192619)
@@ -106,7 +106,7 @@ _cv_wait(struct cv *cvp, struct lock_obj
 		ktrcsw(1, 0);
 #endif
 	CV_ASSERT(cvp, lock, td);
-	WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,
+	WITNESS_WARN(WARN_GIANTOK, lock,
 	    "Waiting on \"%s\"", cvp->cv_description);
 	WITNESS_SAVE(lock, lock_witness);
 	class = LOCK_CLASS(lock);