Tue Dec 6 18:04:31 2011 UTC ()
Do not protect wrong KASSERT by LOCKEDBUG ifdef/endif, the latter uses
its own mecanism. Kill them both.
From discussion with pooka@.


(njoly)
diff -r1.54 -r1.55 src/sys/rump/librump/rumpkern/locks.c

cvs diff -r1.54 -r1.55 src/sys/rump/librump/rumpkern/locks.c (expand / switch to context diff)
--- src/sys/rump/librump/rumpkern/locks.c 2011/03/21 16:41:08 1.54
+++ src/sys/rump/librump/rumpkern/locks.c 2011/12/06 18:04:31 1.55
@@ -1,4 +1,4 @@
-/*	$NetBSD: locks.c,v 1.54 2011/03/21 16:41:08 pooka Exp $	*/
+/*	$NetBSD: locks.c,v 1.55 2011/12/06 18:04:31 njoly Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.54 2011/03/21 16:41:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.55 2011/12/06 18:04:31 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -222,9 +222,6 @@
 rw_downgrade(krwlock_t *rw)
 {
 
-#ifdef LOCKDEBUG
-	KASSERT(!rw_write_held(rw));
-#endif
 	/*
 	 * XXX HACK: How we can downgrade re lock in rump properly.
 	 */