summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_32.S
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:56:11 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:38 +0200
commiteb642f62082348c33ead53f736a9698953aa517d (patch)
tree6f894fb99e28e6a3f4d3c59ee9e11cb2f4550a2b /arch/x86/kernel/entry_32.S
parenti386: convert hardware exception 17 to an interrupt gate (diff)
downloadlinux-eb642f62082348c33ead53f736a9698953aa517d.tar.xz
linux-eb642f62082348c33ead53f736a9698953aa517d.zip
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>
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r--arch/x86/kernel/entry_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 5a885855fc88..c5fe01bca6c0 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1019,7 +1019,7 @@ ENTRY(machine_check)
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