aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/Kconfig4
-rw-r--r--arch/ia64/kernel/smpboot.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 00ba08708873..95610820041e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -502,6 +502,10 @@ config USE_PERCPU_NUMA_NODE_ID
502 def_bool y 502 def_bool y
503 depends on NUMA 503 depends on NUMA
504 504
505config HAVE_MEMORYLESS_NODES
506 def_bool y
507 depends on NUMA
508
505config ARCH_PROC_KCORE_TEXT 509config ARCH_PROC_KCORE_TEXT
506 def_bool y 510 def_bool y
507 depends on PROC_KCORE 511 depends on PROC_KCORE
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 8aae2d9b2680..518e876a410d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -394,6 +394,7 @@ smp_callin (void)
394 * numa_node_id() works after this. 394 * numa_node_id() works after this.
395 */ 395 */
396 set_numa_node(cpu_to_node_map[cpuid]); 396 set_numa_node(cpu_to_node_map[cpuid]);
397 set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
397 398
398 ipi_call_lock_irq(); 399 ipi_call_lock_irq();
399 spin_lock(&vector_lock); 400 spin_lock(&vector_lock);