diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-27 16:54:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:31 -0400 |
commit | e81b2c62d66068d210ddeacd77076068184d414a (patch) | |
tree | 6518b343a6d649a0778fb586960d654e5611a644 /arch | |
parent | 08bef9d337f26747b9520278872d20f15983fcda (diff) |
x86: move apic_ver array to apic_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 6f506020bd7d..bdfffb091d12 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -1225,6 +1225,9 @@ fake_ioapic_page: | |||
1225 | * This initializes the IO-APIC and APIC hardware if this is | 1225 | * This initializes the IO-APIC and APIC hardware if this is |
1226 | * a UP kernel. | 1226 | * a UP kernel. |
1227 | */ | 1227 | */ |
1228 | |||
1229 | int apic_version[MAX_APICS]; | ||
1230 | |||
1228 | int __init APIC_init_uniprocessor(void) | 1231 | int __init APIC_init_uniprocessor(void) |
1229 | { | 1232 | { |
1230 | if (enable_local_apic < 0) | 1233 | if (enable_local_apic < 0) |
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index 9f23018190c5..18882697987e 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -41,7 +41,6 @@ unsigned int __cpuinitdata maxcpus = NR_CPUS; | |||
41 | * Various Linux-internal data structures created from the | 41 | * Various Linux-internal data structures created from the |
42 | * MP-table. | 42 | * MP-table. |
43 | */ | 43 | */ |
44 | int apic_version [MAX_APICS]; | ||
45 | #if defined (CONFIG_MCA) || defined (CONFIG_EISA) | 44 | #if defined (CONFIG_MCA) || defined (CONFIG_EISA) |
46 | int mp_bus_id_to_type [MAX_MP_BUSSES]; | 45 | int mp_bus_id_to_type [MAX_MP_BUSSES]; |
47 | #endif | 46 | #endif |