| From 1faf66a23f13391aec7b08e27f6cff6712a2b75b Mon Sep 17 00:00:00 2001 |
| From: Paul E. McKenney <paulmck@linux.vnet.ibm.com> |
| Date: Tue, 15 Jun 2010 14:48:39 +0000 |
| Subject: [PATCH] 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. |
| |
| [PG: commit b3df895aebe091b1657 "powerpc/kexec: Add support for FSL-BookE" |
| introduced the PPC_STD_MMU_64 check this refers to, but we don't want to |
| cherry pick that whole addition to stable just for one #ifdef line.] |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c |
| index 8c066d6..ddf1fea 100644 |
| --- a/arch/powerpc/kernel/crash.c |
| +++ b/arch/powerpc/kernel/crash.c |
| @@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu) |
| } |
| |
| /* wait for all the CPUs to hit real mode but timeout if they don't come in */ |
| +#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP) |
| static void crash_kexec_wait_realmode(int cpu) |
| { |
| unsigned int msecs; |
| @@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu) |
| } |
| mb(); |
| } |
| +#endif |
| |
| /* |
| * This function will be called by secondary cpus or by kexec cpu |
| @@ -445,7 +447,9 @@ 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(); |
| +#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP) |
| crash_kexec_wait_realmode(crashing_cpu); |
| +#endif |
| if (ppc_md.kexec_cpu_down) |
| ppc_md.kexec_cpu_down(1, 0); |
| } |
| -- |
| 1.7.4.4 |
| |
