PERFORCE change 42080 for review

[Peter Wemm]

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

Change 42080 by peter at peter_daintree on 2003/11/11 19:24:43

	Stab the 8259A's in the heart real early to make damn
	sure they're dead.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#63 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#63 (text+ko) ====

@@ -113,10 +113,9 @@
 #include <machine/smp.h>
 #endif
 
-#ifdef DEV_ISA
 #include <amd64/isa/icu.h>
-#endif
 
+#include <isa/isareg.h>
 #include <isa/rtc.h>
 #include <sys/ptrace.h>
 #include <machine/sigframe.h>
@@ -1123,6 +1122,10 @@
 	u_int64_t msr;
 	char *env;
 
+	/* Preemptively mask the atpics and leave them shut down */
+	outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff);
+
 	/* Turn on PTE NX (no execute) bit */
 	msr = rdmsr(MSR_EFER) | EFER_NXE;
 	wrmsr(MSR_EFER, msr);