aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/include/asm/machdep.h6
-rw-r--r--arch/powerpc/kernel/machine_kexec.c5
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 67cd82e4e27f..cb8139617442 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -246,12 +246,6 @@ struct machdep_calls {
246 * claims to support kexec. 246 * claims to support kexec.
247 */ 247 */
248 int (*machine_kexec_prepare)(struct kimage *image); 248 int (*machine_kexec_prepare)(struct kimage *image);
249
250 /* Called to perform the _real_ kexec.
251 * Do NOT allocate memory or fail here. We are past the point of
252 * no return.
253 */
254 void (*machine_kexec)(struct kimage *image);
255#endif /* CONFIG_KEXEC */ 249#endif /* CONFIG_KEXEC */
256 250
257#ifdef CONFIG_SUSPEND 251#ifdef CONFIG_SUSPEND
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index fae67642499d..43836aa8348e 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -85,10 +85,7 @@ void arch_crash_save_vmcoreinfo(void)
85 */ 85 */
86void machine_kexec(struct kimage *image) 86void machine_kexec(struct kimage *image)
87{ 87{
88 if (ppc_md.machine_kexec) 88 default_machine_kexec(image);
89 ppc_md.machine_kexec(image);
90 else
91 default_machine_kexec(image);
92 89
93 /* Fall back to normal restart if we're still alive. */ 90 /* Fall back to normal restart if we're still alive. */
94 machine_restart(NULL); 91 machine_restart(NULL);