tree 9084036d93c38d3ad64d327c6ce4afe773bace60
parent 556e58febf90c8cb1da25669d0892bf5fd2ddac2
author Olof Johansson <[EMAIL PROTECTED]> Fri, 05 Aug 2005 02:53:29 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Fri, 05 Aug 2005 03:00:53 -0700

[PATCH] ppc64: Fix UP kernel build

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.

Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 arch/ppc64/kernel/head.S          |    2 +-
 arch/ppc64/kernel/machine_kexec.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -2071,7 +2071,7 @@ _GLOBAL(hmt_start_secondary)
-#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)
+#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && 
        /* All secondary cpus are spinning on a common
         * spinloop, release them all now so they can start
diff --git a/arch/ppc64/kernel/machine_kexec.c 
--- a/arch/ppc64/kernel/machine_kexec.c
+++ b/arch/ppc64/kernel/machine_kexec.c
@@ -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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to