ACPICA: minimal patch to integrate new tables into Linux

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 10 insertions, 17 deletions

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index cbb6f0814ce2..aabb98832ba6 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -352,31 +352,24 @@ int acpi_processor_notify_smm(struct module *calling_module)
 
         is_done = -EIO;
 
-        /* Can't write pstate_cnt to smi_cmd if either value is zero */
-        if ((!acpi_fadt.smi_cmd) || (!acpi_fadt.pstate_cnt)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_cnt\n"));
+        /* Can't write pstate_control to smi_command if either value is zero */
+        if ((!acpi_fadt.smi_command) || (!acpi_fadt.pstate_control)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_control\n"));
                 module_put(calling_module);
                 return 0;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Writing pstate_cnt [0x%x] to smi_cmd [0x%x]\n",
-                          acpi_fadt.pstate_cnt, acpi_fadt.smi_cmd));
+                          "Writing pstate_control [0x%x] to smi_command [0x%x]\n",
+                          acpi_fadt.pstate_control, acpi_fadt.smi_command));
 
-        /* FADT v1 doesn't support pstate_cnt, many BIOS vendors use
-         * it anyway, so we need to support it... */
-        if (acpi_fadt_is_v1) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Using v1.0 FADT reserved value for pstate_cnt\n"));
-        }
-
-        status = acpi_os_write_port(acpi_fadt.smi_cmd,
-                                    (u32) acpi_fadt.pstate_cnt, 8);
+        status = acpi_os_write_port(acpi_fadt.smi_command,
+                                    (u32) acpi_fadt.pstate_control, 8);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "Failed to write pstate_cnt [0x%x] to "
-                                "smi_cmd [0x%x]", acpi_fadt.pstate_cnt,
-                                acpi_fadt.smi_cmd));
+                                "Failed to write pstate_control [0x%x] to "
+                                "smi_command [0x%x]", acpi_fadt.pstate_control,
+                                acpi_fadt.smi_command));
                 module_put(calling_module);
                 return status;
         }