diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-20 07:55:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:59 -0400 |
commit | c0a282c251181aa423d4831719613b8286b5b839 (patch) | |
tree | 8083d4d0e0b28a1640c5d640cc69e5e33596e0a1 /include/asm-x86/mpspec.h | |
parent | 9e0a2de2684372f16130b753efdbf226a997efb0 (diff) |
x86: make mp_bus_id_to_type optional
[ mingo@elte.hu: fix boot regression. ]
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mpspec.h')
-rw-r--r-- | include/asm-x86/mpspec.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h index 75df88e0a270..5fa8b8bb7d00 100644 --- a/include/asm-x86/mpspec.h +++ b/include/asm-x86/mpspec.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #ifdef CONFIG_X86_32 | 6 | #ifdef CONFIG_X86_32 |
7 | #include <mach_mpspec.h> | 7 | #include <mach_mpspec.h> |
8 | 8 | ||
9 | extern int mp_bus_id_to_type[MAX_MP_BUSSES]; | ||
10 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; | 9 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; |
11 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; | 10 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; |
12 | 11 | ||
@@ -28,7 +27,12 @@ extern void early_get_smp_config(void); | |||
28 | 27 | ||
29 | #endif | 28 | #endif |
30 | 29 | ||
30 | #if defined(CONFIG_MCA) || defined(CONFIG_EISA) | ||
31 | extern int mp_bus_id_to_type[MAX_MP_BUSSES]; | ||
32 | #endif | ||
33 | |||
31 | extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | 34 | extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); |
35 | |||
32 | extern int mp_bus_id_to_pci_bus[MAX_MP_BUSSES]; | 36 | extern int mp_bus_id_to_pci_bus[MAX_MP_BUSSES]; |
33 | 37 | ||
34 | extern unsigned int boot_cpu_physical_apicid; | 38 | extern unsigned int boot_cpu_physical_apicid; |