Module Name: src
Committed By: pooka
Date: Wed Mar 9 18:15:39 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: locks.c
Log Message:
Mark cv_wait mutex as locked before doing any further dances.
Fixes a LOCKDEBUG panic in case the uncommon condition is hit.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/rump/librump/rumpkern/locks.c:1.52
--- src/sys/rump/librump/rumpkern/locks.c:1.51 Tue Mar 8 12:39:29 2011
+++ src/sys/rump/librump/rumpkern/locks.c Wed Mar 9 18:15:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.51 2011/03/08 12:39:29 pooka Exp $ */
+/* $NetBSD: locks.c,v 1.52 2011/03/09 18:15:39 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.51 2011/03/08 12:39:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.52 2011/03/09 18:15:39 pooka Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -305,6 +305,8 @@
rumpuser_cv_wait(RUMPCV(cv), RUMPMTX(mtx));
}
+ LOCKED(mtx, false);
+
/*
* Check for QEXIT. if so, we need to wait here until we
* are allowed to exit.
@@ -330,8 +332,6 @@
}
l->l_private = NULL;
- LOCKED(mtx, false);
-
return rv;
}
