From 66d886a6229fc5b1fa5b1939f8bbdf59b8b5f511 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 15 Jun 2010 14:48:39 +0000 Subject: [PATCH] --- yaml --- r: 200910 b: refs/heads/master c: c2be05481f6125254c45b78f334d4dd09c701c82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/crash.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5580370919ad..1ab097bebb2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cd8519248e9e17d982c6fab0f1a89bca6feb49a +refs/heads/master: c2be05481f6125254c45b78f334d4dd09c701c82 diff --git a/trunk/arch/powerpc/kernel/crash.c b/trunk/arch/powerpc/kernel/crash.c index b46f2e09bd81..29df48f2b61a 100644 --- a/trunk/arch/powerpc/kernel/crash.c +++ b/trunk/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)