Incremental patch 2 to numa-x86_64-use-generic-percpu-var-numa_node_id-implementation.patch in 28apr10 mmotm. Use generic function to set numa_node for a specified cpu as suggested by Christoph Lameter and seconded by Tejun Heo. Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx> arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/mm/numa_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/mm/numa_64.c =================================================================== --- linux-2.6.34-rc5-mmotm-100428-1653.orig/arch/x86/mm/numa_64.c +++ linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/mm/numa_64.c @@ -806,7 +806,7 @@ void __cpuinit numa_set_node(int cpu, in per_cpu(x86_cpu_to_node_map, cpu) = node; if (node != NUMA_NO_NODE) - per_cpu(numa_node, cpu) = node; + set_cpu_numa_node(cpu, node); } void __cpuinit numa_clear_node(int cpu) Index: linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/kernel/setup_percpu.c =================================================================== --- linux-2.6.34-rc5-mmotm-100428-1653.orig/arch/x86/kernel/setup_percpu.c +++ linux-2.6.34-rc5-mmotm-100428-1653/arch/x86/kernel/setup_percpu.c @@ -268,7 +268,7 @@ void __init setup_per_cpu_areas(void) * make sure boot cpu numa_node is right, when boot cpu is on the * node that doesn't have mem installed */ - per_cpu(numa_node, boot_cpu_id) = early_cpu_to_node(boot_cpu_id); + set_cpu_numa_node(boot_cpu_id, early_cpu_to_node(boot_cpu_id)); #endif /* Setup node to cpumask map */ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>