diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:31 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:31 -0500 |
| commit | 614a6bbecceb97558819f18a676fd819ea61550b (patch) | |
| tree | d3f59dc6ef0ffdb14d8047072e096fdabeaf7d2b /arch/x86/kernel | |
| parent | c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28 (diff) | |
| parent | f79f06ab9f86d7203006d2ec8992ac80df36a34e (diff) | |
Pull thermal into release branch
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/acpi/processor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index f63e5ff0aca1..a25db514c719 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) | |||
| 49 | if (cpu_has(c, X86_FEATURE_EST)) | 49 | if (cpu_has(c, X86_FEATURE_EST)) |
| 50 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; | 50 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; |
| 51 | 51 | ||
| 52 | if (cpu_has(c, X86_FEATURE_ACPI)) | ||
| 53 | buf[2] |= ACPI_PDC_T_FFH; | ||
| 54 | |||
| 52 | obj->type = ACPI_TYPE_BUFFER; | 55 | obj->type = ACPI_TYPE_BUFFER; |
| 53 | obj->buffer.length = 12; | 56 | obj->buffer.length = 12; |
| 54 | obj->buffer.pointer = (u8 *) buf; | 57 | obj->buffer.pointer = (u8 *) buf; |