lkml.org 
[lkml]   [2010]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[07/30] x86, mce: Thermal monitoring depends on APIC being enabled
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

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

    From: Cyrill Gorcunov <gorcunov@openvz.org>

    commit 485a2e1973fd9f98c2c6776e66ac4721882b69e0 upstream.

    Add check if APIC is not disabled since thermal
    monitoring depends on it. As only apic gets disabled
    we should not try to install "thermal monitor" vector,
    print out that thermal monitoring is enabled and etc...

    Note that "Intel Correct Machine Check Interrupts" already
    has such a check.

    Also I decided to not add cpu_has_apic check into
    mcheck_intel_therm_init since even if it'll call apic_read on
    disabled apic -- it's safe here and allow us to save a few code
    bytes.

    Reported-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    LKML-Reference: <4B25FDC2.3020401@jp.fujitsu.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/cpu/mcheck/therm_throt.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
    +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
    @@ -274,8 +274,9 @@ void intel_init_thermal(struct cpuinfo_x
    int tm2 = 0;
    u32 l, h;

    - /* Thermal monitoring depends on ACPI and clock modulation*/
    - if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC))
    + /* Thermal monitoring depends on APIC, ACPI and clock modulation */
    + if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) ||
    + !cpu_has(c, X86_FEATURE_ACC))
    return;

    /*



    \
     
     \ /
      Last update: 2010-01-21 05:31    [W:2.349 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site