From owner-p4-projects@FreeBSD.ORG  Fri Nov 12 17:47:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13C3416A4D1; Fri, 12 Nov 2004 17:47:14 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF54416A4CE
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 17:47:13 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C33D543D48
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 17:47:13 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACHlDa7020368
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 17:47:13 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACHlDc8020365
	for perforce@freebsd.org; Fri, 12 Nov 2004 17:47:13 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 12 Nov 2004 17:47:13 GMT
Message-Id: <200411121747.iACHlDc8020365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 64957 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2004 17:47:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=64957

Change 64957 by jhb@jhb_slimer on 2004/11/12 17:46:12

	Don't recursively panic in sched_bind() if the panic happens on
	another CPU.  Probably panic() needs to better handle the case
	that a panic happens inside of a critical section.  I almost wish
	that panic() transferred to a dedicated shutdown thread instead.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_synch.c#85 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_synch.c#85 (text+ko) ====

@@ -287,7 +287,7 @@
 #endif
 	KASSERT(td->td_critnest == 1 || (td->td_critnest == 2 &&
 	    (td->td_pflags & TDP_OWEPREEMPT) != 0 && (flags & SW_INVOL) != 0 &&
-	    newtd == NULL),
+	    newtd == NULL) || panicstr,
 	    ("mi_switch: switch in a critical section"));
 	KASSERT((flags & (SW_INVOL | SW_VOL)) != 0,
 	    ("mi_switch: switch must be voluntary or involuntary"));