3 files changed, 13 insertions, 18 deletions

diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c
index ab72d46f52c..ebe23f58bd6 100644
--- a/arch/ia64/kernel/acpi-processor.c
+++ b/arch/ia64/kernel/acpi-processor.c
@@ -18,15 +18,7 @@ static void init_intel_pdc(struct acpi_processor *pr)
 {
         u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer;
 
-        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;
+        buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
 
         return;
 }
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index 967860b43f2..d722ca8cb4c 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -16,16 +16,8 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
 {
         u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer;
 
-        buf[0] = ACPI_PDC_REVISION_ID;
-        buf[1] = 1;
-        buf[2] = ACPI_PDC_C_CAPABILITY_SMP;
+        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;
 
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index 87946b6da76..ccda7c95d07 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -33,6 +33,15 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
         {},
 };
 
+static void acpi_set_pdc_bits(u32 *buf)
+{
+        buf[0] = ACPI_PDC_REVISION_ID;
+        buf[1] = 1;
+
+        /* Enable coordination with firmware's _TSD info */
+        buf[2] = ACPI_PDC_SMP_T_SWCOORD;
+}
+
 static void acpi_processor_init_pdc(struct acpi_processor *pr)
 {
         struct acpi_object_list *obj_list;
@@ -63,6 +72,8 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
                 return;
         }
 
+        acpi_set_pdc_bits(buf);
+
         obj->type = ACPI_TYPE_BUFFER;
         obj->buffer.length = 12;
         obj->buffer.pointer = (u8 *) buf;