From 69271785f1156a69cbbcfd675d40b044eee3c3b0 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 21 Aug 2008 01:01:19 -0700 Subject: [PATCH] --- yaml --- r: 112739 b: refs/heads/master c: 11494547b1754c4f3bd7f707ab869e2adf54d52f h: refs/heads/master i: 112737: e37d4e8a070e83102944b3c9f2fea9cd4053925c 112735: 611425d8edf06db7a068f57e918a625984573b4a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/boot.c | 4 ---- trunk/include/asm-x86/mpspec.h | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 87b23cae5c77..591823e1960b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4 +refs/heads/master: 11494547b1754c4f3bd7f707ab869e2adf54d52f diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c index 12e260e8fb2a..d9770a56511a 100644 --- a/trunk/arch/x86/kernel/acpi/boot.c +++ b/trunk/arch/x86/kernel/acpi/boot.c @@ -239,10 +239,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled) return; } -#ifdef CONFIG_X86_32 if (boot_cpu_physical_apicid != -1U) ver = apic_version[boot_cpu_physical_apicid]; -#endif generic_processor_info(id, ver); } @@ -762,10 +760,8 @@ static void __init acpi_register_lapic_address(unsigned long address) set_fixmap_nocache(FIX_APIC_BASE, address); if (boot_cpu_physical_apicid == -1U) { boot_cpu_physical_apicid = read_apic_id(); -#ifdef CONFIG_X86_32 apic_version[boot_cpu_physical_apicid] = GET_APIC_VERSION(apic_read(APIC_LVR)); -#endif } } diff --git a/trunk/include/asm-x86/mpspec.h b/trunk/include/asm-x86/mpspec.h index 118da365e371..be2241a818f1 100644 --- a/trunk/include/asm-x86/mpspec.h +++ b/trunk/include/asm-x86/mpspec.h @@ -5,11 +5,12 @@ #include +extern int apic_version[MAX_APICS]; + #ifdef CONFIG_X86_32 #include extern unsigned int def_to_bigsmp; -extern int apic_version[MAX_APICS]; extern u8 apicid_2_node[]; extern int pic_mode;