From 4a7942d0d59635920bf252851ba12bc3ffd3c846 Mon Sep 17 00:00:00 2001
From: fsmp <fsmp@FreeBSD.org>
Date: Sat, 24 Jun 2000 23:55:38 +0000
Subject: Fixed atpic_attach() for the SMP (specifically APIC_IO) case.

Approved by:	msmith@freebsd.org
---
 sys/amd64/isa/intr_machdep.c | 3 ++-
 sys/amd64/isa/nmi.c          | 3 ++-
 sys/i386/isa/intr_machdep.c  | 3 ++-
 sys/i386/isa/nmi.c           | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index 16c6160..576b054 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -66,6 +66,7 @@
 #if defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/smptests.h>			/** FAST_HI */
+#include <machine/resource.h>
 #endif /* APIC_IO */
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
@@ -188,7 +189,7 @@ atpic_attach(device_t dev)
 {
 #ifdef APIC_IO
 	int		rid;
-	bus_resource_t	res;
+	struct resource *res;
 
 	/* try to allocate our IRQ and then free it */
 	rid = 0;
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 16c6160..576b054 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -66,6 +66,7 @@
 #if defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/smptests.h>			/** FAST_HI */
+#include <machine/resource.h>
 #endif /* APIC_IO */
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
@@ -188,7 +189,7 @@ atpic_attach(device_t dev)
 {
 #ifdef APIC_IO
 	int		rid;
-	bus_resource_t	res;
+	struct resource *res;
 
 	/* try to allocate our IRQ and then free it */
 	rid = 0;
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 16c6160..576b054 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -66,6 +66,7 @@
 #if defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/smptests.h>			/** FAST_HI */
+#include <machine/resource.h>
 #endif /* APIC_IO */
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
@@ -188,7 +189,7 @@ atpic_attach(device_t dev)
 {
 #ifdef APIC_IO
 	int		rid;
-	bus_resource_t	res;
+	struct resource *res;
 
 	/* try to allocate our IRQ and then free it */
 	rid = 0;
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 16c6160..576b054 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -66,6 +66,7 @@
 #if defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/smptests.h>			/** FAST_HI */
+#include <machine/resource.h>
 #endif /* APIC_IO */
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
@@ -188,7 +189,7 @@ atpic_attach(device_t dev)
 {
 #ifdef APIC_IO
 	int		rid;
-	bus_resource_t	res;
+	struct resource *res;
 
 	/* try to allocate our IRQ and then free it */
 	rid = 0;
-- 
cgit v1.1