diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 1003ed4bbce4..0a9b57702be4 100644 --- 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) | |||
274 | int tm2 = 0; | 274 | int tm2 = 0; |
275 | u32 l, h; | 275 | u32 l, h; |
276 | 276 | ||
277 | /* Thermal monitoring depends on ACPI and clock modulation*/ | 277 | /* Thermal monitoring depends on APIC, ACPI and clock modulation */ |
278 | if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC)) | 278 | if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) || |
279 | !cpu_has(c, X86_FEATURE_ACC)) | ||
279 | return; | 280 | return; |
280 | 281 | ||
281 | /* | 282 | /* |