Commit 8fca9270 authored Feb 16, 2006 by Michael Ellerman Committed by Paul Mackerras Feb 20, 2006

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

parent f018b36f

arch/powerpc/kernel/head_64.S

+1 −3

Original line number	Diff line number	Diff line
		@@ -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"