Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Jan 2012 22:23:42 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r230176 - stable/8/sys/kern
Message-ID:  <201201152223.q0FMNg0Y003422@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Sun Jan 15 22:23:41 2012
New Revision: 230176
URL: http://svn.freebsd.org/changeset/base/230176

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

Modified:
  stable/8/sys/kern/kern_switch.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/kern_switch.c
==============================================================================
--- stable/8/sys/kern/kern_switch.c	Sun Jan 15 22:20:52 2012	(r230175)
+++ stable/8/sys/kern/kern_switch.c	Sun Jan 15 22:23:41 2012	(r230176)
@@ -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--;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201152223.q0FMNg0Y003422>