From 4c8a8297690b4b6d83d48b0ceff7f3db7cc30f01 Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Tue, 9 Sep 2008 21:56:12 +0200
Subject: [PATCH] --- yaml --- r: 113505 b: refs/heads/master c:
 b939bde2788a7f16741e563ee90f6f3ad38935cf h: refs/heads/master i:   113503:
 8db90b90adc399bde43afc406be1cbb0e705c775 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/traps_32.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4551e601890e..a86a1a7e365a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb642f62082348c33ead53f736a9698953aa517d
+refs/heads/master: b939bde2788a7f16741e563ee90f6f3ad38935cf
diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c
index 54b89f497bac..1bd7960b1357 100644
--- a/trunk/arch/x86/kernel/traps_32.c
+++ b/trunk/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... ");