lkml.org 
[lkml]   [2015]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] x86/fpu: Fold __drop_fpu() into its sole user
    Fold it into drop_fpu(). Phew, one less FPU function to pay attention
    to.

    No functionality change.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Pekka Riikonen <priikone@iki.fi>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Suresh Siddha <sbsiddha@gmail.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
    Cc: Dave Hansen <dave.hansen@intel.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/include/asm/fpu-internal.h | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
    index 7d2f7fa6b2dd..2d4adff428ac 100644
    --- a/arch/x86/include/asm/fpu-internal.h
    +++ b/arch/x86/include/asm/fpu-internal.h
    @@ -378,8 +378,14 @@ static inline void __thread_fpu_begin(struct task_struct *tsk)
    __thread_set_has_fpu(tsk);
    }

    -static inline void __drop_fpu(struct task_struct *tsk)
    +static inline void drop_fpu(struct task_struct *tsk)
    {
    + /*
    + * Forget coprocessor state..
    + */
    + preempt_disable();
    + tsk->thread.fpu_counter = 0;
    +
    if (__thread_has_fpu(tsk)) {
    /* Ignore delayed exceptions from user space */
    asm volatile("1: fwait\n"
    @@ -387,16 +393,7 @@ static inline void __drop_fpu(struct task_struct *tsk)
    _ASM_EXTABLE(1b, 2b));
    __thread_fpu_end(tsk);
    }
    -}

    -static inline void drop_fpu(struct task_struct *tsk)
    -{
    - /*
    - * Forget coprocessor state..
    - */
    - preempt_disable();
    - tsk->thread.fpu_counter = 0;
    - __drop_fpu(tsk);
    clear_stopped_child_used_math(tsk);
    preempt_enable();
    }
    --
    2.3.3
    --
    Regards/Gruss,
    Boris.

    ECO tip #101: Trim your mails when you reply.
    --


    \
     
     \ /
      Last update: 2015-03-14 12:21    [W:3.876 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site