commit eb642f62082348c33ead53f736a9698953aa517d
author Alexander van Heukelum <heukelum@fastmail.fm> Tue Sep 09 21:56:11 2008 +0200
committer Ingo Molnar <mingo@elte.hu> Mon Oct 13 10:20:38 2008 +0200
tree 6f894fb99e28e6a3f4d3c59ee9e11cb2f4550a2b
parent 5feedfd401c91e41bbe31ddec93cbe809dc98309

i386: convert hardware exception 18 to an interrupt gate

Handle machine check exception with interrupt initially off.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 5a88585..c5fe01b 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1019,7 +1019,7 @@
 	RING0_INT_FRAME
 	pushl $0
 	CFI_ADJUST_CFA_OFFSET 4
-	pushl machine_check_vector
+	pushl $do_machine_check
 	CFI_ADJUST_CFA_OFFSET 4
 	jmp error_code
 	CFI_ENDPROC