Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[cascardo/linux.git] / drivers / acpi / processor_perflib.c

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index aabb988..2f2e796 100644 (file)
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -44,10 +44,9 @@
 
 #define ACPI_PROCESSOR_COMPONENT       0x01000000
 #define ACPI_PROCESSOR_CLASS           "processor"
-#define ACPI_PROCESSOR_DRIVER_NAME     "ACPI Processor Driver"
 #define ACPI_PROCESSOR_FILE_PERFORMANCE        "performance"
 #define _COMPONENT             ACPI_PROCESSOR_COMPONENT
-ACPI_MODULE_NAME("acpi_processor")
+ACPI_MODULE_NAME("processor_perflib");
 
 static DEFINE_MUTEX(performance_mutex);
 
@@ -353,7 +352,7 @@ int acpi_processor_notify_smm(struct module *calling_module)
        is_done = -EIO;
 
        /* Can't write pstate_control to smi_command if either value is zero */
-       if ((!acpi_fadt.smi_command) || (!acpi_fadt.pstate_control)) {
+       if ((!acpi_gbl_FADT.smi_command) || (!acpi_gbl_FADT.pstate_control)) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_control\n"));
                module_put(calling_module);
                return 0;
@@ -361,15 +360,15 @@ int acpi_processor_notify_smm(struct module *calling_module)
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "Writing pstate_control [0x%x] to smi_command [0x%x]\n",
-                         acpi_fadt.pstate_control, acpi_fadt.smi_command));
+                         acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));
 
-       status = acpi_os_write_port(acpi_fadt.smi_command,
-                                   (u32) acpi_fadt.pstate_control, 8);
+       status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                                   (u32) acpi_gbl_FADT.pstate_control, 8);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status,
                                "Failed to write pstate_control [0x%x] to "
-                               "smi_command [0x%x]", acpi_fadt.pstate_control,
-                               acpi_fadt.smi_command));
+                               "smi_command [0x%x]", acpi_gbl_FADT.pstate_control,
+                               acpi_gbl_FADT.smi_command));
                module_put(calling_module);
                return status;
        }