From c0311f63e3cc8b29b6006ac8c1d4e3f6fbb2e357 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 23 Apr 2015 12:24:59 +0200 Subject: [PATCH] x86/fpu: Remove 'struct task_struct' usage from __thread_set_has_fpu() Migrate this function to pure 'struct fpu' usage. Reviewed-by: Borislav Petkov Cc: Andy Lutomirski Cc: Dave Hansen Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fpu-internal.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index d0fe7bbb51d1..cf0d4124fb3d 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -331,10 +331,10 @@ static inline void __thread_clear_has_fpu(struct fpu *fpu) } /* 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 @@ static inline void __thread_fpu_begin(struct task_struct *tsk) { 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 @@ typedef struct { int preload; } fpu_switch_t; 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 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta /* 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(); -- 2.11.0