From owner-p4-projects@FreeBSD.ORG  Mon Nov 15 16:30:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85B0516A51C; Mon, 15 Nov 2004 16:30:53 +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 5C57516A51A
	for <perforce@freebsd.org>; Mon, 15 Nov 2004 16:30:53 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36D0C43D2F
	for <perforce@freebsd.org>; Mon, 15 Nov 2004 16:30:53 +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 iAFGUrgk089226
	for <perforce@freebsd.org>; Mon, 15 Nov 2004 16:30:53 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAFGUq70089223
	for perforce@freebsd.org; Mon, 15 Nov 2004 16:30:52 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 15 Nov 2004 16:30:52 GMT
Message-Id: <200411151630.iAFGUq70089223@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 65186 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: Mon, 15 Nov 2004 16:30:54 -0000

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

Change 65186 by jhb@jhb_slimer on 2004/11/15 16:30:32

	Don't recursively panic in this function.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/local_apic.c#18 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/local_apic.c#18 (text+ko) ====

@@ -755,8 +755,12 @@
 	}
 
 	/* Wait for an earlier IPI to finish. */
-	if (!lapic_ipi_wait(BEFORE_SPIN))
-		panic("APIC: Previous IPI is stuck");
+	if (!lapic_ipi_wait(BEFORE_SPIN)) {
+		if (panicstr != NULL)
+			return;
+		else
+			panic("APIC: Previous IPI is stuck");
+	}
 
 	lapic_ipi_raw(icrlo, destfield);