1 files changed, 16 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 36c90ba2d312..2de00f870edc 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -413,16 +413,28 @@ void __init smp_setup_cpu_maps(void)
                 of_node_put(dn);
         }
 
+        vdso_data->processorCount = num_present_cpus();
+#endif /* CONFIG_PPC64 */
+}
+
+/*
+ * Being that cpu_sibling_map is now a per_cpu array, then it cannot
+ * be initialized until the per_cpu areas have been created.  This
+ * function is now called from setup_per_cpu_areas().
+ */
+void __init smp_setup_cpu_sibling_map(void)
+{
+#if defined(CONFIG_PPC64)
+        int cpu;
+
         /*
          * Do the sibling map; assume only two threads per processor.
          */
         for_each_possible_cpu(cpu) {
-                cpu_set(cpu, cpu_sibling_map[cpu]);
+                cpu_set(cpu, per_cpu(cpu_sibling_map, cpu));
                 if (cpu_has_feature(CPU_FTR_SMT))
-                        cpu_set(cpu ^ 0x1, cpu_sibling_map[cpu]);
+                        cpu_set(cpu ^ 0x1, per_cpu(cpu_sibling_map, cpu));
         }
-
-        vdso_data->processorCount = num_present_cpus();
 #endif /* CONFIG_PPC64 */
 }
 #endif /* CONFIG_SMP */