Reviewed-by: Borislav Petkov <b...@alien8.de>
Cc: Andy Lutomirski <l...@amacapital.net>
Cc: Dave Hansen <dave.han...@linux.intel.com>
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Oleg Nesterov <o...@redhat.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/x86/kernel/fpu/core.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index e24f477f9113..7d69d784d064 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -390,13 +390,15 @@ void fpu__clear(struct task_struct *tsk)
        if (!use_eager_fpu()) {
                /* FPU state will be reallocated lazily at the first use. */
                drop_fpu(fpu);
-               fpstate_free(&tsk->thread.fpu);
-       } else if (!fpu->fpstate_active) {
-               /* kthread execs. TODO: cleanup this horror. */
-               if (WARN_ON(fpstate_alloc_init(fpu)))
-                       force_sig(SIGKILL, tsk);
-               user_fpu_begin();
-               restore_init_xstate();
+               fpstate_free(fpu);
+       } else {
+                if (!fpu->fpstate_active) {
+                       /* kthread execs. TODO: cleanup this horror. */
+                       if (WARN_ON(fpstate_alloc_init(fpu)))
+                               force_sig(SIGKILL, tsk);
+                       user_fpu_begin();
+                       restore_init_xstate();
+               }
        }
 }
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to