lkml.org 
[lkml]   [2011]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT PULL] x86 fixes
    Linus,

    Please pull the latest x86-urgent-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-urgent-for-linus

    Thanks,

    Ingo

    ------------------>
    Avi Kivity (1):
    x86: Fix mwait_play_dead() faulting on mwait-incapable cpus

    Borislav Petkov (1):
    x86 idle: Fix mwait deprecation warning message


    arch/x86/kernel/process.c | 2 +-
    arch/x86/kernel/smpboot.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
    index 426a5b6..3d83a71 100644
    --- a/arch/x86/kernel/process.c
    +++ b/arch/x86/kernel/process.c
    @@ -642,7 +642,7 @@ static int __init idle_setup(char *str)
    boot_option_idle_override = IDLE_POLL;
    } else if (!strcmp(str, "mwait")) {
    boot_option_idle_override = IDLE_FORCE_MWAIT;
    - WARN_ONCE(1, "\idle=mwait\" will be removed in 2012\"\n");
    + WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\"\n");
    } else if (!strcmp(str, "halt")) {
    /*
    * When the boot option of idle=halt is added, halt is
    diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
    index eefd967..33a0c11 100644
    --- a/arch/x86/kernel/smpboot.c
    +++ b/arch/x86/kernel/smpboot.c
    @@ -1332,7 +1332,7 @@ static inline void mwait_play_dead(void)
    void *mwait_ptr;
    struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info);

    - if (!this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c))
    + if (!(this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c)))
    return;
    if (!this_cpu_has(X86_FEATURE_CLFLSH))
    return;

    \
     
     \ /
      Last update: 2011-05-31 18:33    [W:0.022 / U:93.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site