diff options
| author | travis@sgi.com <travis@sgi.com> | 2008-01-30 13:33:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:33 +0100 |
| commit | 1ce357129a55a791318e23f5d7b8a9f1352858aa (patch) | |
| tree | 4d6ba4f507140d31f5564a17e52773b3c31e0a81 | |
| parent | e6c4dc6c36b01d33a2e0c8a89828d8dd44fb4c1b (diff) | |
| download | op-kernel-dev-1ce357129a55a791318e23f5d7b8a9f1352858aa.zip op-kernel-dev-1ce357129a55a791318e23f5d7b8a9f1352858aa.tar.gz | |
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 <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/mm/numa_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 0ca96d8..f0e5cab 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) |
