x86, mce: Thermal monitoring depends on APIC being enabled

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / cpu / mcheck / therm_throt.c

diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 1003ed4bbce4ebe3351157ebceffae8a5ecb4b40..0a9b57702be4382b514169a77336616e6fe8edc2 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -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;
 
        /*