powerpc: Merge 32-bit CHRP support.

SMP still needs more work but UP gets as far as starting userspace
at least.  This uses the 64-bit-style code for spinning up the cpus.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index cd51fe585fcd..f8673f7b2b2d 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -207,7 +207,7 @@ turn_on_mmu:
         .globl  __secondary_hold
 __secondary_hold:
         /* tell the master we're here */
-        stw     r3,4(0)
+        stw     r3,__secondary_hold_acknowledge@l(0)
 #ifdef CONFIG_SMP
 100:    lwz     r4,0(0)
         /* wait until we're told to start */
@@ -220,6 +220,13 @@ __secondary_hold:
         b       .
 #endif /* CONFIG_SMP */
 
+        .globl  __secondary_hold_spinloop
+__secondary_hold_spinloop:
+        .long   0
+        .globl  __secondary_hold_acknowledge
+__secondary_hold_acknowledge:
+        .long   -1
+
 /*
  * Exception entry code.  This code runs with address translation
  * turned off, i.e. using physical addresses.