2 files changed, 9 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 4866d5dbd420..71e186d5f331 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -380,8 +380,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                 /*
                  * numa_node_id() works after this.
                  */
-                set_cpu_numa_node(cpu, numa_cpu_lookup_table[cpu]);
-                set_cpu_numa_mem(cpu, local_memory_node(numa_cpu_lookup_table[cpu]));
+                if (cpu_present(cpu)) {
+                        set_cpu_numa_node(cpu, numa_cpu_lookup_table[cpu]);
+                        set_cpu_numa_mem(cpu,
+                                local_memory_node(numa_cpu_lookup_table[cpu]));
+                }
         }
 
         cpumask_set_cpu(boot_cpuid, cpu_sibling_mask(boot_cpuid));
@@ -729,6 +732,9 @@ void start_secondary(void *unused)
         }
         traverse_core_siblings(cpu, true);
 
+        set_numa_node(numa_cpu_lookup_table[cpu]);
+        set_numa_mem(local_memory_node(numa_cpu_lookup_table[cpu]));
+
         smp_wmb();
         notify_cpu_starting(cpu);
         set_cpu_online(cpu, true);
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 9918c0200857..3a9061e9f5dd 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1127,7 +1127,7 @@ void __init do_init_bootmem(void)
          * even before we online them, so that we can use cpu_to_{node,mem}
          * early in boot, cf. smp_prepare_cpus().
          */
-        for_each_possible_cpu(cpu) {
+        for_each_present_cpu(cpu) {
                 numa_setup_cpu((unsigned long)cpu);
         }
 }