From c5e2534ddd2c95061366acf874caf4430d7f8766 Mon Sep 17 00:00:00 2001 From: "travis@sgi.com" Date: Wed, 30 Jan 2008 13:33:33 +0100 Subject: [PATCH] --- yaml --- r: 80391 b: refs/heads/master c: 1ce357129a55a791318e23f5d7b8a9f1352858aa h: refs/heads/master i: 80389: f92ba8e36b14d530a3c1ea731eed6e3742692ded 80387: fe2e34837188ebc81ae63eb60739d868b558dea4 80383: e13e23c6e7cdde50b1ecc2e62f8eb5ff2d816170 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_64.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bed04fc16acd..ce54075b1a0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6c4dc6c36b01d33a2e0c8a89828d8dd44fb4c1b +refs/heads/master: 1ce357129a55a791318e23f5d7b8a9f1352858aa diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c index 0ca96d86cb71..f0e5cabe49d8 100644 --- a/trunk/arch/x86/mm/numa_64.c +++ b/trunk/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)