svn commit: r230175 - stable/9/sys/kern

[Andriy Gapon]

Author: avg
Date: Sun Jan 15 22:20:52 2012
New Revision: 230175
URL: http://svn.freebsd.org/changeset/base/230175

Log:
  MFC r228265: critical_exit: ignore td_owepreempt if kdb_active is set

Modified:
  stable/9/sys/kern/kern_switch.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/kern/kern_switch.c
==============================================================================
--- stable/9/sys/kern/kern_switch.c	Sun Jan 15 22:18:54 2012	(r230174)
+++ stable/9/sys/kern/kern_switch.c	Sun Jan 15 22:20:52 2012	(r230175)
@@ -200,7 +200,7 @@ critical_exit(void)
 
 	if (td->td_critnest == 1) {
 		td->td_critnest = 0;
-		if (td->td_owepreempt) {
+		if (td->td_owepreempt && !kdb_active) {
 			td->td_critnest = 1;
 			thread_lock(td);
 			td->td_critnest--;