PPC64: Fix UP kernel build
PATCH 1/1 PPC64: Fix UP kernel build
Hi,
CONFIG_KEXEC breaks UP builds because of a misspelled smp_release_cpus(). Also, the function isn't defined unless built with CONFIG_SMP but it is needed if we are to go from a UP to SMP kernel. Enable it and document it.
Thanks to Steven Winiecki for reporting this and to Milton for remembering how it's supposed to work and why.
-Olof
Signed-off-by Olof Johansson <[email protected]>
arch/ppc64/kernel/machine_kexec.c +5 -1
@@ -243,13 +243,17 @@ static void kexec_prepare_cpus(void)static void kexec_prepare_cpus (void ) { +extern void smp_release_cpus (void );/* * move the secondarys to us so that we can copy * the new kernel 0-0x100 safely * * do this if kexec in setup.c ? +* +* We need to release the cpus if we are ever going from an +* UP to an SMP kernel. */ -smp_relase_cpus (); +smp_release_cpus ();if (ppc_md.cpu_irq_down) ppc_md.cpu_irq_down ();local_irq_disable ();
arch/ppc64/kernel/head.S +1 -1
@@ -2071,7 +2071,7 @@ _GLOBAL(hmt_start_secondary) blr #endif -#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) +#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)) _GLOBAL(smp_release_cpus) /* All secondary cpus are spinning on a common * spinloop, release them all now so they can start
arch/ppc64/kernel/machine_kexec.c static void kexec_prepare_cpus(void) · line 246
Quoted 9 lines · Olof Johansson
Index:
2.6/arch/ppc64/kernel/machine_kexec.c
===================================================================arch/ppc64/kernel/machine_kexec.c +1
-0@@ -243,13 +243,17 @@ static void kexec_prepare_cpus(void)static void kexec_prepare_cpus (void ) { +extern void smp_release_cpus (void );
Please put this in a header.
Andreas.
Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected] SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."