From: travis@sgi.com Date: Wed, 30 Jan 2008 12:33:33 +0000 (+0100) Subject: x86: early cpu_to_node fix in numa_64.c X-Git-Tag: v2.6.25-rc1~1143^2~184 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce357129a55a791318e23f5d7b8a9f1352858aa;p=linux-2.6 x86: early cpu_to_node fix in numa_64.c Both of these references to cpu_to_node() can potentially occur before the "late" cpu_to_node map is setup. Therefore, they should be changed to use early_cpu_to_node(). Signed-off-by: Mike Travis Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 0ca96d86cb..f0e5cabe49 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -251,7 +251,7 @@ void __init numa_init_array(void) rr = first_node(node_online_map); for (i = 0; i < NR_CPUS; i++) { - if (cpu_to_node(i) != NUMA_NO_NODE) + if (early_cpu_to_node(i) != NUMA_NO_NODE) continue; numa_set_node(i, rr); rr = next_node(rr, node_online_map); @@ -528,7 +528,8 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) __cpuinit void numa_add_cpu(int cpu) { - set_bit(cpu, (unsigned long *)&node_to_cpumask_map[cpu_to_node(cpu)]); + set_bit(cpu, + (unsigned long *)&node_to_cpumask_map[early_cpu_to_node(cpu)]); } void __cpuinit numa_set_node(int cpu, int node)