aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-21 04:01:19 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-21 05:07:06 -0400
commit11494547b1754c4f3bd7f707ab869e2adf54d52f (patch)
tree795d7051a84aaf9938f5834074df4ac3809b0705
parent1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4 (diff)
x86: fix apic version warning
after following patch, commit 1b313f4a6d7bee7b2c034b3f1e203bc360a71cca Author: Cyrill Gorcunov <gorcunov@gmail.com> Date: Mon Aug 18 20:45:57 2008 +0400 x86: apic - generic_processor_info - use physid_set instead of phys_cpu and physids_or - set phys_cpu_present_map bit AFTER check for allowed number of processors - add checking for APIC valid version in 64bit mode (mostly not needed but added for merging purpose) - add apic_version definition for 64bit mode which is used now we are getting warning for acpi path on 64 bit system. make the 64-bit side fill in apic_version[] as well. [ mingo@elte.hu: build fix ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/acpi/boot.c4
-rw-r--r--include/asm-x86/mpspec.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 12e260e8fb2a..d9770a56511a 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -239,10 +239,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)
239 return; 239 return;
240 } 240 }
241 241
242#ifdef CONFIG_X86_32
243 if (boot_cpu_physical_apicid != -1U) 242 if (boot_cpu_physical_apicid != -1U)
244 ver = apic_version[boot_cpu_physical_apicid]; 243 ver = apic_version[boot_cpu_physical_apicid];
245#endif
246 244
247 generic_processor_info(id, ver); 245 generic_processor_info(id, ver);
248} 246}
@@ -762,10 +760,8 @@ static void __init acpi_register_lapic_address(unsigned long address)
762 set_fixmap_nocache(FIX_APIC_BASE, address); 760 set_fixmap_nocache(FIX_APIC_BASE, address);
763 if (boot_cpu_physical_apicid == -1U) { 761 if (boot_cpu_physical_apicid == -1U) {
764 boot_cpu_physical_apicid = read_apic_id(); 762 boot_cpu_physical_apicid = read_apic_id();
765#ifdef CONFIG_X86_32
766 apic_version[boot_cpu_physical_apicid] = 763 apic_version[boot_cpu_physical_apicid] =
767 GET_APIC_VERSION(apic_read(APIC_LVR)); 764 GET_APIC_VERSION(apic_read(APIC_LVR));
768#endif
769 } 765 }
770} 766}
771 767
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
index 118da365e371..be2241a818f1 100644
--- a/include/asm-x86/mpspec.h
+++ b/include/asm-x86/mpspec.h
@@ -5,11 +5,12 @@
5 5
6#include <asm/mpspec_def.h> 6#include <asm/mpspec_def.h>
7 7
8extern int apic_version[MAX_APICS];
9
8#ifdef CONFIG_X86_32 10#ifdef CONFIG_X86_32
9#include <mach_mpspec.h> 11#include <mach_mpspec.h>
10 12
11extern unsigned int def_to_bigsmp; 13extern unsigned int def_to_bigsmp;
12extern int apic_version[MAX_APICS];
13extern u8 apicid_2_node[]; 14extern u8 apicid_2_node[];
14extern int pic_mode; 15extern int pic_mode;
15 16