[src/trunk]: src/sys/rump/librump/rumpkern track lockdebug data even in the s...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b06b38f76db7
branches:  trunk
changeset: 763083:b06b38f76db7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 09 23:41:24 2011 +0000

description:
track lockdebug data even in the special path

diffstat:

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

diffs (34 lines):

diff -r c69d29a3338a -r b06b38f76db7 sys/rump/librump/rumpkern/locks.c
--- a/sys/rump/librump/rumpkern/locks.c Wed Mar 09 23:40:44 2011 +0000
+++ b/sys/rump/librump/rumpkern/locks.c Wed Mar 09 23:41:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locks.c,v 1.52 2011/03/09 18:15:39 pooka Exp $ */
+/*     $NetBSD: locks.c,v 1.53 2011/03/09 23:41:24 pooka Exp $ */
 
 /*
  * Copyright (c) 2007, 2008 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.52 2011/03/09 18:15:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.53 2011/03/09 23:41:24 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -314,6 +314,7 @@
        if (__predict_false(l->l_flag & LW_RUMP_QEXIT)) {
                struct proc *p = l->l_proc;
 
+               UNLOCKED(mtx, false);
                mutex_exit(mtx); /* drop and retake later */
 
                mutex_enter(p->p_lock);
@@ -328,6 +329,7 @@
                /* ok, we can exit and remove "reference" to l->private */
 
                mutex_enter(mtx);
+               LOCKED(mtx, false);
                rv = EINTR;
        }
        l->l_private = NULL;