1 files changed, 16 insertions, 11 deletions

diff --git a/arch/sh/kernel/cpu/sh2a/fpu.c b/arch/sh/kernel/cpu/sh2a/fpu.c
index 6df2fb98eb30..d395ce5740e7 100644
--- a/arch/sh/kernel/cpu/sh2a/fpu.c
+++ b/arch/sh/kernel/cpu/sh2a/fpu.c
@@ -25,14 +25,12 @@
 
 /*
  * Save FPU registers onto task structure.
- * Assume called with FPU enabled (SR.FD=0).
  */
 void
-save_fpu(struct task_struct *tsk, struct pt_regs *regs)
+save_fpu(struct task_struct *tsk)
 {
         unsigned long dummy;
 
-        clear_tsk_thread_flag(tsk, TIF_USEDFPU);
         enable_fpu();
         asm volatile("sts.l     fpul, @-%0\n\t"
                      "sts.l     fpscr, @-%0\n\t"
@@ -60,7 +58,6 @@ save_fpu(struct task_struct *tsk, struct pt_regs *regs)
                      : "memory");
 
         disable_fpu();
-        release_fpu(regs);
 }
 
 static void
@@ -598,31 +595,31 @@ BUILD_TRAP_HANDLER(fpu_error)
         struct task_struct *tsk = current;
         TRAP_HANDLER_DECL;
 
-        save_fpu(tsk, regs);
+        __unlazy_fpu(tsk, regs);
         if (ieee_fpe_handler(regs)) {
                 tsk->thread.fpu.hard.fpscr &=
                         ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
                 grab_fpu(regs);
                 restore_fpu(tsk);
-                set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                task_thread_info(tsk)->status |= TS_USEDFPU;
                 return;
         }
 
         force_sig(SIGFPE, tsk);
 }
 
-BUILD_TRAP_HANDLER(fpu_state_restore)
+void fpu_state_restore(struct pt_regs *regs)
 {
         struct task_struct *tsk = current;
-        TRAP_HANDLER_DECL;
 
         grab_fpu(regs);
-        if (!user_mode(regs)) {
+        if (unlikely(!user_mode(regs))) {
                 printk(KERN_ERR "BUG: FPU is used in kernel mode.\n");
+                BUG();
                 return;
         }
 
-        if (used_math()) {
+        if (likely(used_math())) {
                 /* Using the FPU again.  */
                 restore_fpu(tsk);
         } else  {
@@ -630,5 +627,13 @@ BUILD_TRAP_HANDLER(fpu_state_restore)
                 fpu_init();
                 set_used_math();
         }
-        set_tsk_thread_flag(tsk, TIF_USEDFPU);
+        task_thread_info(tsk)->status |= TS_USEDFPU;
+        tsk->fpu_counter++;
+}
+
+BUILD_TRAP_HANDLER(fpu_state_restore)
+{
+        TRAP_HANDLER_DECL;
+
+        fpu_state_restore(regs);
 }