aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-11-20 01:20:31 -0500
committerLen Brown <len.brown@intel.com>2007-11-20 01:20:31 -0500
commit614a6bbecceb97558819f18a676fd819ea61550b (patch)
treed3f59dc6ef0ffdb14d8047072e096fdabeaf7d2b /arch/x86/kernel
parentc2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28 (diff)
parentf79f06ab9f86d7203006d2ec8992ac80df36a34e (diff)
downloadkernel_samsung_smdk4412-614a6bbecceb97558819f18a676fd819ea61550b.zip
kernel_samsung_smdk4412-614a6bbecceb97558819f18a676fd819ea61550b.tar.gz
kernel_samsung_smdk4412-614a6bbecceb97558819f18a676fd819ea61550b.tar.bz2
Pull thermal into release branch
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/acpi/processor.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index f63e5ff..a25db51 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -49,6 +49,9 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
if (cpu_has(c, X86_FEATURE_EST))
buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;
+ if (cpu_has(c, X86_FEATURE_ACPI))
+ buf[2] |= ACPI_PDC_T_FFH;
+
obj->type = ACPI_TYPE_BUFFER;
obj->buffer.length = 12;
obj->buffer.pointer = (u8 *) buf;