We check for a valid handler before calling ppc_md.machine_kexec_prepare so we can just remove these empty handlers.
Signed-off-by: Anton Blanchard <[email protected]> --- Index: powerpc.git/arch/powerpc/platforms/embedded6xx/wii.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/embedded6xx/wii.c 2010-12-13 22:52:03.535243386 +1100 +++ powerpc.git/arch/powerpc/platforms/embedded6xx/wii.c 2011-01-07 12:51:59.422562597 +1100 @@ -18,7 +18,6 @@ #include <linux/init.h> #include <linux/irq.h> #include <linux/seq_file.h> -#include <linux/kexec.h> #include <linux/of_platform.h> #include <linux/memblock.h> #include <mm/mmu_decl.h> @@ -226,13 +225,6 @@ static void wii_shutdown(void) flipper_quiesce(); } -#ifdef CONFIG_KEXEC -static int wii_machine_kexec_prepare(struct kimage *image) -{ - return 0; -} -#endif /* CONFIG_KEXEC */ - define_machine(wii) { .name = "wii", .probe = wii_probe, @@ -246,9 +238,6 @@ define_machine(wii) { .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, .machine_shutdown = wii_shutdown, -#ifdef CONFIG_KEXEC - .machine_kexec_prepare = wii_machine_kexec_prepare, -#endif }; static struct of_device_id wii_of_bus[] = { Index: powerpc.git/arch/powerpc/platforms/embedded6xx/gamecube.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/embedded6xx/gamecube.c 2010-12-13 22:52:03.555243746 +1100 +++ powerpc.git/arch/powerpc/platforms/embedded6xx/gamecube.c 2011-01-07 12:51:59.422562597 +1100 @@ -75,14 +75,6 @@ static void gamecube_shutdown(void) flipper_quiesce(); } -#ifdef CONFIG_KEXEC -static int gamecube_kexec_prepare(struct kimage *image) -{ - return 0; -} -#endif /* CONFIG_KEXEC */ - - define_machine(gamecube) { .name = "gamecube", .probe = gamecube_probe, @@ -95,9 +87,6 @@ define_machine(gamecube) { .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, .machine_shutdown = gamecube_shutdown, -#ifdef CONFIG_KEXEC - .machine_kexec_prepare = gamecube_kexec_prepare, -#endif }; _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
