diff options
| author |   Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-27 23:54:31 +0300 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:31 +0200 |
| commit | e81b2c62d66068d210ddeacd77076068184d414a (patch) | |
| tree | 6518b343a6d649a0778fb586960d654e5611a644 | |
| parent | x86: don't use MP_processor_info for ACPI mode (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>
| -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: * This initializes the IO-APIC and APIC hardware if this is * a UP kernel. */ + +int apic_version[MAX_APICS]; + int __init APIC_init_uniprocessor(void) { 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; * Various Linux-internal data structures created from the * MP-table. */ -int apic_version [MAX_APICS]; #if defined (CONFIG_MCA) || defined (CONFIG_EISA) int mp_bus_id_to_type [MAX_MP_BUSSES]; #endif |