]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
powerpc: Fix default_machine_crash_shutdown #ifdef botch
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 15 Jun 2010 14:48:39 +0000 (14:48 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Jul 2010 08:11:45 +0000 (18:11 +1000)
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>
arch/powerpc/kernel/crash.c

index b46f2e09bd81df4bea175401fe4f70fbf45bfb35..29df48f2b61a45d27f33301fe350439a94e384f4 100644 (file)
@@ -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)