powerpc/kdump: Remove ppc_md.machine_crash_shutdown
authorAnton Blanchard <anton@samba.org>
Thu, 6 Jan 2011 17:56:09 +0000 (17:56 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 03:08:35 +0000 (14:08 +1100)
No one uses ppc_md.machine_crash_shutdown, so remove it.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/machdep.h
arch/powerpc/kernel/machine_kexec.c
arch/powerpc/platforms/cell/qpace_setup.c
arch/powerpc/platforms/pseries/kexec.c

index cb81396174420165d4eaf8927cd25fa9bb747202..991d5998d6be6711a68e15ab8347b110ade13dd3 100644 (file)
@@ -234,12 +234,6 @@ struct machdep_calls {
 #ifdef CONFIG_KEXEC
        void (*kexec_cpu_down)(int crash_shutdown, int secondary);
 
-       /* Called to do the minimal shutdown needed to run a kexec'd kernel
-        * to run successfully.
-        * XXX Should we move this one out of kexec scope?
-        */
-       void (*machine_crash_shutdown)(struct pt_regs *regs);
-
        /* Called to do what every setup is needed on image and the
         * reboot code buffer. Returns 0 on success.
         * Provide your own (maybe dummy) implementation if your platform
index 43836aa8348eb708a7ca7a15d8f5edb7ce1c8438..3427b2faa19aed11cd2290fe24d5f97aeca6cca4 100644 (file)
@@ -44,10 +44,7 @@ void machine_kexec_mask_interrupts(void) {
 
 void machine_crash_shutdown(struct pt_regs *regs)
 {
-       if (ppc_md.machine_crash_shutdown)
-               ppc_md.machine_crash_shutdown(regs);
-       else
-               default_machine_crash_shutdown(regs);
+       default_machine_crash_shutdown(regs);
 }
 
 /*
index 1b5749042756cc9e238431b5cb05bc69b5a5dde2..7970eec4c3a2fc528472dd161b7f427831868140 100644 (file)
@@ -148,6 +148,5 @@ define_machine(qpace) {
 #ifdef CONFIG_KEXEC
        .machine_kexec          = default_machine_kexec,
        .machine_kexec_prepare  = default_machine_kexec_prepare,
-       .machine_crash_shutdown = default_machine_crash_shutdown,
 #endif
 };
index 53cbd53d8740537d86b7fe5ab13e19dfcdcecd75..3d627926722105811e92d745e6b8193aaa672d14 100644 (file)
@@ -66,7 +66,6 @@ static int __init pseries_kexec_setup(void)
 {
        ppc_md.machine_kexec = default_machine_kexec;
        ppc_md.machine_kexec_prepare = default_machine_kexec_prepare;
-       ppc_md.machine_crash_shutdown = default_machine_crash_shutdown;
 
        return 0;
 }