diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-04-24 13:01:00 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-04-24 13:01:00 +0000 |
| commit | 17b4a7be9a4db0333feba22c20ca456b565b47a8 (patch) | |
| tree | b62204c0c68b811e88ab4a7d02d6b40b956df884 | |
| parent | 02ffd327f2c6cbba4ffd7a6d715da17afab62d8e (diff) | |
apic_address should be 32 bits, rather than paddr_t; prepares us for
paddr_t changing from 32 bits.
From mickey's original PAE work of a year ago
Tested by myself and nick@; ok art@
| -rw-r--r-- | sys/arch/i386/i386/mpbios.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/apicvar.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c index 5157a990767..5a14e0798a4 100644 --- a/sys/arch/i386/i386/mpbios.c +++ b/sys/arch/i386/i386/mpbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbios.c,v 1.21 2007/02/20 21:15:01 tom Exp $ */ +/* $OpenBSD: mpbios.c,v 1.22 2007/04/24 13:00:59 tom Exp $ */ /* $NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $ */ /*- @@ -1024,7 +1024,7 @@ mpbios_ioapic(const u_int8_t *ent, struct device *self) aaa.aaa_name = "ioapic"; aaa.apic_id = entry->apic_id; aaa.apic_version = entry->apic_version; - aaa.apic_address = (paddr_t)entry->apic_address; + aaa.apic_address = (u_int32_t)entry->apic_address; aaa.apic_vecbase = -1; aaa.flags = (mp_fps->mpfb2 & 0x80) ? IOAPIC_PICMODE : IOAPIC_VWIRE; diff --git a/sys/arch/i386/include/apicvar.h b/sys/arch/i386/include/apicvar.h index f81773835a9..00d5325331e 100644 --- a/sys/arch/i386/include/apicvar.h +++ b/sys/arch/i386/include/apicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvar.h,v 1.3 2006/05/09 18:41:22 kettenis Exp $ */ +/* $OpenBSD: apicvar.h,v 1.4 2007/04/24 13:00:59 tom Exp $ */ /* $NetBSD: apicvar.h,v 1.1.2.3 2000/02/27 20:25:00 sommerfeld Exp $ */ /*- @@ -49,7 +49,7 @@ struct apic_attach_args { int flags; #define IOAPIC_PICMODE 0x01 #define IOAPIC_VWIRE 0x02 - paddr_t apic_address; + u_int32_t apic_address; int apic_vecbase; }; |