diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-23 17:57:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-19 15:47:28 +0200 |
| commit | 0c070595ceccb391100127a28ff837c50356ad67 (patch) | |
| tree | 741ce8360678f2b455bf1cf4e9450581a7aaffc1 | |
| parent | a4d8fc2e0652613426920aac429541127f8b26d8 (diff) | |
| download | talos-obmc-linux-0c070595ceccb391100127a28ff837c50356ad67.tar.gz talos-obmc-linux-0c070595ceccb391100127a28ff837c50356ad67.zip | |
x86/fpu: Use 'struct fpu' in fpu__save()
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>
| -rw-r--r-- | arch/x86/include/asm/i387.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/fpu/core.c | 8 | ||||
| -rw-r--r-- | arch/x86/kernel/traps.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h index e69989f95da5..e3b42c5379bc 100644 --- a/arch/x86/include/asm/i387.h +++ b/arch/x86/include/asm/i387.h @@ -100,7 +100,7 @@ static inline int user_has_fpu(void) return current->thread.fpu.has_fpu; } -extern void fpu__save(struct task_struct *tsk); +extern void fpu__save(struct fpu *fpu); #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 7c0530082253..b685e9e90491 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -142,11 +142,9 @@ static void __save_fpu(struct fpu *fpu) * * This only ever gets called for the current task. */ -void fpu__save(struct task_struct *tsk) +void fpu__save(struct fpu *fpu) { - struct fpu *fpu = &tsk->thread.fpu; - - WARN_ON(tsk != current); + WARN_ON(fpu != ¤t->thread.fpu); preempt_disable(); if (fpu->has_fpu) { @@ -240,7 +238,7 @@ static void fpu_copy(struct task_struct *dst, struct task_struct *src) memset(&dst->thread.fpu.state->xsave, 0, xstate_size); __save_fpu(dst_fpu); } else { - fpu__save(src); + fpu__save(src_fpu); memcpy(dst_fpu->state, src_fpu->state, xstate_size); } } diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 22ad90a40dbf..8abcd6a6f3dc 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -730,7 +730,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr) /* * Save the info for the exception handler and clear the error. */ - fpu__save(task); + fpu__save(&task->thread.fpu); task->thread.trap_nr = trapnr; task->thread.error_code = error_code; info.si_signo = SIGFPE; |
