diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:30:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:30:48 -0500 |
| commit | 8976b6fd7a0060f72e20d5cec833c03d50874cd1 (patch) | |
| tree | d5c98a6fc41e19b5a85e9181072d74452b2dc2ab /arch | |
| parent | 52b097fff89b14c0b8b7a7deef1d274889b1886d (diff) | |
| parent | 3391a76f2bbb74e42b9ba44c05a7366ffd388753 (diff) | |
| download | linux-3.10-8976b6fd7a0060f72e20d5cec833c03d50874cd1.tar.gz linux-3.10-8976b6fd7a0060f72e20d5cec833c03d50874cd1.tar.bz2 linux-3.10-8976b6fd7a0060f72e20d5cec833c03d50874cd1.zip | |
Merge branches 'release' and 'throttling-domains' into release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/acpi-processor.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/processor.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c index 5a216c01992..cbe6cee5a55 100644 --- a/arch/ia64/kernel/acpi-processor.c +++ b/arch/ia64/kernel/acpi-processor.c @@ -45,6 +45,12 @@ static void init_intel_pdc(struct acpi_processor *pr) buf[0] = ACPI_PDC_REVISION_ID; buf[1] = 1; buf[2] = ACPI_PDC_EST_CAPABILITY_SMP; + /* + * The default of PDC_SMP_T_SWCOORD bit is set for IA64 cpu so + * that OSPM is capable of native ACPI throttling software + * coordination using BIOS supplied _TSD info. + */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD; obj->type = ACPI_TYPE_BUFFER; obj->buffer.length = 12; diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index a25db514c71..324eb0cab19 100644 --- a/arch/x86/kernel/acpi/processor.c +++ b/arch/x86/kernel/acpi/processor.c @@ -46,6 +46,12 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) buf[1] = 1; buf[2] = ACPI_PDC_C_CAPABILITY_SMP; + /* + * The default of PDC_SMP_T_SWCOORD bit is set for intel x86 cpu so + * that OSPM is capable of native ACPI throttling software + * coordination using BIOS supplied _TSD info. + */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD; if (cpu_has(c, X86_FEATURE_EST)) buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; |