powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.

Paul Gortmaker · ozbenh · commit b987812b3fca · 2011-04-05T16:22:10.000+10:00
Commit b3df895 "powerpc/kexec: Add support for FSL-BookE" introduced the original PPC_STD_MMU_64 checks around the function crash_kexec_wait_realmode(). Then commit c2be054 "powerpc: Fix default_machine_crash_shutdown #ifdef botch" changed the ifdef around the calling site to add a check on SMP, but the ifdef around the function itself was left unchanged, leaving an unused function for PPC_STD_MMU_64=y and SMP=n Rather than have two ifdefs that can get out of sync like this, simply put the corrected conditional around the function and use a stub to get rid of one set of ifdefs completely. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
@@ -163,7 +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 */
-#ifdef CONFIG_PPC_STD_MMU_64
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 static void crash_kexec_wait_realmode(int cpu)
 {
 	unsigned int msecs;
@@ -188,6 +188,8 @@ static void crash_kexec_wait_realmode(int cpu)
 	}
 	mb();
 }
+#else
+static inline void crash_kexec_wait_realmode(int cpu) {}
 #endif
 
 /*
@@ -344,9 +346,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	crash_save_cpu(regs, crashing_cpu);
 	crash_kexec_prepare_cpus(crashing_cpu);
 	cpu_set(crashing_cpu, cpus_in_crash);
-#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 	crash_kexec_wait_realmode(crashing_cpu);
-#endif
 
 	machine_kexec_mask_interrupts();
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/* wait for all the CPUs to hit real mode but timeout if they don't come in */`
`166`		`-#ifdef CONFIG_PPC_STD_MMU_64`
	`166`	`+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)`
`167`	`167`	`static void crash_kexec_wait_realmode(int cpu)`
`168`	`168`	`{`
`169`	`169`	`unsigned int msecs;`
`@@ -188,6 +188,8 @@ static void crash_kexec_wait_realmode(int cpu)`
`188`	`188`	`}`
`189`	`189`	`mb();`
`190`	`190`	`}`
	`191`	`+#else`
	`192`	`+static inline void crash_kexec_wait_realmode(int cpu) {}`
`191`	`193`	`#endif`
`192`	`194`
`193`	`195`	`/*`
`@@ -344,9 +346,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)`
`344`	`346`	`crash_save_cpu(regs, crashing_cpu);`
`345`	`347`	`crash_kexec_prepare_cpus(crashing_cpu);`
`346`	`348`	`cpu_set(crashing_cpu, cpus_in_crash);`
`347`		`-#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)`
`348`	`349`	`crash_kexec_wait_realmode(crashing_cpu);`
`349`		`-#endif`
`350`	`350`
`351`	`351`	`machine_kexec_mask_interrupts();`
`352`	`352`