From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 19:33:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE73916A4D0; Tue, 11 Nov 2003 19:33:30 -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 BA60B16A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:33:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FBD743FB1
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:33:30 -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 hAC3XUXJ032644
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:33:30 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC3XT1K032641
	for perforce@freebsd.org; Tue, 11 Nov 2003 19:33:29 -0800 (PST)
	(envelope-from peter@freebsd.org)
Message-Id: <200311120333.hAC3XT1K032641@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 42085 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>
Date: Wed, 12 Nov 2003 03:33:31 -0000
X-Original-Date: Tue, 11 Nov 2003 19:33:29 -0800 (PST)
X-List-Received-Date: Wed, 12 Nov 2003 03:33:31 -0000

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

Change 42085 by peter@peter_overcee on 2003/11/11 19:32:45

	sanity check for the outb shootdown for the atpic

Affected files ...

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

Differences ...

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

@@ -48,6 +48,7 @@
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
+#include "opt_isa.h"
 #include "opt_kstack_pages.h"
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
@@ -1122,9 +1123,13 @@
 	u_int64_t msr;
 	char *env;
 
+#ifdef DEV_ISA
 	/* Preemptively mask the atpics and leave them shut down */
 	outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff);
 	outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff);
+#else
+#error "have you forgotten the isa device?";
+#endif
 
 	/* Turn on PTE NX (no execute) bit */
 	msr = rdmsr(MSR_EFER) | EFER_NXE;