svn commit: r192619 - user/kmacy/releng_7_2_fcs/sys/kern

[Kip Macy]

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);