Messages in this thread Patch in this message | | | Date | Sat, 29 Aug 2009 13:17:14 -0700 | From | Yinghai Lu <> | Subject | [PATCH] x86: use hard_smp_processor_id to get apic id for amd k8 cpus |
| |
otherwise, system with apci id lifting will have wrong apicid in /proc/cpuinfo
and use that in srat_detect_node
Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
--- arch/x86/kernel/cpu/amd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Index: linux-2.6/arch/x86/kernel/cpu/amd.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/amd.c +++ linux-2.6/arch/x86/kernel/cpu/amd.c @@ -277,7 +277,7 @@ static void __cpuinit srat_detect_node(s #if defined(CONFIG_NUMA) && defined(CONFIG_X86_64) int cpu = smp_processor_id(); int node; - unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; + unsigned apicid = c->apicid; node = c->phys_proc_id; if (apicid_to_node[apicid] != NUMA_NO_NODE) @@ -437,6 +437,9 @@ static void __cpuinit init_amd(struct cp } if (c->x86 == 0x10 || c->x86 == 0x11) set_cpu_cap(c, X86_FEATURE_REP_GOOD); + + /* get apicid instead of initial apic id from cpuid */ + c->apicid = hard_smp_processor_id(); #else /*
| |