From 92dd42bd387c1b4402183fa48275ef0c908a834c Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <[seto.hidetoshi@jp.fujitsu.com]>
Date: Thu, 6 Aug 2009 14:51:57 -0700
Subject: [PATCH] --- yaml --- r: 163290 b: refs/heads/master c:
 6cc3efcdf01cf874ffe770919395918a3ee9365b h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/ia64/kernel/machine_kexec.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01bee29322f5..d5fe9796435e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07a6a4ae827b54cec4c1b1d92bed1cc9176b45ec
+refs/heads/master: 6cc3efcdf01cf874ffe770919395918a3ee9365b
diff --git a/trunk/arch/ia64/kernel/machine_kexec.c b/trunk/arch/ia64/kernel/machine_kexec.c
index 571d66373e0a..3d3aeef46947 100644
--- a/trunk/arch/ia64/kernel/machine_kexec.c
+++ b/trunk/arch/ia64/kernel/machine_kexec.c
@@ -104,6 +104,9 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
 		ia64_sal_set_vectors(SAL_VECTOR_OS_INIT, 0, 0, 0, 0, 0, 0);
 	}
 
+	/* Unregister mca handler - No more recovery on current kernel */
+	ia64_sal_set_vectors(SAL_VECTOR_OS_MCA, 0, 0, 0, 0, 0, 0);
+
 	/* Interrupts aren't acceptable while we reboot */
 	local_irq_disable();