x86, mce: Thermal monitoring depends on APIC being enabled
authorCyrill Gorcunov <gorcunov@openvz.org>
Mon, 14 Dec 2009 08:56:34 +0000 (17:56 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Jan 2010 23:18:09 +0000 (15:18 -0800)
commit8410b13cced2fa9aee301d4722a5ce751fcc253a
tree75ba07f44ca8b76bef9f72bef87262d409d3fbd4
parent1bd24fdff4b0bd7f0a50f330165a82be690a919c
x86, mce: Thermal monitoring depends on APIC being enabled

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