---

yaml --- r: 292473 b: refs/heads/master c: 67b43b9 h: refs/heads/master i: 292471: f1eaf2d v: v3
git-mirror · Feb 22, 2012 · 3d65796 · 3d65796
1 parent 4b1edd1
commit 3d65796
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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();
 }