From 1e8c7cf3047c7c69137c820dd1950aa3f00cf1dc Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 14 Dec 2009 17:56:34 +0900 Subject: [PATCH] --- yaml --- r: 176209 b: refs/heads/master c: 485a2e1973fd9f98c2c6776e66ac4721882b69e0 h: refs/heads/master i: 176207: 47b92dee11039599cba3c152d88a25277cb3cfae v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d0750560eb2..fcf3f670ba44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3eee54276dfd1117fd94259f2b4a38388264724 +refs/heads/master: 485a2e1973fd9f98c2c6776e66ac4721882b69e0 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c b/trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c index 1003ed4bbce4..0a9b57702be4 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/trunk/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; /*