From owner-p4-projects@FreeBSD.ORG  Tue Sep 20 18:08:07 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FE7E16A41F; Tue, 20 Sep 2005 18:08:07 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 36F8616A41F
	for <perforce@freebsd.org>; Tue, 20 Sep 2005 18:08:07 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AEF3D43D48
	for <perforce@freebsd.org>; Tue, 20 Sep 2005 18:08:06 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8KI861x083633
	for <perforce@freebsd.org>; Tue, 20 Sep 2005 18:08:06 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8KI86UY083630
	for perforce@freebsd.org; Tue, 20 Sep 2005 18:08:06 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 20 Sep 2005 18:08:06 GMT
Message-Id: <200509201808.j8KI86UY083630@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>
Cc: 
Subject: PERFORCE change 83988 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 20 Sep 2005 18:08:08 -0000

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

Change 83988 by peter@peter_daintree on 2005/09/20 18:07:10

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#13 integrate
.. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#23 integrate
.. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#16 integrate
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#42 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#33 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#56 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#25 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#74 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#79 integrate
.. //depot/projects/hammer/sys/amd64/include/atomic.h#22 integrate
.. //depot/projects/hammer/sys/amd64/include/legacyvar.h#12 integrate
.. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#6 integrate
.. //depot/projects/hammer/sys/amd64/include/ucontext.h#14 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#31 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#13 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#23 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#16 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/acpica/madt.c#42 (text+ko) ====


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


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

@@ -322,7 +322,7 @@
 		lapic_timer_enable_intr();
 	}
 
-	/* XXX: Performance counter, error, and thermal LVTs */
+	/* XXX: Error and thermal LVTs */
 
 	intr_restore(eflags);
 }
@@ -927,8 +927,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);
 

==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#10 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#25 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/trap.c#74 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#79 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/atomic.h#22 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#12 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#6 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/ucontext.h#14 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#31 (text+ko) ====