From owner-p4-projects@FreeBSD.ORG  Mon Dec  6 22:55:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F16E16A4D0; Mon,  6 Dec 2004 22:55:18 +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 6108E16A4CE
	for <perforce@freebsd.org>; Mon,  6 Dec 2004 22:55:18 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 28B5E43D68
	for <perforce@freebsd.org>; Mon,  6 Dec 2004 22:55:18 +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 iB6MtIj6017919
	for <perforce@freebsd.org>; Mon, 6 Dec 2004 22:55:18 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB6MtHAC017916
	for perforce@freebsd.org; Mon, 6 Dec 2004 22:55:17 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 6 Dec 2004 22:55:17 GMT
Message-Id: <200412062255.iB6MtHAC017916@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 66591 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, 06 Dec 2004 22:55:19 -0000

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

Change 66591 by peter@peter_daintree on 2004/12/06 22:54:51

	integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#57 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#15 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#8 (text+ko) ====


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

@@ -204,8 +204,6 @@
 		}
 		isrc->is_pic->pic_eoi_source(isrc);
 		error = 0;
-		/* XXX */
-		td->td_pflags &= ~TDP_OWEPREEMPT;
 		critical_exit();
 	} else {
 		/*

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

@@ -330,25 +330,21 @@
 cpu_reset()
 {
 #ifdef SMP
-	if (smp_active == 0) {
-		cpu_reset_real();
-		/* NOTREACHED */
-	} else {
-		u_int map;
+	u_int map;
 
-		printf("cpu_reset called on cpu#%d\n", PCPU_GET(cpuid));
-		map = PCPU_GET(other_cpus) & ~ stopped_cpus;
+	if (smp_active) {
+		map = PCPU_GET(other_cpus) & ~stopped_cpus;
 		if (map != 0) {
 			printf("cpu_reset: Stopping other CPUs\n");
-			stop_cpus(map);		/* Stop all other CPUs */
+			stop_cpus(map);
 		}
 		DELAY(1000000);
 		cpu_reset_real();
 		/* NOTREACHED */
 	}
-#else
+#endif
 	cpu_reset_real();
-#endif
+	/* NOTREACHED */
 }
 
 static void
@@ -357,7 +353,7 @@
 
 	/*
 	 * Attempt to do a CPU reset via the keyboard controller,
-	 * do not turn of the GateA20, as any machine that fails
+	 * do not turn off GateA20, as any machine that fails
 	 * to do the reset here would then end up in no man's land.
 	 */
 
@@ -365,7 +361,8 @@
 	DELAY(500000);	/* wait 0.5 sec to see if that did it */
 	printf("Keyboard reset did not work, attempting CPU shutdown\n");
 	DELAY(1000000);	/* wait 1 sec for printf to complete */
-	/* force a shutdown by unmapping entire address space ! */
+
+	/* Force a shutdown by unmapping entire address space. */
 	bzero((caddr_t)PML4map, PAGE_SIZE);
 
 	/* "good night, sweet prince .... <THUNK!>" */

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