aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/numa_64.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 0ca96d86cb71..f0e5cabe49d8 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)
251 251
252 rr = first_node(node_online_map); 252 rr = first_node(node_online_map);
253 for (i = 0; i < NR_CPUS; i++) { 253 for (i = 0; i < NR_CPUS; i++) {
254 if (cpu_to_node(i) != NUMA_NO_NODE) 254 if (early_cpu_to_node(i) != NUMA_NO_NODE)
255 continue; 255 continue;
256 numa_set_node(i, rr); 256 numa_set_node(i, rr);
257 rr = next_node(rr, node_online_map); 257 rr = next_node(rr, node_online_map);
@@ -528,7 +528,8 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
528 528
529__cpuinit void numa_add_cpu(int cpu) 529__cpuinit void numa_add_cpu(int cpu)
530{ 530{
531 set_bit(cpu, (unsigned long *)&node_to_cpumask_map[cpu_to_node(cpu)]); 531 set_bit(cpu,
532 (unsigned long *)&node_to_cpumask_map[early_cpu_to_node(cpu)]);
532} 533}
533 534
534void __cpuinit numa_set_node(int cpu, int node) 535void __cpuinit numa_set_node(int cpu, int node)