diff options
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 257f5ba17902..cb28df14ff6f 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
| @@ -967,13 +967,12 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) | |||
| 967 | static void srat_detect_node(void) | 967 | static void srat_detect_node(void) |
| 968 | { | 968 | { |
| 969 | #ifdef CONFIG_NUMA | 969 | #ifdef CONFIG_NUMA |
| 970 | unsigned apicid, node; | 970 | unsigned node; |
| 971 | int cpu = smp_processor_id(); | 971 | int cpu = smp_processor_id(); |
| 972 | 972 | ||
| 973 | /* Don't do the funky fallback heuristics the AMD version employs | 973 | /* Don't do the funky fallback heuristics the AMD version employs |
| 974 | for now. */ | 974 | for now. */ |
| 975 | apicid = phys_proc_id[cpu]; | 975 | node = apicid_to_node[hard_smp_processor_id()]; |
| 976 | node = apicid_to_node[apicid]; | ||
| 977 | if (node == NUMA_NO_NODE) | 976 | if (node == NUMA_NO_NODE) |
| 978 | node = 0; | 977 | node = 0; |
| 979 | cpu_to_node[cpu] = node; | 978 | cpu_to_node[cpu] = node; |
