x86/fpu: Remove 'struct task_struct' usage from __thread_set_has_fpu()
Migrate this function to pure 'struct fpu' usage.
Reviewed-by: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index d0fe7bb..cf0d412 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -331,10 +331,10 @@
}
/* Must be paired with a 'clts' before! */
-static inline void __thread_set_has_fpu(struct task_struct *tsk)
+static inline void __thread_set_has_fpu(struct fpu *fpu)
{
- tsk->thread.fpu.has_fpu = 1;
- this_cpu_write(fpu_fpregs_owner_ctx, &tsk->thread.fpu);
+ fpu->has_fpu = 1;
+ this_cpu_write(fpu_fpregs_owner_ctx, fpu);
}
/*
@@ -355,7 +355,7 @@
{
if (!use_eager_fpu())
clts();
- __thread_set_has_fpu(tsk);
+ __thread_set_has_fpu(&tsk->thread.fpu);
}
static inline void drop_fpu(struct task_struct *tsk)
@@ -416,6 +416,7 @@
static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct task_struct *new, int cpu)
{
struct fpu *old_fpu = &old->thread.fpu;
+ struct fpu *new_fpu = &new->thread.fpu;
fpu_switch_t fpu;
/*
@@ -437,7 +438,7 @@
/* Don't change CR0.TS if we just switch! */
if (fpu.preload) {
new->thread.fpu.counter++;
- __thread_set_has_fpu(new);
+ __thread_set_has_fpu(new_fpu);
prefetch(new->thread.fpu.state);
} else if (!use_eager_fpu())
stts();