From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 16 Feb 2006 03:13:51 +0000 (+1100)
Subject: [PATCH] powerpc: Make UP -> SMP kexec work again
X-Git-Tag: v2.6.16-rc5~72^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8fca92705ef462f39e7db5a0f7100bcaae91bfd3;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 41565962939..2b03a09fe5e 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -157,8 +157,7 @@ _GLOBAL(__secondary_hold)
 	SET_REG_IMMEDIATE(r4, .hmt_init)
 	mtctr	r4
 	bctr
-#else
-#ifdef CONFIG_SMP
+#elif defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
 	LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init)
 	mtctr	r4
 	mr	r3,r24
@@ -166,7 +165,6 @@ _GLOBAL(__secondary_hold)
 #else
 	BUG_OPCODE
 #endif
-#endif
 
 /* This value is used to mark exception frames on the stack. */
 	.section ".toc","aw"