From owner-p4-projects@FreeBSD.ORG  Tue Mar  2 11:30:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 223AF16A4DB; Tue,  2 Mar 2004 11:30:23 -0800 (PST)
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 EF99916A4D3
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 11:30:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EA90F43D39
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 11:30:22 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JUMGe098671
	for <perforce@freebsd.org>; Tue, 2 Mar 2004 11:30:22 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JUMid098668
	for perforce@freebsd.org; Tue, 2 Mar 2004 11:30:22 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 2 Mar 2004 11:30:22 -0800 (PST)
Message-Id: <200403021930.i22JUMid098668@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48004 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: Tue, 02 Mar 2004 19:30:23 -0000

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

Change 48004 by peter@peter_daintree on 2004/03/02 11:29:20

	IFi386: stuck ipi detection

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#33 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#33 (text+ko) ====

@@ -696,8 +696,8 @@
 	intr_restore(eflags);
 }
 
+#define	BEFORE_SPIN	1000000
 #ifdef DETECT_DEADLOCK
-#define	BEFORE_SPIN	1000000
 #define	AFTER_SPIN	1000
 #endif
 
@@ -728,11 +728,9 @@
 		destfield = dest;
 	}
 
-#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");
-#endif
 
 	lapic_ipi_raw(icrlo, destfield);