openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander van Heukelum 2008-09-09 21:56:11 +02:00 committed by Ingo Molnar
parent 5feedfd401
commit eb642f6208
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/entry_32.S
View File

@ -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

11
arch/x86/kernel/traps_32.c
View File

@ -62,6 +62,7 @@
#include <asm/traps.h>
#include "mach_traps.h"
#include "cpu/mcheck/mce.h"
DECLARE_BITMAP(used_vectors, NR_VECTORS);
EXPORT_SYMBOL_GPL(used_vectors);
@ -1252,6 +1253,14 @@ void __kprobes do_device_not_available(struct pt_regs *regs, long error)
}
}
#ifdef CONFIG_X86_MCE
void __kprobes do_machine_check(struct pt_regs *regs, long error)
{
conditional_sti(regs);
machine_check_vector(regs, error);
}
#endif
void __init trap_init(void)
{
int i;
@ -1283,7 +1292,7 @@ void __init trap_init(void)
set_intr_gate(16, &coprocessor_error);
set_intr_gate(17, &alignment_check);
#ifdef CONFIG_X86_MCE
set_trap_gate(18, &machine_check);
set_intr_gate(18, &machine_check);
#endif
set_trap_gate(19, &simd_coprocessor_error);