From 06d188570d7573dfd75a50ee61f9f8235af126d0 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Jan 2010 20:39:49 +0900
Subject: [PATCH] --- yaml --- r: 181094 b: refs/heads/master c:
 4291b730cd0f0cf98a90d946b6cabbd804397350 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/kernel/cpu/fpu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0a54ebdfc725..f922bc7c949e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d467676abf5f01f5ee99056273a58486968e252
+refs/heads/master: 4291b730cd0f0cf98a90d946b6cabbd804397350
diff --git a/trunk/arch/sh/kernel/cpu/fpu.c b/trunk/arch/sh/kernel/cpu/fpu.c
index c23e6727002a..f059ed62cf57 100644
--- a/trunk/arch/sh/kernel/cpu/fpu.c
+++ b/trunk/arch/sh/kernel/cpu/fpu.c
@@ -56,6 +56,7 @@ void fpu_state_restore(struct pt_regs *regs)
 	}
 
 	if (!tsk_used_math(tsk)) {
+		local_irq_enable();
 		/*
 		 * does a slab alloc which can sleep
 		 */
@@ -66,6 +67,7 @@ void fpu_state_restore(struct pt_regs *regs)
 			do_group_exit(SIGKILL);
 			return;
 		}
+		local_irq_disable();
 	}
 
 	grab_fpu(regs);