Messages in this thread Patch in this message | | | Date | Tue, 25 Aug 2009 15:06:58 -0700 | From | Yinghai Lu <> | Subject | [PATCH] x86: use hard_smp_processor_id to get apic id in identify_cpu -v2 |
| |
and leave phys_proc_id to use initial apic id.
otherwise, system with apci id lifting will have wrong apicid in /proc/cpuinfo
-v2: update the one in detect_extended_topology too.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
--- arch/x86/kernel/cpu/addon_cpuid_features.c | 4 ++-- arch/x86/kernel/cpu/common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-2.6/arch/x86/kernel/cpu/common.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/common.c +++ linux-2.6/arch/x86/kernel/cpu/common.c @@ -715,7 +715,7 @@ static void __cpuinit generic_identify(s c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xFF; #ifdef CONFIG_X86_32 # ifdef CONFIG_X86_HT - c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); + c->apicid = hard_smp_processor_id(); # else c->apicid = c->initial_apicid; # endif @@ -772,7 +772,7 @@ static void __cpuinit identify_cpu(struc } #ifdef CONFIG_X86_64 - c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); + c->apicid = hard_smp_processor_id(); #endif /* Index: linux-2.6/arch/x86/kernel/cpu/addon_cpuid_features.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/addon_cpuid_features.c +++ linux-2.6/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -121,9 +121,9 @@ void __cpuinit detect_extended_topology( & core_select_mask; c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, core_plus_mask_width); /* - * Reinit the apicid, now that we have extended initial_apicid. + * Reinit the apicid, now that we have extended apicid ? */ - c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); + c->apicid = hard_smp_processor_id(); c->x86_max_cores = (core_level_siblings / smp_num_siblings);
| |