From owner-p4-projects@FreeBSD.ORG  Thu Sep 16 15:13:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BFCD16A4D0; Thu, 16 Sep 2004 15:13:57 +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 258E116A4CE
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 15:13:57 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1AE4743D2D
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 15:13:57 +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 i8GFDuLg037788
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 15:13:56 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8GFDueq037785
	for perforce@freebsd.org; Thu, 16 Sep 2004 15:13:56 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 16 Sep 2004 15:13:56 GMT
Message-Id: <200409161513.i8GFDueq037785@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 61618 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: Thu, 16 Sep 2004 15:13:58 -0000

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

Change 61618 by jhb@jhb_slimer on 2004/09/16 15:13:54

	Revert change on amd64 as well and fix a compile tweak on i386.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#8 edit
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#13 edit

Differences ...

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

@@ -725,15 +725,9 @@
 		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(-1))
-		panic("APIC: Previous IPI is stuck");
-#endif
 
 	lapic_ipi_raw(icrlo, destfield);
 

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

@@ -693,8 +693,8 @@
 	intr_restore(eflags);
 }
 
+#define	BEFORE_SPIN	1000000
 #ifdef DETECT_DEADLOCK
-#define	BEFORE_SPIN	1000000
 #define	AFTER_SPIN	1000
 #endif