PERFORCE change 66591 for review
Peter Wemm
peter at FreeBSD.org
Mon Dec 6 14:55:19 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=66591
Change 66591 by peter at 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) ====
More information about the p4-projects
mailing list