aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 15:56:09 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:20:33 -0400
commit252d28fe65adc2e51bc71358eae43ba94b74da91 (patch)
tree5f9a758f0da58b2757032d8e53f7d9adf82cf023 /arch/x86
parentcf81978d5fb32ab75f701690b372e1126b41861f (diff)
i386: convert hardware exception 16 to an interrupt gate
Handle coprocessor error 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')
-rw-r--r--arch/x86/kernel/traps_32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 0039856b6344..5ab4c3fc7c1d 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -1088,6 +1088,7 @@ void math_error(void __user *ip)
1088 1088
1089void do_coprocessor_error(struct pt_regs *regs, long error_code) 1089void do_coprocessor_error(struct pt_regs *regs, long error_code)
1090{ 1090{
1091 conditional_sti(regs);
1091 ignore_fpu_irq = 1; 1092 ignore_fpu_irq = 1;
1092 math_error((void __user *)regs->ip); 1093 math_error((void __user *)regs->ip);
1093} 1094}
@@ -1279,7 +1280,7 @@ void __init trap_init(void)
1279 set_intr_gate(13, &general_protection); 1280 set_intr_gate(13, &general_protection);
1280 set_intr_gate(14, &page_fault); 1281 set_intr_gate(14, &page_fault);
1281 set_intr_gate(15, &spurious_interrupt_bug); 1282 set_intr_gate(15, &spurious_interrupt_bug);
1282 set_trap_gate(16, &coprocessor_error); 1283 set_intr_gate(16, &coprocessor_error);
1283 set_trap_gate(17, &alignment_check); 1284 set_trap_gate(17, &alignment_check);
1284#ifdef CONFIG_X86_MCE 1285#ifdef CONFIG_X86_MCE
1285 set_trap_gate(18, &machine_check); 1286 set_trap_gate(18, &machine_check);