[58/74] powerpc: Fix default_machine_crash_shutdown #ifdef botch
- To: linux-kernel@vger.kernel.org, stable@kernel.org, Greg KH <greg@kroah.com>
- Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Ben Hutchings <ben@decadent.org.uk>, Debian kernel maintainers <debian-kernel@lists.debian.org>, debian-release@lists.debian.org, "Adam D. Barratt" <adam@adam-barratt.org.uk>, paulmck@linux.vnet.ibm.com, mikey@neuling.org, benh@kernel.crashing.org, anton@samba.org, dann frazier <dannf@dannf.org>, galak@kernel.crashing.org, Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
- Subject: [58/74] powerpc: Fix default_machine_crash_shutdown #ifdef botch
- From: Greg KH <gregkh@suse.de>
- Date: Wed, 13 Apr 2011 08:51:22 -0700
- Message-id: <20110413155149.225851958@clark.kroah.org>
- In-reply-to: <20110413155406.GA22568@kroah.com>
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
powerpc: Fix default_machine_crash_shutdown #ifdef botch
Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream
crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
Fix the conditional compilation around the invocation.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/powerpc/kernel/crash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -447,7 +447,7 @@ void default_machine_crash_shutdown(stru
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
-#ifdef CONFIG_PPC_STD_MMU_64
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
crash_kexec_wait_realmode(crashing_cpu);
#endif
if (ppc_md.kexec_cpu_down)
Reply to: