aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/smpboot.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 17:46:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 17:46:47 -0700
commit9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (patch)
tree862a9fa39ce2d33156b815e1f7352038287579bf /arch/ia64/kernel/smpboot.c
parentc5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9 (diff)
parent4ec37de89d8c758ee8115e0e64b3f994910789ee (diff)
downloadmrst-s0i3-test-9dda696f0de87a2e5cfabb147e28c76b7d3c6846.tar.gz
mrst-s0i3-test-9dda696f0de87a2e5cfabb147e28c76b7d3c6846.tar.xz
mrst-s0i3-test-9dda696f0de87a2e5cfabb147e28c76b7d3c6846.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build breakage
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
-rw-r--r--arch/ia64/kernel/smpboot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 518e876a410..6a1380e90f8 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -390,11 +390,13 @@ smp_callin (void)
fix_b0_for_bsp();
+#ifdef CONFIG_NUMA
/*
* numa_node_id() works after this.
*/
set_numa_node(cpu_to_node_map[cpuid]);
set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
+#endif
ipi_call_lock_irq();
spin_lock(&vector_lock);
@@ -638,7 +640,9 @@ void __devinit smp_prepare_boot_cpu(void)
{
cpu_set(smp_processor_id(), cpu_online_map);
cpu_set(smp_processor_id(), cpu_callin_map);
+#ifdef CONFIG_NUMA
set_numa_node(cpu_to_node_map[smp_processor_id()]);
+#endif
per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
paravirt_post_smp_prepare_boot_cpu();
}