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

Commit 5ce4243d authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: mce: Don't touch THERMAL_APIC_VECTOR if no active APIC present 



If APIC was disabled (for some reason) and as result
it's not even mapped we should not try to enable thermal
interrupts at all.

Reported-by: default avatarSimon Holm Thøgersen <odie@cs.aau.dk>
Tested-by: default avatarSimon Holm Thøgersen <odie@cs.aau.dk>
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090615182633.GA7606@lenovo>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 203abd67

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

+8 −2
Original line number Diff line number Diff line
@@ -21,9 +21,15 @@ 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 ACPI, clock modulation

	 * and APIC as well

	 */

	if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC) ||

		!cpu_has(c, X86_FEATURE_APIC)) {

		pr_debug("Thermal monitoring disabled\n");

		return;

	}



	/*

	 * First check if its enabled already, in which case there might