Propagate the 'fpu->fpregs_active' naming to the high level function that sets it.
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/include/asm/fpu/internal.h | 6 +++--- arch/x86/kernel/fpu/core.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index 7a235171be6c..18a62239c73d 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -342,7 +342,7 @@ static inline void __thread_fpu_end(struct fpu *fpu) stts(); } -static inline void __thread_fpu_begin(struct fpu *fpu) +static inline void fpregs_activate(struct fpu *fpu) { if (!use_eager_fpu()) clts(); @@ -441,7 +441,7 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu) fpu.preload = 0; else prefetch(new_fpu->state); - __thread_fpu_begin(new_fpu); + fpregs_activate(new_fpu); } } return fpu; @@ -499,7 +499,7 @@ static inline void user_fpu_begin(void) preempt_disable(); if (!user_has_fpu()) - __thread_fpu_begin(fpu); + fpregs_activate(fpu); preempt_enable(); } diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index a7fb56266a2d..75b94985c82e 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -368,9 +368,9 @@ void fpu__restore(void) local_irq_disable(); } - /* Avoid __kernel_fpu_begin() right after __thread_fpu_begin() */ + /* Avoid __kernel_fpu_begin() right after fpregs_activate() */ kernel_fpu_disable(); - __thread_fpu_begin(fpu); + fpregs_activate(fpu); if (unlikely(restore_fpu_checking(fpu))) { fpu_reset_state(fpu); force_sig_info(SIGSEGV, SEND_SIG_PRIV, tsk); -- 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/