From f2dff08ed467c78531ba7acfbf06a2cf4b11aeb8 Mon Sep 17 00:00:00 2001 From: Ravikiran G Thirumalai Date: Mon, 3 Oct 2005 10:36:28 -0700 Subject: [PATCH] --- yaml --- r: 9566 b: refs/heads/master c: ddea7be0ec8d1374f0b483a81566ed56ec9f3905 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d296813f4b62..3c54d0069e8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d6322b4659216fff76619d3b4088eecbdfa46d5 +refs/heads/master: ddea7be0ec8d1374f0b483a81566ed56ec9f3905 diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index 257f5ba17902..cb28df14ff6f 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/arch/x86_64/kernel/setup.c @@ -967,13 +967,12 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) static void srat_detect_node(void) { #ifdef CONFIG_NUMA - unsigned apicid, node; + unsigned node; int cpu = smp_processor_id(); /* Don't do the funky fallback heuristics the AMD version employs for now. */ - apicid = phys_proc_id[cpu]; - node = apicid_to_node[apicid]; + node = apicid_to_node[hard_smp_processor_id()]; if (node == NUMA_NO_NODE) node = 0; cpu_to_node[cpu] = node;