1 files changed, 6 insertions, 13 deletions

diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index a81572338243..12088a3f459f 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -81,9 +81,7 @@ void __kernel_fpu_begin(void)
         this_cpu_write(in_kernel_fpu, true);
 
         if (__thread_has_fpu(me)) {
-                __thread_clear_has_fpu(me);
                 __save_init_fpu(me);
-                /* We do 'stts()' in __kernel_fpu_end() */
         } else if (!use_eager_fpu()) {
                 this_cpu_write(fpu_owner_task, NULL);
                 clts();
@@ -93,17 +91,12 @@ EXPORT_SYMBOL(__kernel_fpu_begin);
 
 void __kernel_fpu_end(void)
 {
-        if (use_eager_fpu()) {
-                /*
-                 * For eager fpu, most the time, tsk_used_math() is true.
-                 * Restore the user math as we are done with the kernel usage.
-                 * At few instances during thread exit, signal handling etc,
-                 * tsk_used_math() is false. Those few places will take proper
-                 * actions, so we don't need to restore the math here.
-                 */
-                if (likely(tsk_used_math(current)))
-                        math_state_restore();
-        } else {
+        struct task_struct *me = current;
+
+        if (__thread_has_fpu(me)) {
+                if (WARN_ON(restore_fpu_checking(me)))
+                        drop_init_fpu(me);
+        } else if (!use_eager_fpu()) {
                 stts();
         }