Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485a2e19 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
LKML-Reference: <4B25FDC2.3020401@jp.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f3eee542

arch/x86/kernel/cpu/mcheck/therm_throt.c

+3 −2
Original line number Diff line number Diff line
@@ -274,8 +274,9 @@ void intel_init_thermal(struct cpuinfo_x86 *c) 
	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;



	/*