aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/head.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc64/kernel/head.S')
-rw-r--r--arch/ppc64/kernel/head.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index bf2345eb133c..c7462fae7662 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -148,7 +148,7 @@ _GLOBAL(__secondary_hold)
148 std r24,__secondary_hold_acknowledge@l(0) 148 std r24,__secondary_hold_acknowledge@l(0)
149 sync 149 sync
150 150
151 /* All secondary cpu's wait here until told to start. */ 151 /* All secondary cpus wait here until told to start. */
152100: ld r4,__secondary_hold_spinloop@l(0) 152100: ld r4,__secondary_hold_spinloop@l(0)
153 cmpdi 0,r4,1 153 cmpdi 0,r4,1
154 bne 100b 154 bne 100b
@@ -703,8 +703,8 @@ machine_check_common:
703 * R9 contains the saved CR, r13 points to the paca, 703 * R9 contains the saved CR, r13 points to the paca,
704 * r10 contains the (bad) kernel stack pointer, 704 * r10 contains the (bad) kernel stack pointer,
705 * r11 and r12 contain the saved SRR0 and SRR1. 705 * r11 and r12 contain the saved SRR0 and SRR1.
706 * We switch to using the paca guard page as an emergency stack, 706 * We switch to using an emergency stack, save the registers there,
707 * save the registers there, and call kernel_bad_stack(), which panics. 707 * and call kernel_bad_stack(), which panics.
708 */ 708 */
709bad_stack: 709bad_stack:
710 ld r1,PACAEMERGSP(r13) 710 ld r1,PACAEMERGSP(r13)
@@ -1303,7 +1303,7 @@ _GLOBAL(pSeries_secondary_smp_init)
1303 b .kexec_wait /* next kernel might do better */ 1303 b .kexec_wait /* next kernel might do better */
1304 1304
13052: mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */ 13052: mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */
1306 /* From now on, r24 is expected to be logica cpuid */ 1306 /* From now on, r24 is expected to be logical cpuid */
1307 mr r24,r5 1307 mr r24,r5
13083: HMT_LOW 13083: HMT_LOW
1309 lbz r23,PACAPROCSTART(r13) /* Test if this processor should */ 1309 lbz r23,PACAPROCSTART(r13) /* Test if this processor should */