powerpc/smp: Make start_secondary_resume available to all CPU variants

This should fix SMP & Hotplug builds on FSL BookE and 476

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c5c24beb838797c9aa0c2891f82754fef7b9009b..98c4b29a56f4587c10ba5cbf39aebb1d3b2253ff 100644 (file)
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -890,15 +890,6 @@ __secondary_start:
        mtspr   SPRN_SRR1,r4
        SYNC
        RFI
-
-_GLOBAL(start_secondary_resume)
-       /* Reset stack */
-       rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
-       addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
-       li      r3,0
-       std     r3,0(r1)                /* Zero the stack frame pointer */
-       bl      start_secondary
-       b       .
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_KVM_BOOK3S_HANDLER

diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 094bd9821ad45b978510d9627ec5c1b2a7b3e5e7..402560e957bd822e5d71e91ad6eafe2c8d05c87e 100644 (file)
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -694,6 +694,17 @@ _GLOBAL(kernel_thread)
        addi    r1,r1,16
        blr
 
+#ifdef CONFIG_SMP
+_GLOBAL(start_secondary_resume)
+       /* Reset stack */
+       rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
+       addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
+       li      r3,0
+       std     r3,0(r1)                /* Zero the stack frame pointer */
+       bl      start_secondary
+       b       .
+#endif /* CONFIG_SMP */
+       
 /*
  * This routine is just here to keep GCC happy - sigh...
  */