From: Olof Johansson <olof@lixom.net>
To: linux-kernel@vger.kernel.org
Cc: linuxppc64-dev@ozlabs.org, akpm@osdl.org, paulus@samba.org,
anton@samba.org, miltonm@bga.com
Subject: [PATCH] PPC64: Fix UP kernel build
Date: Wed, 3 Aug 2005 20:30:10 -0500 [thread overview]
Message-ID: <20050804013010.GA10556@austin.ibm.com> (raw)
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 <olof@lixom.net>
Index: 2.6/arch/ppc64/kernel/machine_kexec.c
===================================================================
--- 2.6.orig/arch/ppc64/kernel/machine_kexec.c 2005-08-03 19:53:16.000000000 -0500
+++ 2.6/arch/ppc64/kernel/machine_kexec.c 2005-08-03 20:39:49.000000000 -0500
@@ -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();
Index: 2.6/arch/ppc64/kernel/head.S
===================================================================
--- 2.6.orig/arch/ppc64/kernel/head.S 2005-08-03 19:53:16.000000000 -0500
+++ 2.6/arch/ppc64/kernel/head.S 2005-08-03 20:37:22.000000000 -0500
@@ -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
next reply other threads:[~2005-08-04 1:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-04 1:30 Olof Johansson [this message]
2005-08-04 12:08 ` [PATCH] PPC64: Fix UP kernel build Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050804013010.GA10556@austin.ibm.com \
--to=olof@lixom.net \
--cc=akpm@osdl.org \
--cc=anton@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc64-dev@ozlabs.org \
--cc=miltonm@bga.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox