No one uses ppc_md.machine_kexec, so remove it. Signed-off-by: Anton Blanchard <an...@samba.org> ---
Index: powerpc.git/arch/powerpc/include/asm/machdep.h =================================================================== --- powerpc.git.orig/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:51.352308248 +1100 +++ powerpc.git/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:54.082394288 +1100 @@ -248,12 +248,6 @@ struct machdep_calls { * claims to support kexec. */ int (*machine_kexec_prepare)(struct kimage *image); - - /* Called to perform the _real_ kexec. - * Do NOT allocate memory or fail here. We are past the point of - * no return. - */ - void (*machine_kexec)(struct kimage *image); #endif /* CONFIG_KEXEC */ #ifdef CONFIG_SUSPEND Index: powerpc.git/arch/powerpc/kernel/machine_kexec.c =================================================================== --- powerpc.git.orig/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:51.352308248 +1100 +++ powerpc.git/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:54.082394288 +1100 @@ -85,10 +85,7 @@ void arch_crash_save_vmcoreinfo(void) */ void machine_kexec(struct kimage *image) { - if (ppc_md.machine_kexec) - ppc_md.machine_kexec(image); - else - default_machine_kexec(image); + default_machine_kexec(image); /* Fall back to normal restart if we're still alive. */ machine_restart(NULL); _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev