summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/traps_32.c
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:56:12 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:40 +0200
commitb939bde2788a7f16741e563ee90f6f3ad38935cf (patch)
tree2cf8b19c24ef89e48f1e5f2f529826bbbd92682e /arch/x86/kernel/traps_32.c
parenteb642f62082348c33ead53f736a9698953aa517d (diff)
i386: convert hardware exception 19 to an interrupt gate
Handle SIMD coprocessor 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/traps_32.c')
-rw-r--r--arch/x86/kernel/traps_32.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 54b89f497bac..1bd7960b1357 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -1144,6 +1144,8 @@ static void simd_math_error(void __user *ip)
void do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
{
+ conditional_sti(regs);
+
if (cpu_has_xmm) {
/* Handle SIMD FPU exceptions on PIII+ processors. */
ignore_fpu_irq = 1;
@@ -1294,7 +1296,7 @@ void __init trap_init(void)
#ifdef CONFIG_X86_MCE
set_intr_gate(18, &machine_check);
#endif
- set_trap_gate(19, &simd_coprocessor_error);
+ set_intr_gate(19, &simd_coprocessor_error);
if (cpu_has_fxsr) {
printk(KERN_INFO "Enabling fast FPU save and restore... ");