lkml.org 
[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 46/73] i387: math_state_restore() isnt called from asm
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit be98c2cdb15ba26148cd2bd58a857d4f7759ed38 upstream.

    It was marked asmlinkage for some really old and stale legacy reasons.
    Fix that and the equally stale comment.

    Noticed when debugging the irq_fpu_usable() bugs.

    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/asm/i387.h | 2 +-
    arch/x86/kernel/traps.c | 6 +++---
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/x86/include/asm/i387.h
    +++ b/arch/x86/include/asm/i387.h
    @@ -29,7 +29,7 @@ extern unsigned int sig_xstate_size;
    extern void fpu_init(void);
    extern void mxcsr_feature_mask_init(void);
    extern int init_fpu(struct task_struct *child);
    -extern asmlinkage void math_state_restore(void);
    +extern void math_state_restore(void);
    extern void __math_state_restore(void);
    extern int dump_fpu(struct pt_regs *, struct user_i387_struct *);

    --- a/arch/x86/kernel/traps.c
    +++ b/arch/x86/kernel/traps.c
    @@ -745,10 +745,10 @@ void __math_state_restore(void)
    * Careful.. There are problems with IBM-designed IRQ13 behaviour.
    * Don't touch unless you *really* know how it works.
    *
    - * Must be called with kernel preemption disabled (in this case,
    - * local interrupts are disabled at the call-site in entry.S).
    + * Must be called with kernel preemption disabled (eg with local
    + * local interrupts as in the case of do_device_not_available).
    */
    -asmlinkage void math_state_restore(void)
    +void math_state_restore(void)
    {
    struct thread_info *thread = current_thread_info();
    struct task_struct *tsk = thread->task;



    \
     
     \ /
      Last update: 2012-02-28 02:09    [W:4.586 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site