x86/fpu: Rename __thread_fpu_begin() to fpregs_activate()

Propagate the 'fpu->fpregs_active' naming to the high level
function that sets it.

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 7a235171be6cb25cd13d37369437bbf5f7222215..18a62239c73da28b3f47f1ffaa682f5f63d832ca 100644 (file)
--- 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 c8ae838dbf1156c713bb6e8bc91c2e29c48edd67..a1768ec8e6438fcb0dbeb31226c9ebb468f31315 100644 (file)
--- 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);