From 42594f6fdf3d9944ed4922fd05441f872d1a558b Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 6 Jan 2011 17:56:09 +0000
Subject: [PATCH] --- yaml --- r: 232052 b: refs/heads/master c:
 c1f784e553490a2602567666fc79ff142cb4413b h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/include/asm/machdep.h        | 6 ------
 trunk/arch/powerpc/kernel/machine_kexec.c       | 5 +----
 trunk/arch/powerpc/platforms/cell/qpace_setup.c | 1 -
 trunk/arch/powerpc/platforms/pseries/kexec.c    | 1 -
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2bf519585d6c..2d78c3aba49b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94868788cf26d5ad816646dd9af3cdf6fbd92fd
+refs/heads/master: c1f784e553490a2602567666fc79ff142cb4413b
diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h
index cb8139617442..991d5998d6be 100644
--- a/trunk/arch/powerpc/include/asm/machdep.h
+++ b/trunk/arch/powerpc/include/asm/machdep.h
@@ -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
diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c
index 43836aa8348e..3427b2faa19a 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec.c
@@ -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);
 }
 
 /*
diff --git a/trunk/arch/powerpc/platforms/cell/qpace_setup.c b/trunk/arch/powerpc/platforms/cell/qpace_setup.c
index 1b5749042756..7970eec4c3a2 100644
--- a/trunk/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/trunk/arch/powerpc/platforms/cell/qpace_setup.c
@@ -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
 };
diff --git a/trunk/arch/powerpc/platforms/pseries/kexec.c b/trunk/arch/powerpc/platforms/pseries/kexec.c
index 53cbd53d8740..3d6279267221 100644
--- a/trunk/arch/powerpc/platforms/pseries/kexec.c
+++ b/trunk/arch/powerpc/platforms/pseries/kexec.c
@@ -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;
 }