From 3d657962b091325b9141c1dce3490d2236beff23 Mon Sep 17 00:00:00 2001
From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Date: Thu, 16 Feb 2012 01:15:15 +0000
Subject: [PATCH] --- yaml --- r: 292473 b: refs/heads/master c:
 67b43b9d7ced37a2e72e2c3e06464aa0a5be95f9 h: refs/heads/master i:   292471:
 f1eaf2dfde30690f38d216c6a1d84ce91a7f744b v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/kernel/setup-common.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 59dc7cedd7bd..969cb9a69137 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b500afff11f64227ca69fd2d05986d08d9573935
+refs/heads/master: 67b43b9d7ced37a2e72e2c3e06464aa0a5be95f9
diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c
index 4e62a56e1a95..b0ebdeab9494 100644
--- a/trunk/arch/powerpc/kernel/setup-common.c
+++ b/trunk/arch/powerpc/kernel/setup-common.c
@@ -110,6 +110,14 @@ EXPORT_SYMBOL(ppc_do_canonicalize_irqs);
 /* also used by kexec */
 void machine_shutdown(void)
 {
+#ifdef CONFIG_FA_DUMP
+	/*
+	 * if fadump is active, cleanup the fadump registration before we
+	 * shutdown.
+	 */
+	fadump_cleanup();
+#endif
+
 	if (ppc_md.machine_shutdown)
 		ppc_md.machine_shutdown();
 }