From 3377b26acb6bcbe97f5100eb2eb1518a96cb43a4 Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Fri, 16 Jan 2009 15:58:13 -0800 Subject: [PATCH] --- yaml --- r: 136478 b: refs/heads/master c: cef30b3a84e1c7cbd49987d83c5863c001445842 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d6b84e0a6442..d23e39f9a4a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6eb714c63ed5bd663627f7dda8c4d5258f3b64ef +refs/heads/master: cef30b3a84e1c7cbd49987d83c5863c001445842 diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c index 0f830e4f5675..db0998641c58 100644 --- a/trunk/arch/x86/kernel/apic.c +++ b/trunk/arch/x86/kernel/apic.c @@ -1833,6 +1833,11 @@ void __cpuinit generic_processor_info(int apicid, int version) num_processors++; cpu = cpumask_next_zero(-1, cpu_present_mask); + if (version != apic_version[boot_cpu_physical_apicid]) + WARN_ONCE(1, + "ACPI: apic version mismatch, bootcpu: %x cpu %d: %x\n", + apic_version[boot_cpu_physical_apicid], cpu, version); + physid_set(apicid, phys_cpu_present_map); if (apicid == boot_cpu_physical_apicid) { /*