From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 19:25:17 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E74616A4D0; Tue, 11 Nov 2003 19:25:17 -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 5326316A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:25:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CD3E943F85
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:25:16 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAC3PGXJ032085
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:25:16 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC3PGsL032082
	for perforce@freebsd.org; Tue, 11 Nov 2003 19:25:16 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 11 Nov 2003 19:25:16 -0800 (PST)
Message-Id: <200311120325.hAC3PGsL032082@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 42080 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: Wed, 12 Nov 2003 03:25:18 -0000

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

Change 42080 by peter@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);