Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/librump/rumpkern Do not protect wrong KASSERT by LO...



details:   https://anonhg.NetBSD.org/src/rev/839a93d9a69d
branches:  trunk
changeset: 771887:839a93d9a69d
user:      njoly <njoly%NetBSD.org@localhost>
date:      Tue Dec 06 18:04:31 2011 +0000

description:
Do not protect wrong KASSERT by LOCKEDBUG ifdef/endif, the latter uses
its own mecanism. Kill them both.
>From discussion with pooka@.

diffstat:

 sys/rump/librump/rumpkern/locks.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 91907bca3d9e -r 839a93d9a69d sys/rump/librump/rumpkern/locks.c
--- a/sys/rump/librump/rumpkern/locks.c Mon Dec 05 23:04:39 2011 +0000
+++ b/sys/rump/librump/rumpkern/locks.c Tue Dec 06 18:04:31 2011 +0000
@@ -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.
         */



Home | Main Index | Thread Index | Old Index