lkml.org 
[lkml]   [2017]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 32/33] x86/fpu: Rename fpu__activate_curr() to fpu__initialize()
    Date
    Rename this function to better express that it's all about
    initializing the FPU state of a task which goes hand in hand
    with the fpu::initialized field.

    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Eric Biggers <ebiggers3@gmail.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>
    ---
    arch/x86/include/asm/fpu/internal.h | 2 +-
    arch/x86/kernel/fpu/core.c | 8 ++++----
    arch/x86/kernel/fpu/signal.c | 2 +-
    arch/x86/kvm/x86.c | 2 +-
    arch/x86/math-emu/fpu_entry.c | 2 +-
    5 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h
    index b26ae05da18a..7c980aafb8aa 100644
    --- a/arch/x86/include/asm/fpu/internal.h
    +++ b/arch/x86/include/asm/fpu/internal.h
    @@ -23,7 +23,7 @@
    /*
    * High level FPU state handling functions:
    */
    -extern void fpu__activate_curr(struct fpu *fpu);
    +extern void fpu__initialize(struct fpu *fpu);
    extern void fpu__activate_fpstate_read(struct fpu *fpu);
    extern void fpu__activate_fpstate_write(struct fpu *fpu);
    extern void fpu__save(struct fpu *fpu);
    diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
    index e935f8faf287..ca580d90799d 100644
    --- a/arch/x86/kernel/fpu/core.c
    +++ b/arch/x86/kernel/fpu/core.c
    @@ -224,7 +224,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)
    * Activate the current task's in-memory FPU context,
    * if it has not been used before:
    */
    -void fpu__activate_curr(struct fpu *fpu)
    +void fpu__initialize(struct fpu *fpu)
    {
    WARN_ON_FPU(fpu != &current->thread.fpu);

    @@ -237,7 +237,7 @@ void fpu__activate_curr(struct fpu *fpu)
    fpu->initialized = 1;
    }
    }
    -EXPORT_SYMBOL_GPL(fpu__activate_curr);
    +EXPORT_SYMBOL_GPL(fpu__initialize);

    /*
    * This function must be called before we read a task's fpstate.
    @@ -305,7 +305,7 @@ void fpu__activate_fpstate_write(struct fpu *fpu)
    */
    void fpu__restore(struct fpu *fpu)
    {
    - fpu__activate_curr(fpu);
    + fpu__initialize(fpu);

    /* Avoid __kernel_fpu_begin() right after fpregs_activate() */
    kernel_fpu_disable();
    @@ -381,7 +381,7 @@ void fpu__clear(struct fpu *fpu)
    */
    if (static_cpu_has(X86_FEATURE_FPU)) {
    preempt_disable();
    - fpu__activate_curr(fpu);
    + fpu__initialize(fpu);
    user_fpu_begin();
    copy_init_fpstate_to_fpregs();
    preempt_enable();
    diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
    index 34c9a85eb5ba..afe54247cf27 100644
    --- a/arch/x86/kernel/fpu/signal.c
    +++ b/arch/x86/kernel/fpu/signal.c
    @@ -283,7 +283,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
    if (!access_ok(VERIFY_READ, buf, size))
    return -EACCES;

    - fpu__activate_curr(fpu);
    + fpu__initialize(fpu);

    if (!static_cpu_has(X86_FEATURE_FPU))
    return fpregs_soft_set(current, NULL,
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index cd17b7d9a107..03869eb7fcd6 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -7225,7 +7225,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    int r;
    sigset_t sigsaved;

    - fpu__activate_curr(fpu);
    + fpu__initialize(fpu);

    if (vcpu->sigset_active)
    sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
    diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c
    index d4a7df2205b8..220638a4cb94 100644
    --- a/arch/x86/math-emu/fpu_entry.c
    +++ b/arch/x86/math-emu/fpu_entry.c
    @@ -114,7 +114,7 @@ void math_emulate(struct math_emu_info *info)
    struct desc_struct code_descriptor;
    struct fpu *fpu = &current->thread.fpu;

    - fpu__activate_curr(fpu);
    + fpu__initialize(fpu);

    #ifdef RE_ENTRANT_CHECKING
    if (emulating) {
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-09-23 15:02    [W:4.053 / U:0.912 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site