diff options
| author | fsmp <fsmp@FreeBSD.org> | 2000-06-24 23:55:38 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 2000-06-24 23:55:38 +0000 |
| commit | 4a7942d0d59635920bf252851ba12bc3ffd3c846 (patch) | |
| tree | d6fe7bc6c1622d6f407dc4fcba8fd43b2fe604b2 /sys/amd64 | |
| parent | e37cd78ecc398550f99f6976dfc8622669b33881 (diff) | |
| download | FreeBSD-src-4a7942d0d59635920bf252851ba12bc3ffd3c846.zip FreeBSD-src-4a7942d0d59635920bf252851ba12bc3ffd3c846.tar.gz | |
Fixed atpic_attach() for the SMP (specifically APIC_IO) case.
Approved by: msmith@freebsd.org
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 3 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 3 |
2 files changed, 4 insertions, 2 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; |
