powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID

[deliverable/linux.git] / arch / powerpc / kernel / smp.c

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index e2a4232c5871a19056b0b5b666adb540a17b1403..d7252adea759570911c24acc877fd4631c29973f 100644 (file)
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -390,6 +390,7 @@ void smp_prepare_boot_cpu(void)
 #ifdef CONFIG_PPC64
        paca[boot_cpuid].__current = current;
 #endif
+       set_numa_node(numa_cpu_lookup_table[boot_cpuid]);
        current_set[boot_cpuid] = task_thread_info(current);
 }
 
@@ -750,6 +751,11 @@ void start_secondary(void *unused)
        }
        traverse_core_siblings(cpu, true);
 
+       /*
+        * numa_node_id() works after this.
+        */
+       set_numa_node(numa_cpu_lookup_table[cpu]);
+
        smp_wmb();
        notify_cpu_starting(cpu);
        set_cpu_online(cpu, true);