X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Fia64%2Fkernel%2Fmachine_kexec.c;h=3d3aeef469476a85ed4d149608ebd891e72c5f6c;hb=6cc3efcdf01cf874ffe770919395918a3ee9365b;hp=571d66373e0a46eef9415b7d336a1640ef17a47a;hpb=07a6a4ae827b54cec4c1b1d92bed1cc9176b45ec;p=linux-2.6-block.git

diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 571d66373e0a..3d3aeef46947 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/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();