[PATCH 070/208] x86/fpu: Clean up fpu__clear() a bit

Ingo Molnar
2015-05-05T16:48:38Z

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