From owner-p4-projects@FreeBSD.ORG  Fri Sep  3 15:09:48 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E71C16A4D1; Fri,  3 Sep 2004 15:09:48 +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 D692F16A4CE
	for <perforce@freebsd.org>; Fri,  3 Sep 2004 15:09:47 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C62D343D2F
	for <perforce@freebsd.org>; Fri,  3 Sep 2004 15:09:47 +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 i83F9lbu040903
	for <perforce@freebsd.org>; Fri, 3 Sep 2004 15:09:47 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i83F9lw3040900
	for perforce@freebsd.org; Fri, 3 Sep 2004 15:09:47 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 3 Sep 2004 15:09:47 GMT
Message-Id: <200409031509.i83F9lw3040900@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 60957 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, 03 Sep 2004 15:09:48 -0000

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

Change 60957 by jhb@jhb_slimer on 2004/09/03 15:09:00

	- Remove extra line.
	- Merge change to amd64.
	
	Suggested by:  scottl (2)

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#7 edit
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#11 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#7 (text+ko) ====

@@ -725,9 +725,15 @@
 		destfield = dest;
 	}
 
+#ifdef DETECT_DEADLOCK
+	/* Check for an earlier stuck IPI. */
+	if (!lapic_ipi_wait(BEFORE_SPIN))
+		panic("APIC: Previous IPI is stuck");
+#else
 	/* Wait for an earlier IPI to finish. */
-	if (!lapic_ipi_wait(BEFORE_SPIN))
+	if (!lapic_ipi_wait(-1))
 		panic("APIC: Previous IPI is stuck");
+#endif
 
 	lapic_ipi_raw(icrlo, destfield);
 

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

@@ -727,7 +727,6 @@
 
 #ifdef DETECT_DEADLOCK
 	/* Check for an earlier stuck IPI. */
-	/* Wait for an earlier IPI to finish. */
 	if (!lapic_ipi_wait(BEFORE_SPIN))
 		panic("APIC: Previous IPI is stuck");
 #else