Module Name: src
Committed By: njoly
Date: Tue Dec 6 18:04:31 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: locks.c
Log Message:
Do not protect wrong KASSERT by LOCKEDBUG ifdef/endif, the latter uses
its own mecanism. Kill them both.
>From discussion with pooka@.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/rump/librump/rumpkern/locks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.54 src/sys/rump/librump/rumpkern/locks.c:1.55
--- src/sys/rump/librump/rumpkern/locks.c:1.54 Mon Mar 21 16:41:08 2011
+++ src/sys/rump/librump/rumpkern/locks.c Tue Dec 6 18:04:31 2011
@@ -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 @@ void
rw_downgrade(krwlock_t *rw)
{
-#ifdef LOCKDEBUG
- KASSERT(!rw_write_held(rw));
-#endif
/*
* XXX HACK: How we can downgrade re lock in rump properly.
*/
