x86: mce intel -- don't touch THERMAL_APIC_VECTOR if no active APIC present
PATCH 1/1 x86: mce intel -- 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 Simon Holm Thøgersen <[email protected]>
Tested-by Simon Holm Thøgersen <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
--- arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/mce_intel.c +8 -2
@@ -21,9 +21,15 @@ void intel_init_thermal(struct cpuinfo_xint 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