From 1adacc4432595171438658a4e8a1ce7ca2293eb3 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 6 Jan 2011 17:55:36 +0000
Subject: [PATCH] --- yaml --- r: 232051 b: refs/heads/master c:
 c94868788cf26d5ad816646dd9af3cdf6fbd92fd h: refs/heads/master i:   232049:
 452704e2649e44720a9cbd33bf491b8c45911203   232047:
 f4766ef62cdcf7c33d1f217896935dc919923fab v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/include/asm/machdep.h  | 6 ------
 trunk/arch/powerpc/kernel/machine_kexec.c | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index db11a00587ed..2bf519585d6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 619b267724e8cc41072d650ae28114851dd8bf56
+refs/heads/master: c94868788cf26d5ad816646dd9af3cdf6fbd92fd
diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h
index 67cd82e4e27f..cb8139617442 100644
--- a/trunk/arch/powerpc/include/asm/machdep.h
+++ b/trunk/arch/powerpc/include/asm/machdep.h
@@ -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
diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c
index fae67642499d..43836aa8348e 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec.c
@@ -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);