Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 485a2e1973fd9f98c2c6776e66ac4721882b69e0

Authored by Cyrill Gorcunov
Committed by Ingo Molnar
1 parent f3eee54276

x86, mce: Thermal monitoring depends on APIC being enabled 

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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

arch/x86/kernel/cpu/mcheck/therm_throt.c
Diff comments   View file @ 485a2e1
... ... @@ -274,8 +274,9 @@
274 274 int tm2 = 0;
275 275 u32 l, h;
276 276  
277   - /* Thermal monitoring depends on ACPI and clock modulation*/
278   - if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC))
  277 + /* Thermal monitoring depends on APIC, ACPI and clock modulation */
  278 + if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) ||
  279 + !cpu_has(c, X86_FEATURE_ACC))
279 280 return;
280 281  
281 282 /*