Merge branches 'release' and 'throttling-domains' into release

2 files changed, 12 insertions, 0 deletions

diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c
index 5a216c019924..cbe6cee5a550 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 a25db514c719..324eb0cab19c 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;