diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-12-21 18:49:47 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-12-21 18:49:47 +0000 |
| commit | 3de5604e2caf04b966d719c4930e572d83947d58 (patch) | |
| tree | c1aeb7db60225be4dc46abdedca79764ecd969b6 /sys/arch/amd64/conf | |
| parent | 7731f3f93e4d9f387f756d9c9093394fd7636524 (diff) | |
Change the way we include mpbios code to be similar to what we do on i386.
ok deraadt@
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC.MP | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP index 164926c6b8f..805c23c1ba1 100644 --- a/sys/arch/amd64/conf/GENERIC.MP +++ b/sys/arch/amd64/conf/GENERIC.MP @@ -1,9 +1,8 @@ -# $OpenBSD: GENERIC.MP,v 1.8 2007/01/27 22:48:01 kettenis Exp $ +# $OpenBSD: GENERIC.MP,v 1.9 2008/12/21 18:49:46 kettenis Exp $ include "arch/amd64/conf/GENERIC" option MULTIPROCESSOR -option MPBIOS cpu* at mainbus? ioapic* at mainbus? diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 7ce88984879..d8345e69cc9 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.41 2008/11/09 15:11:19 oga Exp $ +# $OpenBSD: files.amd64,v 1.42 2008/12/21 18:49:46 kettenis Exp $ maxpartitions 16 maxusers 2 16 128 @@ -36,7 +36,9 @@ file arch/amd64/amd64/mp_setperf.c multiprocessor file arch/amd64/amd64/apic.c ioapic | lapic -file arch/amd64/amd64/mpbios.c mpbios +#Intel SMP specification 1.4 +define mpbios +file arch/amd64/amd64/mpbios.c mpbios needs-flag file arch/amd64/amd64/mpbios_intr_fixup.c mpbios & pci @@ -89,7 +91,7 @@ file arch/amd64/amd64/cpu.c cpu define lapic file arch/amd64/amd64/lapic.c lapic needs-flag -device ioapic: lapic +device ioapic: mpbios, lapic attach ioapic at mainbus file arch/amd64/amd64/ioapic.c ioapic needs-flag |