]> git.karo-electronics.de Git - linux-beck.git/commitdiff
powerpc/kexec: Remove ppc_md.machine_kexec
authorAnton Blanchard <anton@samba.org>
Thu, 6 Jan 2011 17:55:36 +0000 (17:55 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 03:08:35 +0000 (14:08 +1100)
No one uses ppc_md.machine_kexec, 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

index 67cd82e4e27fc89c8540a8eeb09138e08c45226f..cb81396174420165d4eaf8927cd25fa9bb747202 100644 (file)
@@ -246,12 +246,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 fae67642499d67de81709062b9ae9d1132910493..43836aa8348eb708a7ca7a15d8f5edb7ce1c8438 100644 (file)
@@ -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);