summaryrefslogtreecommitdiff
path: root/arch/ppc64/kernel/head.S
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 05:55:58 (GMT)
committerPaul Mackerras <paulus@samba.org>2005-10-22 05:55:58 (GMT)
commitef1a12817aebc313049d226f96eee86e4bcc94a3 (patch)
tree9c20807e70ef93a3e709e38464b627280bf67b36 /arch/ppc64/kernel/head.S
parent529294d59fdc77bf15f00f2308bbeb73e03e7042 (diff)
downloadlinux-ef1a12817aebc313049d226f96eee86e4bcc94a3.tar.xz
ppc64: Simplify secondary CPU startup on powermacs
... for consistency with ppc32, and because this way is neater. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/head.S')
-rw-r--r--arch/ppc64/kernel/head.S25
1 files changed, 11 insertions, 14 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 15c5f0c..f58af9c 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -1556,20 +1556,17 @@ copy_to_here:
.section ".text";
.align 2 ;
- .globl pmac_secondary_start_1
-pmac_secondary_start_1:
- li r24, 1
- b .pmac_secondary_start
-
- .globl pmac_secondary_start_2
-pmac_secondary_start_2:
- li r24, 2
- b .pmac_secondary_start
-
- .globl pmac_secondary_start_3
-pmac_secondary_start_3:
- li r24, 3
- b .pmac_secondary_start
+ .globl __secondary_start_pmac_0
+__secondary_start_pmac_0:
+ /* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
+ li r24,0
+ b 1f
+ li r24,1
+ b 1f
+ li r24,2
+ b 1f
+ li r24,3
+1:
_GLOBAL(pmac_secondary_start)
/* turn on 64-bit mode */