[PATCH] powerpc: Make UP -> SMP kexec work again

For UP to SMP kexec to work we need to jump into pSeries_secondary_smp_init
event on a UP + KEXEC kernel. The secondary cpus will not find their hw_cpu_id
in the paca and so they'll jump into kexec_wait, ready for a kexec.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2006-02-16 14:13:51 +11:00 committed by Paul Mackerras
parent f018b36f3e
commit 8fca92705e

View file

@ -157,8 +157,7 @@ _GLOBAL(__secondary_hold)
SET_REG_IMMEDIATE(r4, .hmt_init) SET_REG_IMMEDIATE(r4, .hmt_init)
mtctr r4 mtctr r4
bctr bctr
#else #elif defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
#ifdef CONFIG_SMP
LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init) LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init)
mtctr r4 mtctr r4
mr r3,r24 mr r3,r24
@ -166,7 +165,6 @@ _GLOBAL(__secondary_hold)
#else #else
BUG_OPCODE BUG_OPCODE
#endif #endif
#endif
/* This value is used to mark exception frames on the stack. */ /* This value is used to mark exception frames on the stack. */
.section ".toc","aw" .section ".toc","aw"