Module Name: src
Committed By: matt
Date: Thu Apr 14 05:33:20 UTC 2011
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
Add an assert to make sure no unexpected spinlocks are held in mi_switch
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/sys/kern/kern_synch.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/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.286 src/sys/kern/kern_synch.c:1.287
--- src/sys/kern/kern_synch.c:1.286 Mon Jan 3 13:22:32 2011
+++ src/sys/kern/kern_synch.c Thu Apr 14 05:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.286 2011/01/03 13:22:32 pooka Exp $ */
+/* $NetBSD: kern_synch.c,v 1.287 2011/04/14 05:33:20 matt Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.286 2011/01/03 13:22:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.287 2011/04/14 05:33:20 matt Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -739,6 +739,9 @@
* of the last lock - we must remain at IPL_SCHED during
* the context switch.
*/
+ KASSERTMSG(ci->ci_mtx_count == -1,
+ ("%s: cpu%u: ci_mtx_count (%d) != -1",
+ __func__, cpu_index(ci), ci->ci_mtx_count));
oldspl = MUTEX_SPIN_OLDSPL(ci);
ci->ci_mtx_count--;
lwp_unlock(l);
