diff options
| author | Paul E. McKenney | 2010-06-15 16:48:39 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2010-07-08 10:11:45 +0200 |
| commit | c2be05481f6125254c45b78f334d4dd09c701c82 (patch) | |
| tree | d5dc16f4d373bc88384b5716a9f72d0725e289ae | |
| parent | powerpc: Fix logic error in fixup_irqs (diff) | |
| download | kernel-qcow2-linux-c2be05481f6125254c45b78f334d4dd09c701c82.tar.gz kernel-qcow2-linux-c2be05481f6125254c45b78f334d4dd09c701c82.tar.xz kernel-qcow2-linux-c2be05481f6125254c45b78f334d4dd09c701c82.zip | |
powerpc: Fix default_machine_crash_shutdown #ifdef botch
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.
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>
| -rw-r--r-- | arch/powerpc/kernel/crash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index b46f2e09bd81..29df48f2b61a 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -447,7 +447,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) 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) |