Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce35712 authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar
Browse files

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: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e6c4dc6c

arch/x86/mm/numa_64.c

+3 −2
Original line number Diff line number Diff line
@@ -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)