aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_32.S
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 15:56:11 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:20:38 -0400
commiteb642f62082348c33ead53f736a9698953aa517d (patch)
tree6f894fb99e28e6a3f4d3c59ee9e11cb2f4550a2b /arch/x86/kernel/entry_32.S
parent5feedfd401c91e41bbe31ddec93cbe809dc98309 (diff)
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)
1019 RING0_INT_FRAME 1019 RING0_INT_FRAME
1020 pushl $0 1020 pushl $0
1021 CFI_ADJUST_CFA_OFFSET 4 1021 CFI_ADJUST_CFA_OFFSET 4
1022 pushl machine_check_vector 1022 pushl $do_machine_check
1023 CFI_ADJUST_CFA_OFFSET 4 1023 CFI_ADJUST_CFA_OFFSET 4
1024 jmp error_code 1024 jmp error_code
1025 CFI_ENDPROC 1025 CFI_ENDPROC