63 files changed, 1528 insertions, 1227 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 139f41f033d8..1121a1f4b5d7 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -280,6 +280,14 @@ config ACPI_DEBUG
          of verbosity. Saying Y enables these statements. This will increase
          your kernel size by around 50K.
+config ACPI_DEBUG_FUNC_TRACE
+        bool "Additionally enable ACPI function tracing"
+        default n
+        depends on ACPI_DEBUG
+        help
+          ACPI Debug Statements slow down ACPI processing. Function trace
+          is about half of the penalty and is rarely useful.
 config ACPI_EC
        bool
        default y
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index b770deab968c..3cd79caad70c 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1357,7 +1357,7 @@ static struct backlight_ops asus_backlight_data = {
        .update_status  = set_brightness_status,
 };
-static void __exit asus_acpi_exit(void)
+static void asus_acpi_exit(void)
 {
        if (asus_backlight_device)
                backlight_device_unregister(asus_backlight_device);
@@ -1398,7 +1398,7 @@ static int __init asus_acpi_init(void)
        if (!asus_hotk_found) {
                acpi_bus_unregister_driver(&asus_hotk_driver);
                remove_proc_entry(PROC_ASUS, acpi_root_dir);
-                return result;
+                return -ENODEV;
        }
        asus_backlight_device = backlight_device_register("asus",NULL,NULL,
@@ -1407,6 +1407,7 @@ static int __init asus_acpi_init(void)
                printk(KERN_ERR "Could not register asus backlight device\n");
                asus_backlight_device = NULL;
                asus_acpi_exit();
+                return -ENODEV;
        }
        asus_backlight_device->props.max_brightness = 15;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index e64c76c8b726..cad932de383d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -43,21 +43,30 @@
 #define ACPI_BATTERY_CLASS              "battery"
 #define ACPI_BATTERY_HID                "PNP0C0A"
 #define ACPI_BATTERY_DEVICE_NAME        "Battery"
-#define ACPI_BATTERY_FILE_INFO          "info"
-#define ACPI_BATTERY_FILE_STATUS        "state"
-#define ACPI_BATTERY_FILE_ALARM         "alarm"
 #define ACPI_BATTERY_NOTIFY_STATUS      0x80
 #define ACPI_BATTERY_NOTIFY_INFO        0x81
 #define ACPI_BATTERY_UNITS_WATTS        "mW"
 #define ACPI_BATTERY_UNITS_AMPS         "mA"
 #define _COMPONENT              ACPI_BATTERY_COMPONENT
+#define ACPI_BATTERY_UPDATE_TIME        0
+#define ACPI_BATTERY_NONE_UPDATE        0
+#define ACPI_BATTERY_EASY_UPDATE        1
+#define ACPI_BATTERY_INIT_UPDATE        2
 ACPI_MODULE_NAME("battery");
 MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI Battery Driver");
 MODULE_LICENSE("GPL");
+static unsigned int update_time = ACPI_BATTERY_UPDATE_TIME;
+/* 0 - every time, > 0 - by update_time */
+module_param(update_time, uint, 0644);
 extern struct proc_dir_entry *acpi_lock_battery_dir(void);
 extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
@@ -76,7 +85,7 @@ static struct acpi_driver acpi_battery_driver = {
                },
 };
-struct acpi_battery_status {
+struct acpi_battery_state {
        acpi_integer state;
        acpi_integer present_rate;
        acpi_integer remaining_capacity;
@@ -99,33 +108,111 @@ struct acpi_battery_info {
        acpi_string oem_info;
 };
-struct acpi_battery_flags {
+enum acpi_battery_files{
-        u8 present:1;           /* Bay occupied? */
+        ACPI_BATTERY_INFO = 0,
-        u8 power_unit:1;        /* 0=watts, 1=apms */
+        ACPI_BATTERY_STATE,
-        u8 alarm:1;             /* _BTP present? */
+        ACPI_BATTERY_ALARM,
-        u8 reserved:5;
+        ACPI_BATTERY_NUMFILES,
 };
-struct acpi_battery_trips {
+struct acpi_battery_flags {
-        unsigned long warning;
+        u8 battery_present_prev;
-        unsigned long low;
+        u8 alarm_present;
+        u8 init_update;
+        u8 update[ACPI_BATTERY_NUMFILES];
+        u8 power_unit;
 };
 struct acpi_battery {
-        struct acpi_device * device;
+        struct mutex mutex;
+        struct acpi_device *device;
        struct acpi_battery_flags flags;
-        struct acpi_battery_trips trips;
+        struct acpi_buffer bif_data;
+        struct acpi_buffer bst_data;
        unsigned long alarm;
-        struct acpi_battery_info *info;
+        unsigned long update_time[ACPI_BATTERY_NUMFILES];
 };
+inline int acpi_battery_present(struct acpi_battery *battery)
+{
+        return battery->device->status.battery_present;
+}
+inline char *acpi_battery_power_units(struct acpi_battery *battery)
+{
+        if (battery->flags.power_unit)
+                return ACPI_BATTERY_UNITS_AMPS;
+        else
+                return ACPI_BATTERY_UNITS_WATTS;
+}
+inline acpi_handle acpi_battery_handle(struct acpi_battery *battery)
+{
+        return battery->device->handle;
+}
 /* --------------------------------------------------------------------------
                               Battery Management
   -------------------------------------------------------------------------- */
-static int
+static void acpi_battery_check_result(struct acpi_battery *battery, int result)
-acpi_battery_get_info(struct acpi_battery *battery,
+{
-                      struct acpi_battery_info **bif)
+        if (!battery)
+                return;
+        if (result) {
+                battery->flags.init_update = 1;
+        }
+}
+static int acpi_battery_extract_package(struct acpi_battery *battery,
+                                        union acpi_object *package,
+                                        struct acpi_buffer *format,
+                                        struct acpi_buffer *data,
+                                        char *package_name)
+{
+        acpi_status status = AE_OK;
+        struct acpi_buffer data_null = { 0, NULL };
+        status = acpi_extract_package(package, format, &data_null);
+        if (status != AE_BUFFER_OVERFLOW) {
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting size %s",
+                                package_name));
+                return -ENODEV;
+        }
+        if (data_null.length != data->length) {
+                kfree(data->pointer);
+                data->pointer = kzalloc(data_null.length, GFP_KERNEL);
+                if (!data->pointer) {
+                        ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, "kzalloc()"));
+                        return -ENOMEM;
+                }
+                data->length = data_null.length;
+        }
+        status = acpi_extract_package(package, format, data);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting %s",
+                                package_name));
+                return -ENODEV;
+        }
+        return 0;
+}
+static int acpi_battery_get_status(struct acpi_battery *battery)
+{
+        int result = 0;
+        result = acpi_bus_get_status(battery->device);
+        if (result) {
+                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));
+                return -ENODEV;
+        }
+        return result;
+}
+static int acpi_battery_get_info(struct acpi_battery *battery)
 {
        int result = 0;
        acpi_status status = 0;
@@ -133,16 +220,20 @@ acpi_battery_get_info(struct acpi_battery *battery,
        struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BIF),
                ACPI_BATTERY_FORMAT_BIF
        };
-        struct acpi_buffer data = { 0, NULL };
        union acpi_object *package = NULL;
+        struct acpi_buffer *data = NULL;
+        struct acpi_battery_info *bif = NULL;
+        battery->update_time[ACPI_BATTERY_INFO] = get_seconds();
-        if (!battery || !bif)
+        if (!acpi_battery_present(battery))
-                return -EINVAL;
+                return 0;
-        /* Evalute _BIF */
+        /* Evaluate _BIF */
-        status = acpi_evaluate_object(battery->device->handle, "_BIF", NULL, &buffer);
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
+                                 &buffer);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                return -ENODEV;
@@ -150,41 +241,29 @@ acpi_battery_get_info(struct acpi_battery *battery,
        package = buffer.pointer;
-        /* Extract Package Data */
+        data = &battery->bif_data;
-        status = acpi_extract_package(package, &format, &data);
-        if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
-                result = -ENODEV;
-                goto end;
-        }
-        data.pointer = kzalloc(data.length, GFP_KERNEL);
+        /* Extract Package Data */
-        if (!data.pointer) {
-                result = -ENOMEM;
-                goto end;
-        }
-        status = acpi_extract_package(package, &format, &data);
+        result =
-        if (ACPI_FAILURE(status)) {
+            acpi_battery_extract_package(battery, package, &format, data,
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
+                                         "_BIF");
-                kfree(data.pointer);
+        if (result)
-                result = -ENODEV;
                goto end;
-        }
      end:
        kfree(buffer.pointer);
-        if (!result)
+        if (!result) {
-                (*bif) = data.pointer;
+                bif = data->pointer;
+                battery->flags.power_unit = bif->power_unit;
+        }
        return result;
 }
-static int
+static int acpi_battery_get_state(struct acpi_battery *battery)
-acpi_battery_get_status(struct acpi_battery *battery,
-                        struct acpi_battery_status **bst)
 {
        int result = 0;
        acpi_status status = 0;
@@ -192,16 +271,19 @@ acpi_battery_get_status(struct acpi_battery *battery,
        struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BST),
                ACPI_BATTERY_FORMAT_BST
        };
-        struct acpi_buffer data = { 0, NULL };
        union acpi_object *package = NULL;
+        struct acpi_buffer *data = NULL;
+        battery->update_time[ACPI_BATTERY_STATE] = get_seconds();
-        if (!battery || !bst)
+        if (!acpi_battery_present(battery))
-                return -EINVAL;
+                return 0;
-        /* Evalute _BST */
+        /* Evaluate _BST */
-        status = acpi_evaluate_object(battery->device->handle, "_BST", NULL, &buffer);
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
+                                 &buffer);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                return -ENODEV;
@@ -209,55 +291,49 @@ acpi_battery_get_status(struct acpi_battery *battery,
        package = buffer.pointer;
-        /* Extract Package Data */
+        data = &battery->bst_data;
-        status = acpi_extract_package(package, &format, &data);
-        if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
-                result = -ENODEV;
-                goto end;
-        }
-        data.pointer = kzalloc(data.length, GFP_KERNEL);
+        /* Extract Package Data */
-        if (!data.pointer) {
-                result = -ENOMEM;
-                goto end;
-        }
-        status = acpi_extract_package(package, &format, &data);
+        result =
-        if (ACPI_FAILURE(status)) {
+            acpi_battery_extract_package(battery, package, &format, data,
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
+                                         "_BST");
-                kfree(data.pointer);
+        if (result)
-                result = -ENODEV;
                goto end;
-        }
      end:
        kfree(buffer.pointer);
-        if (!result)
-                (*bst) = data.pointer;
        return result;
 }
-static int
+static int acpi_battery_get_alarm(struct acpi_battery *battery)
-acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)
+{
+        battery->update_time[ACPI_BATTERY_ALARM] = get_seconds();
+        return 0;
+}
+static int acpi_battery_set_alarm(struct acpi_battery *battery,
+                                  unsigned long alarm)
 {
        acpi_status status = 0;
        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
        struct acpi_object_list arg_list = { 1, &arg0 };
+        battery->update_time[ACPI_BATTERY_ALARM] = get_seconds();
-        if (!battery)
+        if (!acpi_battery_present(battery))
-                return -EINVAL;
+                return -ENODEV;
-        if (!battery->flags.alarm)
+        if (!battery->flags.alarm_present)
                return -ENODEV;
        arg0.integer.value = alarm;
-        status = acpi_evaluate_object(battery->device->handle, "_BTP", &arg_list, NULL);
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
+                                 &arg_list, NULL);
        if (ACPI_FAILURE(status))
                return -ENODEV;
@@ -268,65 +344,114 @@ acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)
        return 0;
 }
-static int acpi_battery_check(struct acpi_battery *battery)
+static int acpi_battery_init_alarm(struct acpi_battery *battery)
 {
        int result = 0;
        acpi_status status = AE_OK;
        acpi_handle handle = NULL;
-        struct acpi_device *device = NULL;
+        struct acpi_battery_info *bif = battery->bif_data.pointer;
-        struct acpi_battery_info *bif = NULL;
+        unsigned long alarm = battery->alarm;
+        /* See if alarms are supported, and if so, set default */
-        if (!battery)
+        status = acpi_get_handle(acpi_battery_handle(battery), "_BTP", &handle);
-                return -EINVAL;
+        if (ACPI_SUCCESS(status)) {
+                battery->flags.alarm_present = 1;
-        device = battery->device;
+                if (!alarm && bif) {
+                        alarm = bif->design_capacity_warning;
+                }
+                result = acpi_battery_set_alarm(battery, alarm);
+                if (result)
+                        goto end;
+        } else {
+                battery->flags.alarm_present = 0;
+        }
-        result = acpi_bus_get_status(device);
+      end:
-        if (result)
-                return result;
-        /* Insertion? */
+        return result;
+}
-        if (!battery->flags.present && device->status.battery_present) {
+static int acpi_battery_init_update(struct acpi_battery *battery)
+{
+        int result = 0;
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Battery inserted\n"));
+        result = acpi_battery_get_status(battery);
+        if (result)
+                return result;
-                /* Evalute _BIF to get certain static information */
+        battery->flags.battery_present_prev = acpi_battery_present(battery);
-                result = acpi_battery_get_info(battery, &bif);
+        if (acpi_battery_present(battery)) {
+                result = acpi_battery_get_info(battery);
+                if (result)
+                        return result;
+                result = acpi_battery_get_state(battery);
                if (result)
                        return result;
-                battery->flags.power_unit = bif->power_unit;
+                acpi_battery_init_alarm(battery);
-                battery->trips.warning = bif->design_capacity_warning;
+        }
-                battery->trips.low = bif->design_capacity_low;
-                kfree(bif);
+        return result;
+}
-                /* See if alarms are supported, and if so, set default */
+static int acpi_battery_update(struct acpi_battery *battery,
+                               int update, int *update_result_ptr)
+{
+        int result = 0;
+        int update_result = ACPI_BATTERY_NONE_UPDATE;
+        if (!acpi_battery_present(battery)) {
+                update = 1;
+        }
-                status = acpi_get_handle(battery->device->handle, "_BTP", &handle);
+        if (battery->flags.init_update) {
-                if (ACPI_SUCCESS(status)) {
+                result = acpi_battery_init_update(battery);
-                        battery->flags.alarm = 1;
+                if (result)
-                        acpi_battery_set_alarm(battery, battery->trips.warning);
+                        goto end;
+                update_result = ACPI_BATTERY_INIT_UPDATE;
+        } else if (update) {
+                result = acpi_battery_get_status(battery);
+                if (result)
+                        goto end;
+                if ((!battery->flags.battery_present_prev & acpi_battery_present(battery))
+                    || (battery->flags.battery_present_prev & !acpi_battery_present(battery))) {
+                        result = acpi_battery_init_update(battery);
+                        if (result)
+                                goto end;
+                        update_result = ACPI_BATTERY_INIT_UPDATE;
+                } else {
+                        update_result = ACPI_BATTERY_EASY_UPDATE;
                }
        }
-        /* Removal? */
+      end:
-        else if (battery->flags.present && !device->status.battery_present) {
+        battery->flags.init_update = (result != 0);
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Battery removed\n"));
-        }
-        battery->flags.present = device->status.battery_present;
+        *update_result_ptr = update_result;
        return result;
 }
-static void acpi_battery_check_present(struct acpi_battery *battery)
+static void acpi_battery_notify_update(struct acpi_battery *battery)
 {
-        if (!battery->flags.present) {
+        acpi_battery_get_status(battery);
-                acpi_battery_check(battery);
+        if (battery->flags.init_update) {
+                return;
+        }
+        if ((!battery->flags.battery_present_prev &
+             acpi_battery_present(battery)) ||
+            (battery->flags.battery_present_prev &
+             !acpi_battery_present(battery))) {
+                battery->flags.init_update = 1;
+        } else {
+                battery->flags.update[ACPI_BATTERY_INFO] = 1;
+                battery->flags.update[ACPI_BATTERY_STATE] = 1;
+                battery->flags.update[ACPI_BATTERY_ALARM] = 1;
        }
 }
@@ -335,37 +460,33 @@ static void acpi_battery_check_present(struct acpi_battery *battery)
   -------------------------------------------------------------------------- */
 static struct proc_dir_entry *acpi_battery_dir;
-static int acpi_battery_read_info(struct seq_file *seq, void *offset)
+static int acpi_battery_print_info(struct seq_file *seq, int result)
 {
-        int result = 0;
        struct acpi_battery *battery = seq->private;
        struct acpi_battery_info *bif = NULL;
        char *units = "?";
+        if (result)
-        if (!battery)
                goto end;
-        acpi_battery_check_present(battery);
+        if (acpi_battery_present(battery))
-        if (battery->flags.present)
                seq_printf(seq, "present:                 yes\n");
        else {
                seq_printf(seq, "present:                 no\n");
                goto end;
        }
-        /* Battery Info (_BIF) */
+        bif = battery->bif_data.pointer;
+        if (!bif) {
-        result = acpi_battery_get_info(battery, &bif);
+                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BIF buffer is NULL"));
-        if (result || !bif) {
+                result = -ENODEV;
-                seq_printf(seq, "ERROR: Unable to read battery information\n");
                goto end;
        }
-        units =
+        /* Battery Units */
-            bif->
-            power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
+        units = acpi_battery_power_units(battery);
        if (bif->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
                seq_printf(seq, "design capacity:         unknown\n");
@@ -396,7 +517,6 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
        else
                seq_printf(seq, "design voltage:          %d mV\n",
                           (u32) bif->design_voltage);
        seq_printf(seq, "design capacity warning: %d %sh\n",
                   (u32) bif->design_capacity_warning, units);
        seq_printf(seq, "design capacity low:     %d %sh\n",
@@ -411,50 +531,40 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
        seq_printf(seq, "OEM info:                %s\n", bif->oem_info);
      end:
-        kfree(bif);
-        return 0;
+        if (result)
-}
+                seq_printf(seq, "ERROR: Unable to read battery info\n");
-static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
+        return result;
-{
-        return single_open(file, acpi_battery_read_info, PDE(inode)->data);
 }
-static int acpi_battery_read_state(struct seq_file *seq, void *offset)
+static int acpi_battery_print_state(struct seq_file *seq, int result)
 {
-        int result = 0;
        struct acpi_battery *battery = seq->private;
-        struct acpi_battery_status *bst = NULL;
+        struct acpi_battery_state *bst = NULL;
        char *units = "?";
+        if (result)
-        if (!battery)
                goto end;
-        acpi_battery_check_present(battery);
+        if (acpi_battery_present(battery))
-        if (battery->flags.present)
                seq_printf(seq, "present:                 yes\n");
        else {
                seq_printf(seq, "present:                 no\n");
                goto end;
        }
-        /* Battery Units */
+        bst = battery->bst_data.pointer;
+        if (!bst) {
-        units =
+                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BST buffer is NULL"));
-            battery->flags.
+                result = -ENODEV;
-            power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
-        /* Battery Status (_BST) */
-        result = acpi_battery_get_status(battery, &bst);
-        if (result || !bst) {
-                seq_printf(seq, "ERROR: Unable to read battery status\n");
                goto end;
        }
+        /* Battery Units */
+        units = acpi_battery_power_units(battery);
        if (!(bst->state & 0x04))
                seq_printf(seq, "capacity state:          ok\n");
        else
@@ -490,48 +600,43 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
                           (u32) bst->present_voltage);
      end:
-        kfree(bst);
-        return 0;
+        if (result) {
-}
+                seq_printf(seq, "ERROR: Unable to read battery state\n");
+        }
-static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
+        return result;
-{
-        return single_open(file, acpi_battery_read_state, PDE(inode)->data);
 }
-static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
+static int acpi_battery_print_alarm(struct seq_file *seq, int result)
 {
        struct acpi_battery *battery = seq->private;
        char *units = "?";
+        if (result)
-        if (!battery)
                goto end;
-        acpi_battery_check_present(battery);
+        if (!acpi_battery_present(battery)) {
-        if (!battery->flags.present) {
                seq_printf(seq, "present:                 no\n");
                goto end;
        }
        /* Battery Units */
-        units =
+        units = acpi_battery_power_units(battery);
-            battery->flags.
-            power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
-        /* Battery Alarm */
        seq_printf(seq, "alarm:                   ");
        if (!battery->alarm)
                seq_printf(seq, "unsupported\n");
        else
-                seq_printf(seq, "%d %sh\n", (u32) battery->alarm, units);
+                seq_printf(seq, "%lu %sh\n", battery->alarm, units);
      end:
-        return 0;
+        if (result)
+                seq_printf(seq, "ERROR: Unable to read battery alarm\n");
+        return result;
 }
 static ssize_t
@@ -543,27 +648,113 @@ acpi_battery_write_alarm(struct file *file,
        char alarm_string[12] = { '\0' };
        struct seq_file *m = file->private_data;
        struct acpi_battery *battery = m->private;
+        int update_result = ACPI_BATTERY_NONE_UPDATE;
        if (!battery || (count > sizeof(alarm_string) - 1))
                return -EINVAL;
-        acpi_battery_check_present(battery);
+        mutex_lock(&battery->mutex);
-        if (!battery->flags.present)
+        result = acpi_battery_update(battery, 1, &update_result);
-                return -ENODEV;
+        if (result) {
+                result = -ENODEV;
+                goto end;
+        }
+        if (!acpi_battery_present(battery)) {
+                result = -ENODEV;
+                goto end;
+        }
-        if (copy_from_user(alarm_string, buffer, count))
+        if (copy_from_user(alarm_string, buffer, count)) {
-                return -EFAULT;
+                result = -EFAULT;
+                goto end;
+        }
        alarm_string[count] = '\0';
        result = acpi_battery_set_alarm(battery,
                                        simple_strtoul(alarm_string, NULL, 0));
        if (result)
-                return result;
+                goto end;
+      end:
-        return count;
+        acpi_battery_check_result(battery, result);
+        if (!result)
+                result = count;
+        mutex_unlock(&battery->mutex);
+        return result;
+}
+typedef int(*print_func)(struct seq_file *seq, int result);
+typedef int(*get_func)(struct acpi_battery *battery);
+static struct acpi_read_mux {
+        print_func print;
+        get_func get;
+} acpi_read_funcs[ACPI_BATTERY_NUMFILES] = {
+        {.get = acpi_battery_get_info, .print = acpi_battery_print_info},
+        {.get = acpi_battery_get_state, .print = acpi_battery_print_state},
+        {.get = acpi_battery_get_alarm, .print = acpi_battery_print_alarm},
+};
+static int acpi_battery_read(int fid, struct seq_file *seq)
+{
+        struct acpi_battery *battery = seq->private;
+        int result = 0;
+        int update_result = ACPI_BATTERY_NONE_UPDATE;
+        int update = 0;
+        mutex_lock(&battery->mutex);
+        update = (get_seconds() - battery->update_time[fid] >= update_time);
+        update = (update | battery->flags.update[fid]);
+        result = acpi_battery_update(battery, update, &update_result);
+        if (result)
+                goto end;
+        if (update_result == ACPI_BATTERY_EASY_UPDATE) {
+                result = acpi_read_funcs[fid].get(battery);
+                if (result)
+                        goto end;
+        }
+      end:
+        result = acpi_read_funcs[fid].print(seq, result);
+        acpi_battery_check_result(battery, result);
+        battery->flags.update[fid] = result;
+        mutex_unlock(&battery->mutex);
+        return result;
+}
+static int acpi_battery_read_info(struct seq_file *seq, void *offset)
+{
+        return acpi_battery_read(ACPI_BATTERY_INFO, seq);
+}
+static int acpi_battery_read_state(struct seq_file *seq, void *offset)
+{
+        return acpi_battery_read(ACPI_BATTERY_STATE, seq);
+}
+static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
+{
+        return acpi_battery_read(ACPI_BATTERY_ALARM, seq);
+}
+static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
+{
+        return single_open(file, acpi_battery_read_info, PDE(inode)->data);
+}
+static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
+{
+        return single_open(file, acpi_battery_read_state, PDE(inode)->data);
 }
 static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
@@ -571,35 +762,51 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
        return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
 }
-static const struct file_operations acpi_battery_info_ops = {
+static struct battery_file {
+        struct file_operations ops;
+        mode_t mode;
+        char *name;
+} acpi_battery_file[] = {
+        {
+        .name = "info",
+        .mode = S_IRUGO,
+        .ops = {
        .open = acpi_battery_info_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
        .release = single_release,
        .owner = THIS_MODULE,
-};
+        },
+        },
-static const struct file_operations acpi_battery_state_ops = {
+        {
+        .name = "state",
+        .mode = S_IRUGO,
+        .ops = {
        .open = acpi_battery_state_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
        .release = single_release,
        .owner = THIS_MODULE,
-};
+        },
+        },
-static const struct file_operations acpi_battery_alarm_ops = {
+        {
+        .name = "alarm",
+        .mode = S_IFREG | S_IRUGO | S_IWUSR,
+        .ops = {
        .open = acpi_battery_alarm_open_fs,
        .read = seq_read,
        .write = acpi_battery_write_alarm,
        .llseek = seq_lseek,
        .release = single_release,
        .owner = THIS_MODULE,
+        },
+        },
 };
 static int acpi_battery_add_fs(struct acpi_device *device)
 {
        struct proc_dir_entry *entry = NULL;
+        int i;
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
@@ -609,38 +816,16 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                acpi_device_dir(device)->owner = THIS_MODULE;
        }
-        /* 'info' [R] */
+        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
-        entry = create_proc_entry(ACPI_BATTERY_FILE_INFO,
+                entry = create_proc_entry(acpi_battery_file[i].name,
-                                  S_IRUGO, acpi_device_dir(device));
+                                  acpi_battery_file[i].mode, acpi_device_dir(device));
-        if (!entry)
+                if (!entry)
-                return -ENODEV;
+                        return -ENODEV;
-        else {
+                else {
-                entry->proc_fops = &acpi_battery_info_ops;
+                        entry->proc_fops = &acpi_battery_file[i].ops;
-                entry->data = acpi_driver_data(device);
+                        entry->data = acpi_driver_data(device);
-                entry->owner = THIS_MODULE;
+                        entry->owner = THIS_MODULE;
-        }
+                }
-        /* 'status' [R] */
-        entry = create_proc_entry(ACPI_BATTERY_FILE_STATUS,
-                                  S_IRUGO, acpi_device_dir(device));
-        if (!entry)
-                return -ENODEV;
-        else {
-                entry->proc_fops = &acpi_battery_state_ops;
-                entry->data = acpi_driver_data(device);
-                entry->owner = THIS_MODULE;
-        }
-        /* 'alarm' [R/W] */
-        entry = create_proc_entry(ACPI_BATTERY_FILE_ALARM,
-                                  S_IFREG | S_IRUGO | S_IWUSR,
-                                  acpi_device_dir(device));
-        if (!entry)
-                return -ENODEV;
-        else {
-                entry->proc_fops = &acpi_battery_alarm_ops;
-                entry->data = acpi_driver_data(device);
-                entry->owner = THIS_MODULE;
        }
        return 0;
@@ -648,15 +833,12 @@ static int acpi_battery_add_fs(struct acpi_device *device)
 static int acpi_battery_remove_fs(struct acpi_device *device)
 {
+        int i;
        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_BATTERY_FILE_ALARM,
+                for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
+                        remove_proc_entry(acpi_battery_file[i].name,
                                  acpi_device_dir(device));
-                remove_proc_entry(ACPI_BATTERY_FILE_STATUS,
+                }
-                                  acpi_device_dir(device));
-                remove_proc_entry(ACPI_BATTERY_FILE_INFO,
-                                  acpi_device_dir(device));
                remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
                acpi_device_dir(device) = NULL;
        }
@@ -673,7 +855,6 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
        struct acpi_battery *battery = data;
        struct acpi_device *device = NULL;
        if (!battery)
                return;
@@ -684,8 +865,10 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
        case ACPI_BATTERY_NOTIFY_INFO:
        case ACPI_NOTIFY_BUS_CHECK:
        case ACPI_NOTIFY_DEVICE_CHECK:
-                acpi_battery_check(battery);
+                device = battery->device;
-                acpi_bus_generate_event(device, event, battery->flags.present);
+                acpi_battery_notify_update(battery);
+                acpi_bus_generate_event(device, event,
+                                        acpi_battery_present(battery));
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -702,7 +885,6 @@ static int acpi_battery_add(struct acpi_device *device)
        acpi_status status = 0;
        struct acpi_battery *battery = NULL;
        if (!device)
                return -EINVAL;
@@ -710,15 +892,21 @@ static int acpi_battery_add(struct acpi_device *device)
        if (!battery)
                return -ENOMEM;
+        mutex_init(&battery->mutex);
+        mutex_lock(&battery->mutex);
        battery->device = device;
        strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
        acpi_driver_data(device) = battery;
-        result = acpi_battery_check(battery);
+        result = acpi_battery_get_status(battery);
        if (result)
                goto end;
+        battery->flags.init_update = 1;
        result = acpi_battery_add_fs(device);
        if (result)
                goto end;
@@ -727,6 +915,7 @@ static int acpi_battery_add(struct acpi_device *device)
                                             ACPI_ALL_NOTIFY,
                                             acpi_battery_notify, battery);
        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Installing notify handler"));
                result = -ENODEV;
                goto end;
        }
@@ -736,11 +925,14 @@ static int acpi_battery_add(struct acpi_device *device)
               device->status.battery_present ? "present" : "absent");
      end:
        if (result) {
                acpi_battery_remove_fs(device);
                kfree(battery);
        }
+        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -749,18 +941,27 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        acpi_status status = 0;
        struct acpi_battery *battery = NULL;
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
        battery = acpi_driver_data(device);
+        mutex_lock(&battery->mutex);
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY,
                                            acpi_battery_notify);
        acpi_battery_remove_fs(device);
+        kfree(battery->bif_data.pointer);
+        kfree(battery->bst_data.pointer);
+        mutex_unlock(&battery->mutex);
+        mutex_destroy(&battery->mutex);
        kfree(battery);
        return 0;
@@ -775,7 +976,10 @@ static int acpi_battery_resume(struct acpi_device *device)
                return -EINVAL;
        battery = device->driver_data;
-        return acpi_battery_check(battery);
+        battery->flags.init_update = 1;
+        return 0;
 }
 static int __init acpi_battery_init(void)
@@ -800,7 +1004,6 @@ static int __init acpi_battery_init(void)
 static void __exit acpi_battery_exit(void)
 {
        acpi_bus_unregister_driver(&acpi_battery_driver);
        acpi_unlock_battery_dir(acpi_battery_dir);
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 1683e5c5b94c..1cbe61905824 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -231,8 +231,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                 * Obtain the method mutex if necessary. Do not acquire mutex for a
                 * recursive call.
                 */
-                if (acpi_os_get_thread_id() !=
+                if (!walk_state ||
-                    obj_desc->method.mutex->mutex.owner_thread_id) {
+                    !obj_desc->method.mutex->mutex.owner_thread ||
+                    (walk_state->thread !=
+                     obj_desc->method.mutex->mutex.owner_thread)) {
                        /*
                         * Acquire the method mutex. This releases the interpreter if we
                         * block (and reacquires it before it returns)
@@ -246,14 +248,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                        }
                        /* Update the mutex and walk info and save the original sync_level */
-                        obj_desc->method.mutex->mutex.owner_thread_id =
-                                acpi_os_get_thread_id();
                        if (walk_state) {
                                obj_desc->method.mutex->mutex.
                                    original_sync_level =
                                    walk_state->thread->current_sync_level;
+                                obj_desc->method.mutex->mutex.owner_thread =
+                                    walk_state->thread;
                                walk_state->thread->current_sync_level =
                                    obj_desc->method.sync_level;
                        } else {
@@ -567,7 +569,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                        acpi_os_release_mutex(method_desc->method.mutex->mutex.
                                              os_mutex);
-                        method_desc->method.mutex->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                        method_desc->method.mutex->mutex.owner_thread = NULL;
                }
        }
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 6c6104a7a247..fc9da4879cbf 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
                    ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&
                     (op->common.parent->common.aml_opcode !=
                      AML_VAR_PACKAGE_OP)
-                     && (op->common.parent->common.aml_opcode !=
+                     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {
-                         AML_NAME_OP))) {
                        walk_state->result_obj = obj_desc;
                }
        }
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index e4073e05a75c..71503c036f7c 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                         * indicate this to the interpreter, set the
                                         * object to the root
                                         */
-                                        obj_desc =
+                                        obj_desc = ACPI_CAST_PTR(union
-                                            ACPI_CAST_PTR(union
+                                                                 acpi_operand_object,
-                                                          acpi_operand_object,
+                                                                 acpi_gbl_root_node);
-                                                          acpi_gbl_root_node);
                                        status = AE_OK;
                                } else {
                                        /*
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 16c8e38b51ef..5afcdd9c7449 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
 *
 ******************************************************************************/
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
-                                                  union acpi_parse_object
+                                                  *origin, union acpi_operand_object
-                                                  *origin,
+                                                  *method_desc, struct acpi_thread_state
-                                                  union acpi_operand_object
-                                                  *method_desc,
-                                                  struct acpi_thread_state
                                                  *thread)
 {
        struct acpi_walk_state *walk_state;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e08cf98f504f..10e851021eca 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -34,25 +34,26 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/interrupt.h>
+#include <linux/list.h>
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/actypes.h>
-#define _COMPONENT              ACPI_EC_COMPONENT
-ACPI_MODULE_NAME("ec");
-#define ACPI_EC_COMPONENT               0x00100000
 #define ACPI_EC_CLASS                   "embedded_controller"
 #define ACPI_EC_HID                     "PNP0C09"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
 #define ACPI_EC_FILE_INFO               "info"
 #undef PREFIX
 #define PREFIX                          "ACPI: EC: "
 /* EC status register */
 #define ACPI_EC_FLAG_OBF        0x01    /* Output buffer full */
 #define ACPI_EC_FLAG_IBF        0x02    /* Input buffer full */
 #define ACPI_EC_FLAG_BURST      0x10    /* burst mode */
 #define ACPI_EC_FLAG_SCI        0x20    /* EC-SCI occurred */
 /* EC commands */
 enum ec_command {
        ACPI_EC_COMMAND_READ = 0x80,
@@ -61,6 +62,7 @@ enum ec_command {
        ACPI_EC_BURST_DISABLE = 0x83,
        ACPI_EC_COMMAND_QUERY = 0x84,
 };
 /* EC events */
 enum ec_event {
        ACPI_EC_EVENT_OBF_1 = 1,        /* Output buffer full */
@@ -94,6 +96,16 @@ static struct acpi_driver acpi_ec_driver = {
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
 /* External interfaces use first EC only, so remember */
+typedef int (*acpi_ec_query_func) (void *data);
+struct acpi_ec_query_handler {
+        struct list_head node;
+        acpi_ec_query_func func;
+        acpi_handle handle;
+        void *data;
+        u8 query_bit;
+};
 static struct acpi_ec {
        acpi_handle handle;
        unsigned long gpe;
@@ -104,6 +116,7 @@ static struct acpi_ec {
        atomic_t query_pending;
        atomic_t event_count;
        wait_queue_head_t wait;
+        struct list_head list;
 } *boot_ec, *first_ec;
 /* --------------------------------------------------------------------------
@@ -147,9 +160,10 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event,
        return 0;
 }
-static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count)
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event,
+                        unsigned count, int force_poll)
 {
-        if (acpi_ec_mode == EC_POLL) {
+        if (unlikely(force_poll) || acpi_ec_mode == EC_POLL) {
                unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
                while (time_before(jiffies, delay)) {
                        if (acpi_ec_check_status(ec, event, 0))
@@ -173,14 +187,15 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count)
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
                                        const u8 * wdata, unsigned wdata_len,
-                                        u8 * rdata, unsigned rdata_len)
+                                        u8 * rdata, unsigned rdata_len,
+                                        int force_poll)
 {
        int result = 0;
        unsigned count = atomic_read(&ec->event_count);
        acpi_ec_write_cmd(ec, command);
        for (; wdata_len > 0; --wdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);
                if (result) {
                        printk(KERN_ERR PREFIX
                               "write_cmd timeout, command = %d\n", command);
@@ -191,7 +206,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
        }
        if (!rdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);
                if (result) {
                        printk(KERN_ERR PREFIX
                               "finish-write timeout, command = %d\n", command);
@@ -202,7 +217,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
        }
        for (; rdata_len > 0; --rdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count, force_poll);
                if (result) {
                        printk(KERN_ERR PREFIX "read timeout, command = %d\n",
                               command);
@@ -217,7 +232,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
 static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
                               const u8 * wdata, unsigned wdata_len,
-                               u8 * rdata, unsigned rdata_len)
+                               u8 * rdata, unsigned rdata_len,
+                               int force_poll)
 {
        int status;
        u32 glk;
@@ -240,16 +256,17 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
        /* Make sure GPE is enabled before doing transaction */
        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
-        status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0);
+        status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0, 0);
        if (status) {
-                printk(KERN_DEBUG PREFIX
+                printk(KERN_ERR PREFIX
                       "input buffer is not empty, aborting transaction\n");
                goto end;
        }
        status = acpi_ec_transaction_unlocked(ec, command,
                                              wdata, wdata_len,
-                                              rdata, rdata_len);
+                                              rdata, rdata_len,
+                                              force_poll);
      end:
@@ -267,12 +284,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
 int acpi_ec_burst_enable(struct acpi_ec *ec)
 {
        u8 d;
-        return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1);
+        return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1, 0);
 }
 int acpi_ec_burst_disable(struct acpi_ec *ec)
 {
-        return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0);
+        return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0, 0);
 }
 static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
@@ -281,7 +298,7 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
        u8 d;
        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_READ,
-                                     &address, 1, &d, 1);
+                                     &address, 1, &d, 1, 0);
        *data = d;
        return result;
 }
@@ -290,7 +307,7 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
 {
        u8 wdata[2] = { address, data };
        return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
-                                   wdata, 2, NULL, 0);
+                                   wdata, 2, NULL, 0, 0);
 }
 /*
@@ -349,13 +366,15 @@ EXPORT_SYMBOL(ec_write);
 int ec_transaction(u8 command,
                   const u8 * wdata, unsigned wdata_len,
-                   u8 * rdata, unsigned rdata_len)
+                   u8 * rdata, unsigned rdata_len,
+                   int force_poll)
 {
        if (!first_ec)
                return -ENODEV;
        return acpi_ec_transaction(first_ec, command, wdata,
-                                   wdata_len, rdata, rdata_len);
+                                   wdata_len, rdata, rdata_len,
+                                   force_poll);
 }
 EXPORT_SYMBOL(ec_transaction);
@@ -374,7 +393,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
         * bit to be cleared (and thus clearing the interrupt source).
         */
-        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
+        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1, 0);
        if (result)
                return result;
@@ -388,21 +407,67 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
 /* --------------------------------------------------------------------------
                                Event Management
   -------------------------------------------------------------------------- */
+int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
+                              acpi_handle handle, acpi_ec_query_func func,
+                              void *data)
+{
+        struct acpi_ec_query_handler *handler =
+            kzalloc(sizeof(struct acpi_ec_query_handler), GFP_KERNEL);
+        if (!handler)
+                return -ENOMEM;
+        handler->query_bit = query_bit;
+        handler->handle = handle;
+        handler->func = func;
+        handler->data = data;
+        mutex_lock(&ec->lock);
+        list_add_tail(&handler->node, &ec->list);
+        mutex_unlock(&ec->lock);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_ec_add_query_handler);
+void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
+{
+        struct acpi_ec_query_handler *handler;
+        mutex_lock(&ec->lock);
+        list_for_each_entry(handler, &ec->list, node) {
+                if (query_bit == handler->query_bit) {
+                        list_del(&handler->node);
+                        kfree(handler);
+                        break;
+                }
+        }
+        mutex_unlock(&ec->lock);
+}
+EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler);
 static void acpi_ec_gpe_query(void *ec_cxt)
 {
        struct acpi_ec *ec = ec_cxt;
        u8 value = 0;
-        char object_name[8];
+        struct acpi_ec_query_handler *handler, copy;
        if (!ec || acpi_ec_query(ec, &value))
                return;
+        mutex_lock(&ec->lock);
-        snprintf(object_name, 8, "_Q%2.2X", value);
+        list_for_each_entry(handler, &ec->list, node) {
+                if (value == handler->query_bit) {
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
+                        /* have custom handler for this bit */
+                        memcpy(&copy, handler, sizeof(copy));
-        acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
+                        mutex_unlock(&ec->lock);
+                        if (copy.func) {
+                                copy.func(copy.data);
+                        } else if (copy.handle) {
+                                acpi_evaluate_object(copy.handle, NULL, NULL, NULL);
+                        }
+                        return;
+                }
+        }
+        mutex_unlock(&ec->lock);
+        printk(KERN_ERR PREFIX "Handler for query 0x%x is not found!\n", value);
 }
 static u32 acpi_ec_gpe_handler(void *data)
@@ -410,6 +475,7 @@ static u32 acpi_ec_gpe_handler(void *data)
        acpi_status status = AE_OK;
        u8 value;
        struct acpi_ec *ec = data;
        atomic_inc(&ec->event_count);
        if (acpi_ec_mode == EC_INTR) {
@@ -420,8 +486,7 @@ static u32 acpi_ec_gpe_handler(void *data)
        if ((value & ACPI_EC_FLAG_SCI) && !atomic_read(&ec->query_pending)) {
                atomic_set(&ec->query_pending, 1);
                status =
-                    acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query,
+                    acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query, ec);
-                                    ec);
        }
        return status == AE_OK ?
@@ -447,57 +512,35 @@ acpi_ec_space_setup(acpi_handle region_handle,
 }
 static acpi_status
-acpi_ec_space_handler(u32 function,
+acpi_ec_space_handler(u32 function, acpi_physical_address address,
-                      acpi_physical_address address,
+                      u32 bits, acpi_integer *value,
-                      u32 bit_width,
-                      acpi_integer * value,
                      void *handler_context, void *region_context)
 {
-        int result = 0;
        struct acpi_ec *ec = handler_context;
-        u64 temp = *value;
+        int result = 0, i = 0;
-        acpi_integer f_v = 0;
+        u8 temp = 0;
-        int i = 0;
        if ((address > 0xFF) || !value || !handler_context)
                return AE_BAD_PARAMETER;
-        if (bit_width != 8 && acpi_strict) {
+        if (function != ACPI_READ && function != ACPI_WRITE)
                return AE_BAD_PARAMETER;
-        }
-      next_byte:
-        switch (function) {
-        case ACPI_READ:
-                temp = 0;
-                result = acpi_ec_read(ec, (u8) address, (u8 *) & temp);
-                break;
-        case ACPI_WRITE:
-                result = acpi_ec_write(ec, (u8) address, (u8) temp);
-                break;
-        default:
-                result = -EINVAL;
-                goto out;
-                break;
-        }
-        bit_width -= 8;
+        if (bits != 8 && acpi_strict)
-        if (bit_width) {
+                return AE_BAD_PARAMETER;
-                if (function == ACPI_READ)
-                        f_v |= temp << 8 * i;
-                if (function == ACPI_WRITE)
-                        temp >>= 8;
-                i++;
-                address++;
-                goto next_byte;
-        }
-        if (function == ACPI_READ) {
+        while (bits - i > 0) {
-                f_v |= temp << 8 * i;
+                if (function == ACPI_READ) {
-                *value = f_v;
+                        result = acpi_ec_read(ec, address, &temp);
+                        (*value) |= ((acpi_integer)temp) << i;
+                } else {
+                        temp = 0xff & ((*value) >> i);
+                        result = acpi_ec_write(ec, address, temp);
+                }
+                i += 8;
+                ++address;
        }
-      out:
        switch (result) {
        case -EINVAL:
                return AE_BAD_PARAMETER;
@@ -590,9 +633,6 @@ static int acpi_ec_remove_fs(struct acpi_device *device)
 static acpi_status
 ec_parse_io_ports(struct acpi_resource *resource, void *context);
-static acpi_status
-ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval);
 static struct acpi_ec *make_acpi_ec(void)
 {
        struct acpi_ec *ec = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
@@ -603,13 +643,52 @@ static struct acpi_ec *make_acpi_ec(void)
        atomic_set(&ec->event_count, 1);
        mutex_init(&ec->lock);
        init_waitqueue_head(&ec->wait);
+        INIT_LIST_HEAD(&ec->list);
        return ec;
 }
+static acpi_status
+acpi_ec_register_query_methods(acpi_handle handle, u32 level,
+                               void *context, void **return_value)
+{
+        struct acpi_namespace_node *node = handle;
+        struct acpi_ec *ec = context;
+        int value = 0;
+        if (sscanf(node->name.ascii, "_Q%x", &value) == 1) {
+                acpi_ec_add_query_handler(ec, value, handle, NULL, NULL);
+        }
+        return AE_OK;
+}
+static int ec_parse_device(struct acpi_ec *ec, acpi_handle handle)
+{
+        if (ACPI_FAILURE(acpi_walk_resources(handle, METHOD_NAME__CRS,
+                                     ec_parse_io_ports, ec)))
+                return -EINVAL;
+        /* Get GPE bit assignment (EC events). */
+        /* TODO: Add support for _GPE returning a package */
+        if (ACPI_FAILURE(acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe)))
+                return -EINVAL;
+        /* Use the global lock for all EC transactions? */
+        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
+        /* Find and register all query methods */
+        acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
+                            acpi_ec_register_query_methods, ec, NULL);
+        ec->handle = handle;
+        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx",
+                          ec->gpe, ec->command_addr, ec->data_addr);
+        return 0;
+}
 static int acpi_ec_add(struct acpi_device *device)
 {
-        acpi_status status = AE_OK;
        struct acpi_ec *ec = NULL;
        if (!device)
@@ -622,8 +701,7 @@ static int acpi_ec_add(struct acpi_device *device)
        if (!ec)
                return -ENOMEM;
-        status = ec_parse_device(device->handle, 0, ec, NULL);
+        if (ec_parse_device(ec, device->handle)) {
-        if (status != AE_CTRL_TERMINATE) {
                kfree(ec);
                return -EINVAL;
        }
@@ -634,6 +712,8 @@ static int acpi_ec_add(struct acpi_device *device)
                        /* We might have incorrect info for GL at boot time */
                        mutex_lock(&boot_ec->lock);
                        boot_ec->global_lock = ec->global_lock;
+                        /* Copy handlers from new ec into boot ec */
+                        list_splice(&ec->list, &boot_ec->list);
                        mutex_unlock(&boot_ec->lock);
                        kfree(ec);
                        ec = boot_ec;
@@ -644,22 +724,24 @@ static int acpi_ec_add(struct acpi_device *device)
        acpi_driver_data(device) = ec;
        acpi_ec_add_fs(device);
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s [%s] (gpe %d) interrupt mode.",
-                          acpi_device_name(device), acpi_device_bid(device),
-                          (u32) ec->gpe));
        return 0;
 }
 static int acpi_ec_remove(struct acpi_device *device, int type)
 {
        struct acpi_ec *ec;
+        struct acpi_ec_query_handler *handler;
        if (!device)
                return -EINVAL;
        ec = acpi_driver_data(device);
+        mutex_lock(&ec->lock);
+        list_for_each_entry(handler, &ec->list, node) {
+                list_del(&handler->node);
+                kfree(handler);
+        }
+        mutex_unlock(&ec->lock);
        acpi_ec_remove_fs(device);
        acpi_driver_data(device) = NULL;
        if (ec == first_ec)
@@ -715,15 +797,13 @@ static int ec_install_handlers(struct acpi_ec *ec)
                return -ENODEV;
        }
-        /* EC is fully operational, allow queries */
-        atomic_set(&ec->query_pending, 0);
        return 0;
 }
 static int acpi_ec_start(struct acpi_device *device)
 {
        struct acpi_ec *ec;
+        int ret = 0;
        if (!device)
                return -EINVAL;
@@ -733,14 +813,14 @@ static int acpi_ec_start(struct acpi_device *device)
        if (!ec)
                return -EINVAL;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "gpe=0x%02lx, ports=0x%2lx,0x%2lx",
-                          ec->gpe, ec->command_addr, ec->data_addr));
        /* Boot EC is already working */
-        if (ec == boot_ec)
+        if (ec != boot_ec)
-                return 0;
+                ret = ec_install_handlers(ec);
+        /* EC is fully operational, allow queries */
+        atomic_set(&ec->query_pending, 0);
-        return ec_install_handlers(ec);
+        return ret;
 }
 static int acpi_ec_stop(struct acpi_device *device, int type)
@@ -772,34 +852,6 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        return 0;
 }
-static acpi_status
-ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
-{
-        acpi_status status;
-        struct acpi_ec *ec = context;
-        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
-                                     ec_parse_io_ports, ec);
-        if (ACPI_FAILURE(status))
-                return status;
-        /* Get GPE bit assignment (EC events). */
-        /* TODO: Add support for _GPE returning a package */
-        status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
-        if (ACPI_FAILURE(status))
-                return status;
-        /* Use the global lock for all EC transactions? */
-        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
-        ec->handle = handle;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "GPE=0x%02lx, ports=0x%2lx, 0x%2lx",
-                          ec->gpe, ec->command_addr, ec->data_addr));
-        return AE_CTRL_TERMINATE;
-}
 int __init acpi_ec_ecdt_probe(void)
 {
        int ret;
@@ -818,7 +870,7 @@ int __init acpi_ec_ecdt_probe(void)
        if (ACPI_FAILURE(status))
                goto error;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found ECDT"));
+        printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
        boot_ec->command_addr = ecdt_ptr->control.address;
        boot_ec->data_addr = ecdt_ptr->data.address;
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 635ba449ebc2..e22f4a973c0f 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -341,9 +341,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
        /* A Non-NULL gpe_device means this is a GPE Block Device */
-        obj_desc =
+        obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)
-            acpi_ns_get_attached_object((struct acpi_namespace_node *)
+                                               gpe_device);
-                                        gpe_device);
        if (!obj_desc || !obj_desc->device.gpe_block) {
                return (NULL);
        }
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index ad5bc76edf46..361ebe6c4a6f 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -586,6 +586,10 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
        if (gpe_xrupt->previous) {
                gpe_xrupt->previous->next = gpe_xrupt->next;
+        } else {
+                /* No previous, update list head */
+                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next;
        }
        if (gpe_xrupt->next) {
@@ -1033,8 +1037,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                             ACPI_GPE_DISPATCH_METHOD)
-                            && (gpe_event_info->
+                            && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
-                                flags & ACPI_GPE_TYPE_RUNTIME)) {
                                gpe_enabled_count++;
                        }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index cae786ca8600..21cb749d0c75 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -196,15 +196,12 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                notify_info->notify.value = (u16) notify_value;
                notify_info->notify.handler_obj = handler_obj;
-                acpi_ex_exit_interpreter();
+                status =
+                    acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
-                acpi_ev_notify_dispatch(notify_info);
+                                    notify_info);
-                status = acpi_ex_enter_interpreter();
                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        acpi_ut_delete_generic_state(notify_info);
                }
        }
        if (!handler_obj) {
@@ -323,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context)
                acpi_gbl_global_lock_acquired = TRUE;
                /* Send a unit to the semaphore */
-                if (ACPI_FAILURE(acpi_os_signal_semaphore(
+                if (ACPI_FAILURE
-                        acpi_gbl_global_lock_semaphore, 1))) {
+                    (acpi_os_signal_semaphore
+                     (acpi_gbl_global_lock_semaphore, 1))) {
                        ACPI_ERROR((AE_INFO,
                                    "Could not signal Global Lock semaphore"));
                }
@@ -450,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
        }
        if (ACPI_FAILURE(status)) {
-                status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout);
+                status =
+                    acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,
+                                              timeout);
        }
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 96b0e8431748..e99f0c435a47 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -291,7 +291,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                               u32 bit_width, acpi_integer * value)
 {
        acpi_status status;
-        acpi_status status2;
        acpi_adr_space_handler handler;
        acpi_adr_space_setup region_setup;
        union acpi_operand_object *handler_desc;
@@ -345,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * setup will potentially execute control methods
                 * (e.g., _REG method for this region)
                 */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
                                      handler_desc->address_space.context,
@@ -353,10 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                /* Re-enter the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
                /* Check for failure of the Region Setup */
@@ -409,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * exit the interpreter because the handler *might* block -- we don't
                 * know what it will do, so we can't hold the lock on the intepreter.
                 */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
        }
        /* Call the handler */
@@ -430,10 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * We just returned from a non-default handler, we must re-enter the
                 * interpreter
                 */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a4fa7e6822a3..23ee7bc4a705 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -228,7 +228,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                /* Install a handler for this PCI root bridge */
-                                status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
+                                status =
+                                    acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
                                if (ACPI_FAILURE(status)) {
                                        if (status == AE_SAME_HANDLER) {
                                                /*
@@ -283,6 +284,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
        }
        if (!pci_device_node) {
+                ACPI_FREE(pci_id);
                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
        }
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index a3379bafa676..6d866a01f5f4 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_install_fixed_event_handler
@@ -768,11 +767,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
                return (AE_BAD_PARAMETER);
        }
-        status = acpi_ex_enter_interpreter();
+        /* Must lock interpreter to prevent race conditions */
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
+        acpi_ex_enter_interpreter();
        status = acpi_ev_acquire_global_lock(timeout);
        acpi_ex_exit_interpreter();
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 17065e98807c..9cbd3414a574 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 }
 ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
@@ -568,7 +567,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
 ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_install_gpe_block
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index d470e8b1f4ea..79f2c0d42c06 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -512,9 +512,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 * Create a new string object and string buffer
                 * (-1 because of extra separator included in string_length from above)
                 */
-                return_desc =
+                return_desc = acpi_ut_create_string_object((acpi_size)
-                    acpi_ut_create_string_object((acpi_size)
+                                                           (string_length - 1));
-                                                 (string_length - 1));
                if (!return_desc) {
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index ae97812681a3..6e9a23e47fef 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -50,7 +50,6 @@
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
 #ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
 *
@@ -583,10 +582,7 @@ acpi_ex_create_method(u8 * aml_start,
         * Get the sync_level. If method is serialized, a mutex will be
         * created for this method when it is parsed.
         */
-        if (acpi_gbl_all_methods_serialized) {
+        if (method_flags & AML_METHOD_SERIALIZED) {
-                obj_desc->method.sync_level = 0;
-                obj_desc->method.method_flags |= AML_METHOD_SERIALIZED;
-        } else if (method_flags & AML_METHOD_SERIALIZED) {
                /*
                 * ACPI 1.0: sync_level = 0
                 * ACPI 2.0: sync_level = sync_level in method declaration
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 1a73c14df2c5..51c9c29987c3 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -134,7 +134,7 @@ static struct acpi_exdump_info acpi_ex_dump_method[8] = {
 static struct acpi_exdump_info acpi_ex_dump_mutex[5] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_mutex), NULL},
        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(mutex.sync_level), "Sync Level"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread_id), "Owner Thread"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread), "Owner Thread"},
        {ACPI_EXD_UINT16, ACPI_EXD_OFFSET(mutex.acquisition_depth),
         "Acquire Depth"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.os_mutex), "OsMutex"}
@@ -451,9 +451,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
        ACPI_FUNCTION_NAME(ex_dump_operand)
-            if (!
+            if (!((ACPI_LV_EXEC & acpi_dbg_level)
-                ((ACPI_LV_EXEC & acpi_dbg_level)
+                  && (_COMPONENT & acpi_dbg_layer))) {
-                 && (_COMPONENT & acpi_dbg_layer))) {
                return;
        }
@@ -844,9 +843,8 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
        ACPI_FUNCTION_ENTRY();
        if (!flags) {
-                if (!
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
+                      && (_COMPONENT & acpi_dbg_layer))) {
-                     && (_COMPONENT & acpi_dbg_layer))) {
                        return;
                }
        }
@@ -1011,9 +1009,8 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
        }
        if (!flags) {
-                if (!
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
+                      && (_COMPONENT & acpi_dbg_layer))) {
-                     && (_COMPONENT & acpi_dbg_layer))) {
                        return_VOID;
                }
        }
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 4eb883bda6ae..6748e3ef0997 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -66,9 +66,10 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
 *
 ******************************************************************************/
-void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc,
+void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
-                          struct acpi_thread_state *thread)
 {
+        struct acpi_thread_state *thread = obj_desc->mutex.owner_thread;
        if (!thread) {
                return;
        }
@@ -173,13 +174,16 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
        /* Support for multiple acquires by the owning thread */
-        if (obj_desc->mutex.owner_thread_id == acpi_os_get_thread_id()) {
+        if (obj_desc->mutex.owner_thread) {
-                /*
+                if (obj_desc->mutex.owner_thread->thread_id ==
-                 * The mutex is already owned by this thread, just increment the
+                    walk_state->thread->thread_id) {
-                 * acquisition depth
+                        /*
-                 */
+                         * The mutex is already owned by this thread, just increment the
-                obj_desc->mutex.acquisition_depth++;
+                         * acquisition depth
-                return_ACPI_STATUS(AE_OK);
+                         */
+                        obj_desc->mutex.acquisition_depth++;
+                        return_ACPI_STATUS(AE_OK);
+                }
        }
        /* Acquire the mutex, wait if necessary. Special case for Global Lock */
@@ -202,7 +206,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
        /* Have the mutex: update mutex and walk info and save the sync_level */
-        obj_desc->mutex.owner_thread_id = acpi_os_get_thread_id();
+        obj_desc->mutex.owner_thread = walk_state->thread;
        obj_desc->mutex.acquisition_depth = 1;
        obj_desc->mutex.original_sync_level =
            walk_state->thread->current_sync_level;
@@ -242,7 +246,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
        /* The mutex must have been previously acquired in order to release it */
-        if (!obj_desc->mutex.owner_thread_id) {
+        if (!obj_desc->mutex.owner_thread) {
                ACPI_ERROR((AE_INFO,
                            "Cannot release Mutex [%4.4s], not acquired",
                            acpi_ut_get_node_name(obj_desc->mutex.node)));
@@ -262,14 +266,15 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         * The Mutex is owned, but this thread must be the owner.
         * Special case for Global Lock, any thread can release
         */
-        if ((obj_desc->mutex.owner_thread_id !=
+        if ((obj_desc->mutex.owner_thread->thread_id !=
             walk_state->thread->thread_id)
            && (obj_desc->mutex.os_mutex != acpi_gbl_global_lock_mutex)) {
                ACPI_ERROR((AE_INFO,
                            "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
                            (unsigned long)walk_state->thread->thread_id,
                            acpi_ut_get_node_name(obj_desc->mutex.node),
-                            (unsigned long)obj_desc->mutex.owner_thread_id));
+                            (unsigned long)obj_desc->mutex.owner_thread->
+                            thread_id));
                return_ACPI_STATUS(AE_AML_NOT_OWNER);
        }
@@ -296,7 +301,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
        /* Unlink the mutex from the owner's list */
-        acpi_ex_unlink_mutex(obj_desc, walk_state->thread);
+        acpi_ex_unlink_mutex(obj_desc);
        /* Release the mutex, special case for Global Lock */
@@ -308,7 +313,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
        /* Update the mutex and restore sync_level */
-        obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+        obj_desc->mutex.owner_thread = NULL;
        walk_state->thread->current_sync_level =
            obj_desc->mutex.original_sync_level;
@@ -363,7 +368,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
                /* Mark mutex unowned */
-                obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                obj_desc->mutex.owner_thread = NULL;
                /* Update Thread sync_level (Last mutex is the important one) */
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 1ee4fb1175c6..308eae52dc05 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -177,8 +177,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
        ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n"));
-        for (index = 0;
+        for (index = 0; (index < ACPI_NAME_SIZE)
-             (index < ACPI_NAME_SIZE)
             && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {
                char_buf[index] = *aml_address++;
                ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index a6696621ff1b..efe5d4b461a4 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -242,7 +242,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
                                            obj_desc->common_field.bit_length,
                                            0xFFFFFFFF
                                            /* Temp until we pass region_length as parameter */
-                                            );
+                    );
                bit_length = byte_alignment * 8;
 #endif
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index ba761862a599..09d897b3f6d5 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -354,8 +354,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        if ((opcode == AML_STORE_OP) &&
                            (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
                             ACPI_TYPE_LOCAL_REFERENCE)
-                            && ((*stack_ptr)->reference.opcode ==
+                            && ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
-                                AML_INDEX_OP)) {
                                goto next_operand;
                        }
                        break;
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index b2edf620ba89..9460baff3032 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -66,7 +66,6 @@ ACPI_MODULE_NAME("exsystem")
 acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 {
        acpi_status status;
-        acpi_status status2;
        ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
@@ -79,7 +78,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
                /* We must wait, so unlock the interpreter */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = acpi_os_wait_semaphore(semaphore, 1, timeout);
@@ -89,13 +88,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
                /* Reacquire the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        /* Report fatal error, could not acquire interpreter */
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
@@ -119,7 +112,6 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 {
        acpi_status status;
-        acpi_status status2;
        ACPI_FUNCTION_TRACE(ex_system_wait_mutex);
@@ -132,7 +124,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
                /* We must wait, so unlock the interpreter */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = acpi_os_acquire_mutex(mutex, timeout);
@@ -142,13 +134,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
                /* Reacquire the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        /* Report fatal error, could not acquire interpreter */
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
@@ -209,20 +195,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
 {
-        acpi_status status;
        ACPI_FUNCTION_ENTRY();
        /* Since this thread will sleep, we must release the interpreter */
-        acpi_ex_exit_interpreter();
+        acpi_ex_relinquish_interpreter();
        acpi_os_sleep(how_long);
        /* And now we must get the interpreter again */
-        status = acpi_ex_enter_interpreter();
+        acpi_ex_reacquire_interpreter();
-        return (status);
+        return (AE_OK);
 }
 /*******************************************************************************
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index aea461f3a48c..6b0aeccbb69b 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -76,14 +76,15 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
 *
 * PARAMETERS:  None
 *
- * RETURN:      Status
+ * RETURN:      None
 *
- * DESCRIPTION: Enter the interpreter execution region.  Failure to enter
+ * DESCRIPTION: Enter the interpreter execution region. Failure to enter
- *              the interpreter region is a fatal system error
+ *              the interpreter region is a fatal system error. Used in
+ *              conjunction with exit_interpreter.
 *
 ******************************************************************************/
-acpi_status acpi_ex_enter_interpreter(void)
+void acpi_ex_enter_interpreter(void)
 {
        acpi_status status;
@@ -91,31 +92,55 @@ acpi_status acpi_ex_enter_interpreter(void)
        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not acquire AML Interpreter mutex"));
        }
-        return_ACPI_STATUS(status);
+        return_VOID;
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ex_exit_interpreter
+ * FUNCTION:    acpi_ex_reacquire_interpreter
 *
 * PARAMETERS:  None
 *
 * RETURN:      None
 *
- * DESCRIPTION: Exit the interpreter execution region
+ * DESCRIPTION: Reacquire the interpreter execution region from within the
+ *              interpreter code. Failure to enter the interpreter region is a
+ *              fatal system error. Used in  conjuction with
+ *              relinquish_interpreter
+ *
+ ******************************************************************************/
+void acpi_ex_reacquire_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_reacquire_interpreter);
+        /*
+         * If the global serialized flag is set, do not release the interpreter,
+         * since it was not actually released by acpi_ex_relinquish_interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_enter_interpreter();
+        }
+        return_VOID;
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_exit_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
 *
- * Cases where the interpreter is unlocked:
+ * DESCRIPTION: Exit the interpreter execution region. This is the top level
- *      1) Completion of the execution of a control method
+ *              routine used to exit the interpreter when all processing has
- *      2) Method blocked on a Sleep() AML opcode
+ *              been completed.
- *      3) Method blocked on an Acquire() AML opcode
- *      4) Method blocked on a Wait() AML opcode
- *      5) Method blocked to acquire the global lock
- *      6) Method blocked to execute a serialized control method that is
- *          already executing
- *      7) About to invoke a user-installed opregion handler
 *
 ******************************************************************************/
@@ -127,7 +152,46 @@ void acpi_ex_exit_interpreter(void)
        status = acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not release AML Interpreter mutex"));
+        }
+        return_VOID;
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_relinquish_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Exit the interpreter execution region, from within the
+ *              interpreter - before attempting an operation that will possibly
+ *              block the running thread.
+ *
+ * Cases where the interpreter is unlocked internally
+ *      1) Method to be blocked on a Sleep() AML opcode
+ *      2) Method to be blocked on an Acquire() AML opcode
+ *      3) Method to be blocked on a Wait() AML opcode
+ *      4) Method to be blocked to acquire the global lock
+ *      5) Method to be blocked waiting to execute a serialized control method
+ *          that is currently executing
+ *      6) About to invoke a user-installed opregion handler
+ *
+ ******************************************************************************/
+void acpi_ex_relinquish_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_relinquish_interpreter);
+        /*
+         * If the global serialized flag is set, do not release the interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_exit_interpreter();
        }
        return_VOID;
@@ -141,8 +205,8 @@ void acpi_ex_exit_interpreter(void)
 *
 * RETURN:      none
 *
- * DESCRIPTION: Truncate a number to 32-bits if the currently executing method
+ * DESCRIPTION: Truncate an ACPI Integer to 32 bits if the execution mode is
- *              belongs to a 32-bit ACPI table.
+ *              32-bit, as determined by the revision of the DSDT.
 *
 ******************************************************************************/
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index c84b1faba28c..76c525dc590b 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -152,7 +152,6 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 ACPI_EXPORT_SYMBOL(acpi_get_firmware_waking_vector)
 #endif
 /*******************************************************************************
 *
 * FUNCTION:    acpi_enter_sleep_state_prep
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 26fd0dd6953d..97b2ac57c16b 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -75,7 +75,7 @@ ACPI_MODULE_NAME("nseval")
 * MUTEX:       Locks interpreter
 *
 ******************************************************************************/
-acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
 {
        acpi_status status;
@@ -154,11 +154,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * Execute the method via the interpreter. The interpreter is locked
                 * here before calling into the AML parser
                 */
-                status = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
                status = acpi_ps_execute_method(info);
                acpi_ex_exit_interpreter();
        } else {
@@ -182,10 +178,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * resolution, we must lock it because we could access an opregion.
                 * The opregion access code assumes that the interpreter is locked.
                 */
-                status = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
                /* Function has a strange interface */
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index c4ab615f77fe..33db2241044e 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -214,7 +214,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                        u32 level, void *context, void **return_value)
 {
        acpi_object_type type;
-        acpi_status status;
+        acpi_status status = AE_OK;
        struct acpi_init_walk_info *info =
            (struct acpi_init_walk_info *)context;
        struct acpi_namespace_node *node =
@@ -268,10 +268,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
        /*
         * Must lock the interpreter before executing AML code
         */
-        status = acpi_ex_enter_interpreter();
+        acpi_ex_enter_interpreter();
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
        /*
         * Each of these types can contain executable AML code within the
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 94eb8f332d94..280b8357c46c 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -65,10 +65,8 @@ ACPI_MODULE_NAME("nswalk")
 *              within Scope is returned.
 *
 ******************************************************************************/
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
-                                                  struct acpi_namespace_node
+                                                  *parent_node, struct acpi_namespace_node
-                                                  *parent_node,
-                                                  struct acpi_namespace_node
                                                  *child_node)
 {
        struct acpi_namespace_node *next_node = NULL;
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 8904d0fae6a2..be4f2899de74 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -48,7 +48,6 @@
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
@@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval")
 acpi_status
 acpi_evaluate_object_typed(acpi_handle handle,
                           acpi_string pathname,
-                           struct acpi_object_list * external_params,
+                           struct acpi_object_list *external_params,
-                           struct acpi_buffer * return_buffer,
+                           struct acpi_buffer *return_buffer,
                           acpi_object_type return_type)
 {
        acpi_status status;
@@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle,
 ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_evaluate_object
@@ -170,7 +168,6 @@ acpi_evaluate_object(acpi_handle handle,
                     struct acpi_buffer *return_buffer)
 {
        acpi_status status;
-        acpi_status status2;
        struct acpi_evaluate_info *info;
        acpi_size buffer_space_needed;
        u32 i;
@@ -329,14 +326,12 @@ acpi_evaluate_object(acpi_handle handle,
                 * Delete the internal return object. NOTE: Interpreter must be
                 * locked to avoid race condition.
                 */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_SUCCESS(status2)) {
-                        /* Remove one reference on the return object (should delete it) */
+                /* Remove one reference on the return object (should delete it) */
-                        acpi_ut_remove_reference(info->return_object);
+                acpi_ut_remove_reference(info->return_object);
-                        acpi_ex_exit_interpreter();
+                acpi_ex_exit_interpreter();
-                }
        }
      cleanup:
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 8fcd6a15517f..ab04d848b19d 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -36,30 +36,34 @@
 ACPI_MODULE_NAME("numa");
 static nodemask_t nodes_found_map = NODE_MASK_NONE;
-#define PXM_INVAL       -1
-#define NID_INVAL       -1
 /* maps to convert between proximity domain and logical node ID */
-int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
+static int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
                                = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
-int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
+static int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
                                = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
-int __cpuinit pxm_to_node(int pxm)
+int pxm_to_node(int pxm)
 {
        if (pxm < 0)
                return NID_INVAL;
        return pxm_to_node_map[pxm];
 }
-int __cpuinit node_to_pxm(int node)
+int node_to_pxm(int node)
 {
        if (node < 0)
                return PXM_INVAL;
        return node_to_pxm_map[node];
 }
-int __cpuinit acpi_map_pxm_to_node(int pxm)
+void __acpi_map_pxm_to_node(int pxm, int node)
+{
+        pxm_to_node_map[pxm] = node;
+        node_to_pxm_map[node] = pxm;
+}
+int acpi_map_pxm_to_node(int pxm)
 {
        int node = pxm_to_node_map[pxm];
@@ -67,8 +71,7 @@ int __cpuinit acpi_map_pxm_to_node(int pxm)
                if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
                        return NID_INVAL;
                node = first_unset_node(nodes_found_map);
-                pxm_to_node_map[pxm] = node;
+                __acpi_map_pxm_to_node(pxm, node);
-                node_to_pxm_map[node] = pxm;
                node_set(node, nodes_found_map);
        }
@@ -83,7 +86,8 @@ void __cpuinit acpi_unmap_pxm_to_node(int node)
        node_clear(node, nodes_found_map);
 }
-void __init acpi_table_print_srat_entry(struct acpi_subtable_header * header)
+static void __init
+acpi_table_print_srat_entry(struct acpi_subtable_header *header)
 {
        ACPI_FUNCTION_NAME("acpi_table_print_srat_entry");
@@ -200,7 +204,7 @@ static int __init acpi_parse_srat(struct acpi_table_header *table)
        return 0;
 }
-int __init
+static int __init
 acpi_table_parse_srat(enum acpi_srat_type id,
                      acpi_table_entry_handler handler, unsigned int max_entries)
 {
@@ -211,14 +215,13 @@ acpi_table_parse_srat(enum acpi_srat_type id,
 int __init acpi_numa_init(void)
 {
-        int result;
        /* SRAT: Static Resource Affinity Table */
        if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
-                result = acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
+                acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
-                                               acpi_parse_processor_affinity,
+                                      acpi_parse_processor_affinity, NR_CPUS);
-                                               NR_CPUS);
+                acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
-                result = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS);    // IA64 specific
+                                      acpi_parse_memory_affinity,
+                                      NR_NODE_MEMBLKS);
        }
        /* SLIT: System Locality Information Table */
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c2bed56915e1..00d53c2fd1e8 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -33,6 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
 #include <linux/acpi.h>
@@ -71,6 +72,22 @@ static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
+static struct workqueue_struct *kacpi_notify_wq;
+#define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
+static char osi_additional_string[OSI_STRING_LENGTH_MAX];
+#define OSI_LINUX_ENABLED
+#ifdef  OSI_LINUX_ENABLED
+int osi_linux = 1;      /* enable _OSI(Linux) by default */
+#else
+int osi_linux;          /* disable _OSI(Linux) by default */
+#endif
+#ifdef CONFIG_DMI
+static struct __initdata dmi_system_id acpi_osl_dmi_table[];
+#endif
 static void __init acpi_request_region (struct acpi_generic_address *addr,
        unsigned int length, char *desc)
@@ -120,8 +137,9 @@ static int __init acpi_reserve_resources(void)
 }
 device_initcall(acpi_reserve_resources);
-acpi_status acpi_os_initialize(void)
+acpi_status __init acpi_os_initialize(void)
 {
+        dmi_check_system(acpi_osl_dmi_table);
        return AE_OK;
 }
@@ -137,8 +155,9 @@ acpi_status acpi_os_initialize1(void)
                return AE_NULL_ENTRY;
        }
        kacpid_wq = create_singlethread_workqueue("kacpid");
+        kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
        BUG_ON(!kacpid_wq);
+        BUG_ON(!kacpi_notify_wq);
        return AE_OK;
 }
@@ -150,6 +169,7 @@ acpi_status acpi_os_terminate(void)
        }
        destroy_workqueue(kacpid_wq);
+        destroy_workqueue(kacpi_notify_wq);
        return AE_OK;
 }
@@ -603,6 +623,23 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
+        if (!dpc) {
+                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
+                return;
+        }
+        dpc->function(dpc->context);
+        kfree(dpc);
+        /* Yield cpu to notify thread */
+        cond_resched();
+        return;
+}
+static void acpi_os_execute_notify(struct work_struct *work)
+{
+        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
        if (!dpc) {
                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
@@ -637,14 +674,12 @@ acpi_status acpi_os_execute(acpi_execute_type type,
        acpi_status status = AE_OK;
        struct acpi_os_dpc *dpc;
-        ACPI_FUNCTION_TRACE("os_queue_for_execution");
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Scheduling function [%p(%p)] for deferred execution.\n",
                          function, context));
        if (!function)
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                return AE_BAD_PARAMETER;
        /*
         * Allocate/initialize DPC structure.  Note that this memory will be
@@ -662,14 +697,21 @@ acpi_status acpi_os_execute(acpi_execute_type type,
        dpc->function = function;
        dpc->context = context;
-        INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+        if (type == OSL_NOTIFY_HANDLER) {
-        if (!queue_work(kacpid_wq, &dpc->work)) {
+                INIT_WORK(&dpc->work, acpi_os_execute_notify);
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                if (!queue_work(kacpi_notify_wq, &dpc->work)) {
+                        status = AE_ERROR;
+                        kfree(dpc);
+                }
+        } else {
+                INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+                if (!queue_work(kacpid_wq, &dpc->work)) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "Call to queue_work() failed.\n"));
-                kfree(dpc);
+                        status = AE_ERROR;
-                status = AE_ERROR;
+                        kfree(dpc);
+                }
        }
        return_ACPI_STATUS(status);
 }
@@ -935,20 +977,38 @@ static int __init acpi_os_name_setup(char *str)
 __setup("acpi_os_name=", acpi_os_name_setup);
+static void enable_osi_linux(int enable) {
+        if (osi_linux != enable)
+                printk(KERN_INFO PREFIX "%sabled _OSI(Linux)\n",
+                        enable ? "En": "Dis");
+        osi_linux = enable;
+        return;
+}
 /*
- * _OSI control
+ * Modify the list of "OS Interfaces" reported to BIOS via _OSI
+ *
 * empty string disables _OSI
- * TBD additional string adds to _OSI
+ * string starting with '!' disables that string
+ * otherwise string is added to list, augmenting built-in strings
 */
 static int __init acpi_osi_setup(char *str)
 {
        if (str == NULL || *str == '\0') {
                printk(KERN_INFO PREFIX "_OSI method disabled\n");
                acpi_gbl_create_osi_method = FALSE;
-        } else {
+        } else if (!strcmp("!Linux", str)) {
-                /* TBD */
+                enable_osi_linux(0);
-                printk(KERN_ERR PREFIX "_OSI additional string ignored -- %s\n",
+        } else if (*str == '!') {
-                       str);
+                if (acpi_osi_invalidate(++str) == AE_OK)
+                        printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
+        } else if (!strcmp("Linux", str)) {
+                enable_osi_linux(1);
+        } else if (*osi_additional_string == '\0') {
+                strncpy(osi_additional_string, str, OSI_STRING_LENGTH_MAX);
+                printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
        }
        return 1;
@@ -1038,7 +1098,7 @@ void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
 acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
-        *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
+        *cache = kmem_cache_create(name, size, 0, 0, NULL);
        if (*cache == NULL)
                return AE_ERROR;
        else
@@ -1118,11 +1178,28 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
 acpi_status
 acpi_os_validate_interface (char *interface)
 {
+        if (!strncmp(osi_additional_string, interface, OSI_STRING_LENGTH_MAX))
-    return AE_SUPPORT;
+                return AE_OK;
+        if (!strcmp("Linux", interface)) {
+                printk(KERN_WARNING PREFIX
+                        "System BIOS is requesting _OSI(Linux)\n");
+#ifdef  OSI_LINUX_ENABLED
+                printk(KERN_WARNING PREFIX
+                        "Please test with \"acpi_osi=!Linux\"\n"
+                        "Please send dmidecode "
+                        "to linux-acpi@vger.kernel.org\n");
+#else
+                printk(KERN_WARNING PREFIX
+                        "If \"acpi_osi=Linux\" works better,\n"
+                        "Please send dmidecode "
+                        "to linux-acpi@vger.kernel.org\n");
+#endif
+                if(osi_linux)
+                        return AE_OK;
+        }
+        return AE_SUPPORT;
 }
 /******************************************************************************
 *
 * FUNCTION:    acpi_os_validate_address
@@ -1149,5 +1226,51 @@ acpi_os_validate_address (
    return AE_OK;
 }
+#ifdef CONFIG_DMI
+#ifdef  OSI_LINUX_ENABLED
+static int dmi_osi_not_linux(struct dmi_system_id *d)
+{
+        printk(KERN_NOTICE "%s detected: requires not _OSI(Linux)\n", d->ident);
+        enable_osi_linux(0);
+        return 0;
+}
+#else
+static int dmi_osi_linux(struct dmi_system_id *d)
+{
+        printk(KERN_NOTICE "%s detected: requires _OSI(Linux)\n", d->ident);
+        enable_osi_linux(1);
+        return 0;
+}
+#endif
+static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {
+#ifdef  OSI_LINUX_ENABLED
+        /*
+         * Boxes that need NOT _OSI(Linux)
+         */
+        {
+         .callback = dmi_osi_not_linux,
+         .ident = "Toshiba Satellite P100",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "TOSHIBA"),
+                     DMI_MATCH(DMI_BOARD_NAME, "Satellite P100"),
+                     },
+         },
+#else
+        /*
+         * Boxes that need _OSI(Linux)
+         */
+        {
+         .callback = dmi_osi_linux,
+         .ident = "Intel Napa CRB",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                     DMI_MATCH(DMI_BOARD_NAME, "MPAD-MSAE Customer Reference Boards"),
+                     },
+         },
+#endif
+        {}
+};
+#endif /* CONFIG_DMI */
 #endif
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 16d8b6cc3c22..9296e86761d7 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -185,459 +185,453 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* Index           Name                 Parser Args               Interpreter Args                ObjectType                    Class                      Type                  Flags */
 /* 00 */ ACPI_OP("Zero", ARGP_ZERO_OP, ARGI_ZERO_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 01 */ ACPI_OP("One", ARGP_ONE_OP, ARGI_ONE_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 02 */ ACPI_OP("Alias", ARGP_ALIAS_OP, ARGI_ALIAS_OP,
-                         ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
+                 AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 03 */ ACPI_OP("Name", ARGP_NAME_OP, ARGI_NAME_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 04 */ ACPI_OP("ByteConst", ARGP_BYTE_OP, ARGI_BYTE_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 05 */ ACPI_OP("WordConst", ARGP_WORD_OP, ARGI_WORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 06 */ ACPI_OP("DwordConst", ARGP_DWORD_OP, ARGI_DWORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 07 */ ACPI_OP("String", ARGP_STRING_OP, ARGI_STRING_OP,
-                         ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 08 */ ACPI_OP("Scope", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                         ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
+                 AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 09 */ ACPI_OP("Buffer", ARGP_BUFFER_OP, ARGI_BUFFER_OP,
-                         ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_OBJECT,
+                 AML_TYPE_CREATE_OBJECT,
-                         AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                 AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0A */ ACPI_OP("Package", ARGP_PACKAGE_OP, ARGI_PACKAGE_OP,
-                         ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
+                 ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_OBJECT,
+                 AML_TYPE_CREATE_OBJECT,
-                         AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                 AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0B */ ACPI_OP("Method", ARGP_METHOD_OP, ARGI_METHOD_OP,
-                         ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_COMPLEX,
+                 AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED | AML_DEFER),
+                 AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 0C */ ACPI_OP("Local0", ARGP_LOCAL0, ARGI_LOCAL0,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0D */ ACPI_OP("Local1", ARGP_LOCAL1, ARGI_LOCAL1,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0E */ ACPI_OP("Local2", ARGP_LOCAL2, ARGI_LOCAL2,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0F */ ACPI_OP("Local3", ARGP_LOCAL3, ARGI_LOCAL3,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 10 */ ACPI_OP("Local4", ARGP_LOCAL4, ARGI_LOCAL4,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 11 */ ACPI_OP("Local5", ARGP_LOCAL5, ARGI_LOCAL5,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 12 */ ACPI_OP("Local6", ARGP_LOCAL6, ARGI_LOCAL6,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 13 */ ACPI_OP("Local7", ARGP_LOCAL7, ARGI_LOCAL7,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 14 */ ACPI_OP("Arg0", ARGP_ARG0, ARGI_ARG0,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 15 */ ACPI_OP("Arg1", ARGP_ARG1, ARGI_ARG1,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 16 */ ACPI_OP("Arg2", ARGP_ARG2, ARGI_ARG2,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 17 */ ACPI_OP("Arg3", ARGP_ARG3, ARGI_ARG3,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 18 */ ACPI_OP("Arg4", ARGP_ARG4, ARGI_ARG4,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 19 */ ACPI_OP("Arg5", ARGP_ARG5, ARGI_ARG5,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1A */ ACPI_OP("Arg6", ARGP_ARG6, ARGI_ARG6,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1B */ ACPI_OP("Store", ARGP_STORE_OP, ARGI_STORE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R),
+                 AML_FLAGS_EXEC_1A_1T_1R),
 /* 1C */ ACPI_OP("RefOf", ARGP_REF_OF_OP, ARGI_REF_OF_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R),
+                 AML_FLAGS_EXEC_1A_0T_1R),
 /* 1D */ ACPI_OP("Add", ARGP_ADD_OP, ARGI_ADD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 1E */ ACPI_OP("Concatenate", ARGP_CONCAT_OP, ARGI_CONCAT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 1F */ ACPI_OP("Subtract", ARGP_SUBTRACT_OP, ARGI_SUBTRACT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 20 */ ACPI_OP("Increment", ARGP_INCREMENT_OP, ARGI_INCREMENT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
+                 AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 21 */ ACPI_OP("Decrement", ARGP_DECREMENT_OP, ARGI_DECREMENT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
+                 AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 22 */ ACPI_OP("Multiply", ARGP_MULTIPLY_OP, ARGI_MULTIPLY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 23 */ ACPI_OP("Divide", ARGP_DIVIDE_OP, ARGI_DIVIDE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_2T_1R,
+                 AML_TYPE_EXEC_2A_2T_1R,
-                         AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
 /* 24 */ ACPI_OP("ShiftLeft", ARGP_SHIFT_LEFT_OP, ARGI_SHIFT_LEFT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 25 */ ACPI_OP("ShiftRight", ARGP_SHIFT_RIGHT_OP, ARGI_SHIFT_RIGHT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 26 */ ACPI_OP("And", ARGP_BIT_AND_OP, ARGI_BIT_AND_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 27 */ ACPI_OP("NAnd", ARGP_BIT_NAND_OP, ARGI_BIT_NAND_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 28 */ ACPI_OP("Or", ARGP_BIT_OR_OP, ARGI_BIT_OR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 29 */ ACPI_OP("NOr", ARGP_BIT_NOR_OP, ARGI_BIT_NOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2A */ ACPI_OP("XOr", ARGP_BIT_XOR_OP, ARGI_BIT_XOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2B */ ACPI_OP("Not", ARGP_BIT_NOT_OP, ARGI_BIT_NOT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2C */ ACPI_OP("FindSetLeftBit", ARGP_FIND_SET_LEFT_BIT_OP,
-                         ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
+                 ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2D */ ACPI_OP("FindSetRightBit", ARGP_FIND_SET_RIGHT_BIT_OP,
-                         ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
+                 ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2E */ ACPI_OP("DerefOf", ARGP_DEREF_OF_OP, ARGI_DEREF_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
+                 AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
 /* 2F */ ACPI_OP("Notify", ARGP_NOTIFY_OP, ARGI_NOTIFY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
+                 AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
 /* 30 */ ACPI_OP("SizeOf", ARGP_SIZE_OF_OP, ARGI_SIZE_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
+                 AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 31 */ ACPI_OP("Index", ARGP_INDEX_OP, ARGI_INDEX_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R),
+                 AML_FLAGS_EXEC_2A_1T_1R),
 /* 32 */ ACPI_OP("Match", ARGP_MATCH_OP, ARGI_MATCH_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
-                         AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
 /* 33 */ ACPI_OP("CreateDWordField", ARGP_CREATE_DWORD_FIELD_OP,
-                         ARGI_CREATE_DWORD_FIELD_OP,
+                 ARGI_CREATE_DWORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
+                 AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 AML_DEFER | AML_CREATE),
 /* 34 */ ACPI_OP("CreateWordField", ARGP_CREATE_WORD_FIELD_OP,
-                         ARGI_CREATE_WORD_FIELD_OP,
+                 ARGI_CREATE_WORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
+                 AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 AML_DEFER | AML_CREATE),
 /* 35 */ ACPI_OP("CreateByteField", ARGP_CREATE_BYTE_FIELD_OP,
-                         ARGI_CREATE_BYTE_FIELD_OP,
+                 ARGI_CREATE_BYTE_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
+                 AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 AML_DEFER | AML_CREATE),
 /* 36 */ ACPI_OP("CreateBitField", ARGP_CREATE_BIT_FIELD_OP,
-                         ARGI_CREATE_BIT_FIELD_OP,
+                 ARGI_CREATE_BIT_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
+                 AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 AML_DEFER | AML_CREATE),
 /* 37 */ ACPI_OP("ObjectType", ARGP_TYPE_OP, ARGI_TYPE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
+                 AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 38 */ ACPI_OP("LAnd", ARGP_LAND_OP, ARGI_LAND_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
-                         AML_CONSTANT),
 /* 39 */ ACPI_OP("LOr", ARGP_LOR_OP, ARGI_LOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
-                         AML_CONSTANT),
 /* 3A */ ACPI_OP("LNot", ARGP_LNOT_OP, ARGI_LNOT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 3B */ ACPI_OP("LEqual", ARGP_LEQUAL_OP, ARGI_LEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R,
+                 AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3C */ ACPI_OP("LGreater", ARGP_LGREATER_OP, ARGI_LGREATER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R,
+                 AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3D */ ACPI_OP("LLess", ARGP_LLESS_OP, ARGI_LLESS_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3E */ ACPI_OP("If", ARGP_IF_OP, ARGI_IF_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 3F */ ACPI_OP("Else", ARGP_ELSE_OP, ARGI_ELSE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 40 */ ACPI_OP("While", ARGP_WHILE_OP, ARGI_WHILE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 41 */ ACPI_OP("Noop", ARGP_NOOP_OP, ARGI_NOOP_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 42 */ ACPI_OP("Return", ARGP_RETURN_OP, ARGI_RETURN_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL,
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL,
-                         AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 43 */ ACPI_OP("Break", ARGP_BREAK_OP, ARGI_BREAK_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 44 */ ACPI_OP("BreakPoint", ARGP_BREAK_POINT_OP, ARGI_BREAK_POINT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 45 */ ACPI_OP("Ones", ARGP_ONES_OP, ARGI_ONES_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* Prefixed opcodes (Two-byte opcodes with a prefix op) */
 /* 46 */ ACPI_OP("Mutex", ARGP_MUTEX_OP, ARGI_MUTEX_OP, ACPI_TYPE_MUTEX,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 47 */ ACPI_OP("Event", ARGP_EVENT_OP, ARGI_EVENT_OP, ACPI_TYPE_EVENT,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                 AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 48 */ ACPI_OP("CondRefOf", ARGP_COND_REF_OF_OP, ARGI_COND_REF_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                 AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 49 */ ACPI_OP("CreateField", ARGP_CREATE_FIELD_OP,
-                         ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
+                 ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
-                         AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
+                 AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_FIELD | AML_CREATE),
+                 AML_DEFER | AML_FIELD | AML_CREATE),
 /* 4A */ ACPI_OP("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
-                         AML_FLAGS_EXEC_1A_1T_0R),
+                 AML_FLAGS_EXEC_1A_1T_0R),
 /* 4B */ ACPI_OP("Stall", ARGP_STALL_OP, ARGI_STALL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 4C */ ACPI_OP("Sleep", ARGP_SLEEP_OP, ARGI_SLEEP_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 4D */ ACPI_OP("Acquire", ARGP_ACQUIRE_OP, ARGI_ACQUIRE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
+                 AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
 /* 4E */ ACPI_OP("Signal", ARGP_SIGNAL_OP, ARGI_SIGNAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 4F */ ACPI_OP("Wait", ARGP_WAIT_OP, ARGI_WAIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R),
+                 AML_FLAGS_EXEC_2A_0T_1R),
 /* 50 */ ACPI_OP("Reset", ARGP_RESET_OP, ARGI_RESET_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 51 */ ACPI_OP("Release", ARGP_RELEASE_OP, ARGI_RELEASE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 52 */ ACPI_OP("FromBCD", ARGP_FROM_BCD_OP, ARGI_FROM_BCD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
+                 AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 53 */ ACPI_OP("ToBCD", ARGP_TO_BCD_OP, ARGI_TO_BCD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 54 */ ACPI_OP("Unload", ARGP_UNLOAD_OP, ARGI_UNLOAD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 55 */ ACPI_OP("Revision", ARGP_REVISION_OP, ARGI_REVISION_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_CONSTANT, 0),
+                 AML_TYPE_CONSTANT, 0),
 /* 56 */ ACPI_OP("Debug", ARGP_DEBUG_OP, ARGI_DEBUG_OP,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_CONSTANT, 0),
+                 AML_TYPE_CONSTANT, 0),
 /* 57 */ ACPI_OP("Fatal", ARGP_FATAL_OP, ARGI_FATAL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
-                         AML_FLAGS_EXEC_3A_0T_0R),
+                 AML_FLAGS_EXEC_3A_0T_0R),
 /* 58 */ ACPI_OP("OperationRegion", ARGP_REGION_OP, ARGI_REGION_OP,
-                         ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_COMPLEX,
+                 AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED | AML_DEFER),
+                 AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 59 */ ACPI_OP("Field", ARGP_FIELD_OP, ARGI_FIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
-                         AML_FIELD),
 /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP,
-                         ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
+                 AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 5B */ ACPI_OP("Processor", ARGP_PROCESSOR_OP, ARGI_PROCESSOR_OP,
-                         ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
+                 AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 5C */ ACPI_OP("PowerResource", ARGP_POWER_RES_OP, ARGI_POWER_RES_OP,
-                         ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
+                 AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 5D */ ACPI_OP("ThermalZone", ARGP_THERMAL_ZONE_OP,
-                         ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
+                 ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_FIELD,
+                 AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
-                         AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_FIELD,
+                 AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
-                         AML_FIELD),
 /* Internal opcodes that map to invalid AML opcodes */
 /* 60 */ ACPI_OP("LNotEqual", ARGP_LNOTEQUAL_OP, ARGI_LNOTEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                 AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 61 */ ACPI_OP("LLessEqual", ARGP_LLESSEQUAL_OP, ARGI_LLESSEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                 AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 62 */ ACPI_OP("LGreaterEqual", ARGP_LGREATEREQUAL_OP,
-                         ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
+                 ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
-                         AML_HAS_ARGS | AML_CONSTANT),
+                 AML_HAS_ARGS | AML_CONSTANT),
 /* 63 */ ACPI_OP("-NamePath-", ARGP_NAMEPATH_OP, ARGI_NAMEPATH_OP,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
+                 AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
 /* 64 */ ACPI_OP("-MethodCall-", ARGP_METHODCALL_OP, ARGI_METHODCALL_OP,
-                         ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
+                 ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
-                         AML_TYPE_METHOD_CALL,
+                 AML_TYPE_METHOD_CALL,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
 /* 65 */ ACPI_OP("-ByteList-", ARGP_BYTELIST_OP, ARGI_BYTELIST_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, 0),
+                 AML_TYPE_LITERAL, 0),
 /* 66 */ ACPI_OP("-ReservedField-", ARGP_RESERVEDFIELD_OP,
-                         ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
+                 ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 67 */ ACPI_OP("-NamedField-", ARGP_NAMEDFIELD_OP, ARGI_NAMEDFIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS,
+                 AML_TYPE_BOGUS,
-                         AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                 AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 68 */ ACPI_OP("-AccessField-", ARGP_ACCESSFIELD_OP,
-                         ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
+                 ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 69 */ ACPI_OP("-StaticString", ARGP_STATICSTRING_OP,
-                         ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
+                 ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 6A */ ACPI_OP("-Return Value-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
+                 AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
-                         AML_HAS_ARGS | AML_HAS_RETVAL),
+                 AML_HAS_ARGS | AML_HAS_RETVAL),
 /* 6B */ ACPI_OP("-UNKNOWN_OP-", ARG_NONE, ARG_NONE, ACPI_TYPE_INVALID,
-                         AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6C */ ACPI_OP("-ASCII_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6D */ ACPI_OP("-PREFIX_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* ACPI 2.0 opcodes */
 /* 6E */ ACPI_OP("QwordConst", ARGP_QWORD_OP, ARGI_QWORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 AML_TYPE_LITERAL, AML_CONSTANT),
        /* 6F */ ACPI_OP("Package", /* Var */ ARGP_VAR_PACKAGE_OP,
                         ARGI_VAR_PACKAGE_OP, ACPI_TYPE_PACKAGE,
                         AML_CLASS_CREATE, AML_TYPE_CREATE_OBJECT,
                         AML_HAS_ARGS | AML_DEFER),
 /* 70 */ ACPI_OP("ConcatenateResTemplate", ARGP_CONCAT_RES_OP,
-                         ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
+                 ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 71 */ ACPI_OP("Mod", ARGP_MOD_OP, ARGI_MOD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 72 */ ACPI_OP("CreateQWordField", ARGP_CREATE_QWORD_FIELD_OP,
-                         ARGI_CREATE_QWORD_FIELD_OP,
+                 ARGI_CREATE_QWORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
+                 AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 AML_DEFER | AML_CREATE),
 /* 73 */ ACPI_OP("ToBuffer", ARGP_TO_BUFFER_OP, ARGI_TO_BUFFER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
+                 AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 74 */ ACPI_OP("ToDecimalString", ARGP_TO_DEC_STR_OP,
-                         ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
+                 ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 75 */ ACPI_OP("ToHexString", ARGP_TO_HEX_STR_OP, ARGI_TO_HEX_STR_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
+                 AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 76 */ ACPI_OP("ToInteger", ARGP_TO_INTEGER_OP, ARGI_TO_INTEGER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
+                 AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 77 */ ACPI_OP("ToString", ARGP_TO_STRING_OP, ARGI_TO_STRING_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
+                 AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 78 */ ACPI_OP("CopyObject", ARGP_COPY_OP, ARGI_COPY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                 AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 79 */ ACPI_OP("Mid", ARGP_MID_OP, ARGI_MID_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
-                         AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
+                 AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
 /* 7A */ ACPI_OP("Continue", ARGP_CONTINUE_OP, ARGI_CONTINUE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 7B */ ACPI_OP("LoadTable", ARGP_LOAD_TABLE_OP, ARGI_LOAD_TABLE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
+                 AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
 /* 7C */ ACPI_OP("DataTableRegion", ARGP_DATA_REGION_OP,
-                         ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
+                 ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED),
 /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
+                 AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE),
-                         AML_NSNODE),
 /* ACPI 3.0 opcodes */
 /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
-                         AML_FLAGS_EXEC_0A_0T_1R)
+                 AML_FLAGS_EXEC_0A_0T_1R)
 /*! [End] no source code translation !*/
 };
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index f7de02a6f497..e1ca86dfdd66 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -115,7 +115,6 @@ struct acpi_processor_errata errata __read_mostly;
 static int acpi_processor_errata_piix4(struct pci_dev *dev)
 {
-        u8 rev = 0;
        u8 value1 = 0;
        u8 value2 = 0;
@@ -127,9 +126,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
         * Note that 'dev' references the PIIX4 ACPI Controller.
         */
-        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
+        switch (dev->revision) {
-        switch (rev) {
        case 0:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 A-step\n"));
                break;
@@ -147,7 +144,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
                break;
        }
-        switch (rev) {
+        switch (dev->revision) {
        case 0:         /* PIIX4 A-step */
        case 1:         /* PIIX4 B-step */
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ee5759bef945..bb5d23be4260 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -332,16 +332,18 @@ static void acpi_processor_idle(void)
        int sleep_ticks = 0;
        u32 t1, t2 = 0;
-        pr = processors[smp_processor_id()];
-        if (!pr)
-                return;
        /*
         * Interrupts must be disabled during bus mastering calculations and
         * for C2/C3 transitions.
         */
        local_irq_disable();
+        pr = processors[smp_processor_id()];
+        if (!pr) {
+                local_irq_enable();
+                return;
+        }
        /*
         * Check whether we truly need to go idle, or should
         * reschedule:
@@ -473,7 +475,7 @@ static void acpi_processor_idle(void)
                /* Get end time (ticks) */
                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-#ifdef CONFIG_GENERIC_TIME
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
                /* TSC halts in C2, so notify users */
                mark_tsc_unstable("possible TSC halt in C2");
 #endif
@@ -515,7 +517,7 @@ static void acpi_processor_idle(void)
                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
                }
-#ifdef CONFIG_GENERIC_TIME
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
                /* TSC halts in C3, so notify users */
                mark_tsc_unstable("TSC halts in C3");
 #endif
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 8c6d3fdec38a..0dd2ce8a3475 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -567,7 +567,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
                                                     (*sub_object_list)->string.
                                                     length + 1);
                        } else {
-                                temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
+                                temp_size_needed +=
+                                    acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
                        }
                } else {
                        /*
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index cc48ab05676c..50da494c3ee2 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -267,16 +267,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 * If BIOS erroneously reversed the _PRT source_name and source_index,
                 * then reverse them back.
                 */
-                if (ACPI_GET_OBJECT_TYPE (sub_object_list[3]) != ACPI_TYPE_INTEGER) {
+                if (ACPI_GET_OBJECT_TYPE(sub_object_list[3]) !=
+                    ACPI_TYPE_INTEGER) {
                        if (acpi_gbl_enable_interpreter_slack) {
                                source_name_index = 3;
                                source_index_index = 2;
-                                printk(KERN_WARNING "ACPI: Handling Garbled _PRT entry\n");
+                                printk(KERN_WARNING
+                                       "ACPI: Handling Garbled _PRT entry\n");
                        } else {
                                ACPI_ERROR((AE_INFO,
-                                        "(PRT[%X].source_index) Need Integer, found %s",
+                                            "(PRT[%X].source_index) Need Integer, found %s",
-                                        index,
+                                            index,
-                                        acpi_ut_get_object_type_name(sub_object_list[3])));
+                                            acpi_ut_get_object_type_name
+                                            (sub_object_list[3])));
                                return_ACPI_STATUS(AE_BAD_DATA);
                        }
                }
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index de20a5d6decf..46da116a4030 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -46,7 +46,6 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /* Local prototypes */
 static void acpi_rs_out_string(char *title, char *value);
@@ -489,10 +488,9 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                        /*
                         * Optional resource_source for Address resources
                         */
-                        acpi_rs_dump_resource_source(ACPI_CAST_PTR
+                        acpi_rs_dump_resource_source(ACPI_CAST_PTR(struct
-                                                     (struct
+                                                                   acpi_resource_source,
-                                                      acpi_resource_source,
+                                                                   target));
-                                                      target));
                        break;
                default:
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 7e3c335ab320..2c2adb6292c1 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.c
@@ -142,7 +142,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
 };
 #endif
-#endif  /* ACPI_FUTURE_USAGE */
+#endif                          /* ACPI_FUTURE_USAGE */
 /*
 * Base sizes for external AML resource descriptors, indexed by internal type.
 * Includes size of the descriptor header (1 byte for small descriptors,
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index a92755c8877d..ca21e4660c79 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -153,10 +153,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                /* Perform the conversion */
-                status = acpi_rs_convert_resource_to_aml(resource,
+                status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union
-                                                         ACPI_CAST_PTR(union
+                                                                                 aml_resource,
-                                                                       aml_resource,
+                                                                                 aml),
-                                                                       aml),
                                                         acpi_gbl_set_resource_dispatch
                                                         [resource->type]);
                if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 3b63b561b94e..c7081afa893a 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -46,7 +46,6 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmisc")
 #define INIT_RESOURCE_TYPE(i)       i->resource_offset
 #define INIT_RESOURCE_LENGTH(i)     i->aml_offset
 #define INIT_TABLE_LENGTH(i)        i->value
@@ -429,8 +428,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                         * Optional resource_source (Index and String)
                         */
                        aml_length =
-                            acpi_rs_set_resource_source(aml,
+                            acpi_rs_set_resource_source(aml, (acpi_rs_length)
-                                                        (acpi_rs_length)
                                                        aml_length, source);
                        acpi_rs_set_resource_length(aml_length, aml);
                        break;
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 2442a8f8df57..11c0bd7b9cfd 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -353,10 +353,8 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                 *
                 * Zero the entire area of the buffer.
                 */
-                total_length =
+                total_length = (u32)
-                    (u32)
+                ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1;
-                    ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
-                    1;
                total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
                ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 991f8901498c..f63813a358c5 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -217,7 +217,6 @@ acpi_get_current_resources(acpi_handle device_handle,
 }
 ACPI_EXPORT_SYMBOL(acpi_get_current_resources)
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
@@ -261,7 +260,6 @@ acpi_get_possible_resources(acpi_handle device_handle,
 ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_set_current_resources
@@ -496,7 +494,6 @@ ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
 *              each resource in the list.
 *
 ******************************************************************************/
 acpi_status
 acpi_walk_resources(acpi_handle device_handle,
                    char *name,
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index c1bae106833c..974d00ccfe84 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -127,7 +127,7 @@ static int acpi_sbs_resume(struct acpi_device *device);
 static struct acpi_driver acpi_sbs_driver = {
        .name = "sbs",
        .class = ACPI_SBS_CLASS,
-        .ids = ACPI_SBS_HID,
+        .ids = "ACPI0001,ACPI0005",
        .ops = {
                .add = acpi_sbs_add,
                .remove = acpi_sbs_remove,
@@ -176,10 +176,8 @@ struct acpi_battery {
 };
 struct acpi_sbs {
-        acpi_handle handle;
        int base;
        struct acpi_device *device;
-        struct acpi_ec_smbus *smbus;
        struct mutex mutex;
        int sbsm_present;
        int sbsm_batteries_supported;
@@ -511,7 +509,7 @@ static int acpi_sbsm_get_info(struct acpi_sbs *sbs)
                                "acpi_sbs_read_word() failed"));
                goto end;
        }
+        sbs->sbsm_present = 1;
        sbs->sbsm_batteries_supported = battery_system_info & 0x000f;
      end:
@@ -1630,13 +1628,12 @@ static int acpi_sbs_add(struct acpi_device *device)
 {
        struct acpi_sbs *sbs = NULL;
        int result = 0, remove_result = 0;
-        unsigned long sbs_obj;
        int id;
        acpi_status status = AE_OK;
        unsigned long val;
        status =
-            acpi_evaluate_integer(device->parent->handle, "_EC", NULL, &val);
+            acpi_evaluate_integer(device->handle, "_EC", NULL, &val);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Error obtaining _EC"));
                return -EIO;
@@ -1653,7 +1650,7 @@ static int acpi_sbs_add(struct acpi_device *device)
        sbs_mutex_lock(sbs);
-        sbs->base = (val & 0xff00ull) >> 8;
+        sbs->base = 0xff & (val >> 8);
        sbs->device = device;
        strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
@@ -1665,24 +1662,10 @@ static int acpi_sbs_add(struct acpi_device *device)
                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_ac_add() failed"));
                goto end;
        }
-        status = acpi_evaluate_integer(device->handle, "_SBS", NULL, &sbs_obj);
-        if (status) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "acpi_evaluate_integer() failed"));
-                result = -EIO;
-                goto end;
-        }
-        if (sbs_obj > 0) {
-                result = acpi_sbsm_get_info(sbs);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbsm_get_info() failed"));
-                        goto end;
-                }
-                sbs->sbsm_present = 1;
-        }
-        if (sbs->sbsm_present == 0) {
+        acpi_sbsm_get_info(sbs);
+        if (!sbs->sbsm_present) {
                result = acpi_battery_add(sbs, 0);
                if (result) {
                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
@@ -1702,8 +1685,6 @@ static int acpi_sbs_add(struct acpi_device *device)
                }
        }
-        sbs->handle = device->handle;
        init_timer(&sbs->update_timer);
        result = acpi_check_update_proc(sbs);
        if (result)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 52b23471dd69..42127c0d612c 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -217,12 +217,28 @@ static void acpi_hibernation_finish(void)
        }
 }
+static int acpi_hibernation_pre_restore(void)
+{
+        acpi_status status;
+        status = acpi_hw_disable_all_gpes();
+        return ACPI_SUCCESS(status) ? 0 : -EFAULT;
+}
+static void acpi_hibernation_restore_cleanup(void)
+{
+        acpi_hw_enable_all_runtime_gpes();
+}
 static struct hibernation_ops acpi_hibernation_ops = {
        .prepare = acpi_hibernation_prepare,
        .enter = acpi_hibernation_enter,
        .finish = acpi_hibernation_finish,
+        .pre_restore = acpi_hibernation_pre_restore,
+        .restore_cleanup = acpi_hibernation_restore_cleanup,
 };
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+#endif                          /* CONFIG_SOFTWARE_SUSPEND */
 /*
 * Toshiba fails to preserve interrupts over S1, reinitialization
@@ -276,4 +292,3 @@ int __init acpi_sleep_init(void)
        return 0;
 }
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index d9801eff6489..39e40d56b034 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -39,7 +39,13 @@ int acpi_sleep_prepare(u32 acpi_state)
 #ifdef CONFIG_PM
-void acpi_power_off(void)
+static void acpi_power_off_prepare(void)
+{
+        /* Prepare to power off the system */
+        acpi_sleep_prepare(ACPI_STATE_S5);
+}
+static void acpi_power_off(void)
 {
        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
        printk("%s called\n", __FUNCTION__);
@@ -48,30 +54,6 @@ void acpi_power_off(void)
        acpi_enter_sleep_state(ACPI_STATE_S5);
 }
-static int acpi_shutdown(struct sys_device *x)
-{
-        switch (system_state) {
-        case SYSTEM_POWER_OFF:
-                /* Prepare to power off the system */
-                return acpi_sleep_prepare(ACPI_STATE_S5);
-        case SYSTEM_SUSPEND_DISK:
-                /* Prepare to suspend the system to disk */
-                return acpi_sleep_prepare(ACPI_STATE_S4);
-        default:
-                return 0;
-        }
-}
-static struct sysdev_class acpi_sysclass = {
-        set_kset_name("acpi"),
-        .shutdown = acpi_shutdown
-};
-static struct sys_device device_acpi = {
-        .id = 0,
-        .cls = &acpi_sysclass,
-};
 static int acpi_poweroff_init(void)
 {
        if (!acpi_disabled) {
@@ -81,13 +63,8 @@ static int acpi_poweroff_init(void)
                status =
                    acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
                if (ACPI_SUCCESS(status)) {
-                        int error;
+                        pm_power_off_prepare = acpi_power_off_prepare;
-                        error = sysdev_class_register(&acpi_sysclass);
+                        pm_power_off = acpi_power_off;
-                        if (!error)
-                                error = sysdev_register(&device_acpi);
-                        if (!error)
-                                pm_power_off = acpi_power_off;
-                        return error;
                }
        }
        return 0;
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 76b45f0b8341..61f1822cc350 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -349,8 +349,7 @@ acpi_system_write_alarm(struct file *file,
      end:
        return_VALUE(result ? result : count);
 }
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
@@ -380,8 +379,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                           dev->wakeup.state.enabled ? "enabled" : "disabled");
                if (ldev)
                        seq_printf(seq, "%s:%s",
-                                ldev->bus ? ldev->bus->name : "no-bus",
+                                   ldev->bus ? ldev->bus->name : "no-bus",
-                                ldev->bus_id);
+                                   ldev->bus_id);
                seq_printf(seq, "\n");
                put_device(ldev);
@@ -490,7 +489,7 @@ static u32 rtc_handler(void *context)
        return ACPI_INTERRUPT_HANDLED;
 }
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 static int __init acpi_sleep_proc_init(void)
 {
@@ -517,7 +516,7 @@ static int __init acpi_sleep_proc_init(void)
                entry->proc_fops = &acpi_system_alarm_fops;
        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
        /* 'wakeup device' [R/W] */
        entry =
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 1db833eb2417..002bb33003af 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -211,14 +211,17 @@ void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
 * DESCRIPTION: Get a local copy of the FADT and convert it to a common format.
 *              Performs validation on some important FADT fields.
 *
+ * NOTE:        We create a local copy of the FADT regardless of the version.
+ *
 ******************************************************************************/
 void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 {
        /*
-         * Check if the FADT is larger than what we know about (ACPI 2.0 version).
+         * Check if the FADT is larger than the largest table that we expect
-         * Truncate the table, but make some noise.
+         * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
+         * a warning.
         */
        if (length > sizeof(struct acpi_table_fadt)) {
                ACPI_WARNING((AE_INFO,
@@ -227,10 +230,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
                              sizeof(struct acpi_table_fadt)));
        }
-        /* Copy the entire FADT locally. Zero first for tb_convert_fadt */
+        /* Clear the entire local FADT */
        ACPI_MEMSET(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
+        /* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
        ACPI_MEMCPY(&acpi_gbl_FADT, table,
                    ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
@@ -251,7 +256,7 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 * RETURN:      None
 *
 * DESCRIPTION: Converts all versions of the FADT to a common internal format.
- *              -> Expand all 32-bit addresses to 64-bit.
+ *              Expand all 32-bit addresses to 64-bit.
 *
 * NOTE:        acpi_gbl_FADT must be of size (struct acpi_table_fadt),
 *              and must contain a copy of the actual FADT.
@@ -292,8 +297,23 @@ static void acpi_tb_convert_fadt(void)
        }
        /*
-         * Expand the 32-bit V1.0 addresses to the 64-bit "X" generic address
+         * For ACPI 1.0 FADTs (revision 1 or 2), ensure that reserved fields which
-         * structures as necessary.
+         * should be zero are indeed zero. This will workaround BIOSs that
+         * inadvertently place values in these fields.
+         *
+         * The ACPI 1.0 reserved fields that will be zeroed are the bytes located at
+         * offset 45, 55, 95, and the word located at offset 109, 110.
+         */
+        if (acpi_gbl_FADT.header.revision < 3) {
+                acpi_gbl_FADT.preferred_profile = 0;
+                acpi_gbl_FADT.pstate_control = 0;
+                acpi_gbl_FADT.cst_control = 0;
+                acpi_gbl_FADT.boot_flags = 0;
+        }
+        /*
+         * Expand the ACPI 1.0 32-bit V1.0 addresses to the ACPI 2.0 64-bit "X"
+         * generic address structures as necessary.
         */
        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
                target =
@@ -334,7 +354,8 @@ static void acpi_tb_convert_fadt(void)
                                     (acpi_gbl_FADT.xpm1a_event_block.address +
                                      pm1_register_length));
        /* Don't forget to copy space_id of the GAS */
-        acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+        acpi_gbl_xpm1a_enable.space_id =
+            acpi_gbl_FADT.xpm1a_event_block.space_id;
        /* The PM1B register block is optional, ignore if not present */
@@ -344,20 +365,9 @@ static void acpi_tb_convert_fadt(void)
                                             (acpi_gbl_FADT.xpm1b_event_block.
                                              address + pm1_register_length));
                /* Don't forget to copy space_id of the GAS */
-                acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+                acpi_gbl_xpm1b_enable.space_id =
+                    acpi_gbl_FADT.xpm1a_event_block.space_id;
-        }
-        /*
-         * For ACPI 1.0 FADTs, ensure that reserved fields (which should be zero)
-         * are indeed zero. This will workaround BIOSs that inadvertently placed
-         * values in these fields.
-         */
-        if (acpi_gbl_FADT.header.revision < 3) {
-                acpi_gbl_FADT.preferred_profile = 0;
-                acpi_gbl_FADT.pstate_control = 0;
-                acpi_gbl_FADT.cst_control = 0;
-                acpi_gbl_FADT.boot_flags = 0;
        }
 }
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 0e7b121a99ce..3bc0c67a9283 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -123,14 +123,14 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc,
                }
        }
-        /* The table must be either an SSDT or a PSDT */
+        /* The table must be either an SSDT or a PSDT or an OEMx */
        if ((!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT))
            &&
-            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)))
+            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
-        {
+            && (strncmp(table_desc->pointer->signature, "OEM", 3))) {
                ACPI_ERROR((AE_INFO,
-                            "Table has invalid signature [%4.4s], must be SSDT or PSDT",
+                            "Table has invalid signature [%4.4s], must be SSDT, PSDT or OEMx",
                            table_desc->pointer->signature));
                return_ACPI_STATUS(AE_BAD_SIGNATURE);
        }
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 417ef5fa7666..5b302c4e293f 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -201,6 +201,7 @@ acpi_status acpi_reallocate_root_table(void)
        return_ACPI_STATUS(AE_OK);
 }
 /*******************************************************************************
 *
 * FUNCTION:    acpi_load_table
@@ -262,7 +263,7 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
 acpi_status
 acpi_get_table_header(char *signature,
                      acpi_native_uint instance,
-                      struct acpi_table_header *out_table_header)
+                      struct acpi_table_header * out_table_header)
 {
        acpi_native_uint i;
        acpi_native_uint j;
@@ -321,7 +322,6 @@ acpi_get_table_header(char *signature,
 ACPI_EXPORT_SYMBOL(acpi_get_table_header)
 /******************************************************************************
 *
 * FUNCTION:    acpi_unload_table_id
@@ -346,11 +346,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
                        continue;
                }
                /*
-                * Delete all namespace objects owned by this table. Note that these
+                 * Delete all namespace objects owned by this table. Note that these
-                * objects can appear anywhere in the namespace by virtue of the AML
+                 * objects can appear anywhere in the namespace by virtue of the AML
-                * "Scope" operator. Thus, we need to track ownership by an ID, not
+                 * "Scope" operator. Thus, we need to track ownership by an ID, not
-                * simply a position within the hierarchy
+                 * simply a position within the hierarchy
-                */
+                 */
                acpi_tb_delete_namespace_by_owner(i);
                status = acpi_tb_release_owner_id(i);
                acpi_tb_set_table_loaded_flag(i, FALSE);
@@ -376,7 +376,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
 *****************************************************************************/
 acpi_status
 acpi_get_table(char *signature,
-               acpi_native_uint instance, struct acpi_table_header ** out_table)
+               acpi_native_uint instance, struct acpi_table_header **out_table)
 {
        acpi_native_uint i;
        acpi_native_uint j;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 589b98b7b216..58f1338981bc 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -40,6 +40,7 @@
 #include <linux/jiffies.h>
 #include <linux/kmod.h>
 #include <linux/seq_file.h>
+#include <linux/reboot.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_bus.h>
@@ -59,9 +60,6 @@
 #define ACPI_THERMAL_NOTIFY_CRITICAL    0xF0
 #define ACPI_THERMAL_NOTIFY_HOT         0xF1
 #define ACPI_THERMAL_MODE_ACTIVE        0x00
-#define ACPI_THERMAL_MODE_PASSIVE       0x01
-#define ACPI_THERMAL_MODE_CRITICAL      0xff
-#define ACPI_THERMAL_PATH_POWEROFF      "/sbin/poweroff"
 #define ACPI_THERMAL_MAX_ACTIVE 10
 #define ACPI_THERMAL_MAX_LIMIT_STR_LEN 65
@@ -86,9 +84,6 @@ static int acpi_thermal_resume(struct acpi_device *device);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_trip_points(struct file *,
-                                              const char __user *, size_t,
-                                              loff_t *);
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file);
 static ssize_t acpi_thermal_write_cooling_mode(struct file *,
                                               const char __user *, size_t,
@@ -167,7 +162,6 @@ struct acpi_thermal {
        unsigned long temperature;
        unsigned long last_temperature;
        unsigned long polling_frequency;
-        u8 cooling_mode;
        volatile u8 zombie;
        struct acpi_thermal_flags flags;
        struct acpi_thermal_state state;
@@ -193,7 +187,6 @@ static const struct file_operations acpi_thermal_temp_fops = {
 static const struct file_operations acpi_thermal_trip_fops = {
        .open = acpi_thermal_trip_open_fs,
        .read = seq_read,
-        .write = acpi_thermal_write_trip_points,
        .llseek = seq_lseek,
        .release = single_release,
 };
@@ -297,11 +290,6 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
        if (ACPI_FAILURE(status))
                return -ENODEV;
-        tz->cooling_mode = mode;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cooling mode [%s]\n",
-                          mode ? "passive" : "active"));
        return 0;
 }
@@ -431,26 +419,6 @@ static int acpi_thermal_get_devices(struct acpi_thermal *tz)
        return 0;
 }
-static int acpi_thermal_call_usermode(char *path)
-{
-        char *argv[2] = { NULL, NULL };
-        char *envp[3] = { NULL, NULL, NULL };
-        if (!path)
-                return -EINVAL;
-        argv[0] = path;
-        /* minimal command environment */
-        envp[0] = "HOME=/";
-        envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-        call_usermodehelper(argv[0], argv, envp, 0);
-        return 0;
-}
 static int acpi_thermal_critical(struct acpi_thermal *tz)
 {
        if (!tz || !tz->trips.critical.flags.valid)
@@ -468,7 +436,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
        acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
                                tz->trips.critical.flags.enabled);
-        acpi_thermal_call_usermode(ACPI_THERMAL_PATH_POWEROFF);
+        orderly_poweroff(true);
        return 0;
 }
@@ -839,6 +807,9 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
 static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = seq->private;
+        struct acpi_device *device;
+        acpi_status status;
        int i = 0;
        int j = 0;
@@ -861,9 +832,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
                           tz->trips.passive.tc1, tz->trips.passive.tc2,
                           tz->trips.passive.tsp);
                for (j = 0; j < tz->trips.passive.devices.count; j++) {
+                        status = acpi_bus_get_device(tz->trips.passive.devices.
-                        seq_printf(seq, "0x%p ",
+                                                     handles[j], &device);
-                                   tz->trips.passive.devices.handles[j]);
+                        seq_printf(seq, "%4.4s ", status ? "" :
+                                   acpi_device_bid(device));
                }
                seq_puts(seq, "\n");
        }
@@ -874,9 +846,13 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, "active[%d]:               %ld C: devices=",
                           i,
                           KELVIN_TO_CELSIUS(tz->trips.active[i].temperature));
-                for (j = 0; j < tz->trips.active[i].devices.count; j++)
+                for (j = 0; j < tz->trips.active[i].devices.count; j++){
-                        seq_printf(seq, "0x%p ",
+                        status = acpi_bus_get_device(tz->trips.active[i].
-                                   tz->trips.active[i].devices.handles[j]);
+                                                     devices.handles[j],
+                                                     &device);
+                        seq_printf(seq, "%4.4s ", status ? "" :
+                                   acpi_device_bid(device));
+                }
                seq_puts(seq, "\n");
        }
@@ -889,67 +865,6 @@ static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
        return single_open(file, acpi_thermal_trip_seq_show, PDE(inode)->data);
 }
-static ssize_t
-acpi_thermal_write_trip_points(struct file *file,
-                               const char __user * buffer,
-                               size_t count, loff_t * ppos)
-{
-        struct seq_file *m = file->private_data;
-        struct acpi_thermal *tz = m->private;
-        char *limit_string;
-        int num, critical, hot, passive;
-        int *active;
-        int i = 0;
-        limit_string = kzalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
-        if (!limit_string)
-                return -ENOMEM;
-        active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
-        if (!active) {
-                kfree(limit_string);
-                return -ENOMEM;
-        }
-        if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
-                count = -EINVAL;
-                goto end;
-        }
-        if (copy_from_user(limit_string, buffer, count)) {
-                count = -EFAULT;
-                goto end;
-        }
-        limit_string[count] = '\0';
-        num = sscanf(limit_string, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
-                     &critical, &hot, &passive,
-                     &active[0], &active[1], &active[2], &active[3], &active[4],
-                     &active[5], &active[6], &active[7], &active[8],
-                     &active[9]);
-        if (!(num >= 5 && num < (ACPI_THERMAL_MAX_ACTIVE + 3))) {
-                count = -EINVAL;
-                goto end;
-        }
-        tz->trips.critical.temperature = CELSIUS_TO_KELVIN(critical);
-        tz->trips.hot.temperature = CELSIUS_TO_KELVIN(hot);
-        tz->trips.passive.temperature = CELSIUS_TO_KELVIN(passive);
-        for (i = 0; i < num - 3; i++) {
-                if (!(tz->trips.active[i].flags.valid))
-                        break;
-                tz->trips.active[i].temperature = CELSIUS_TO_KELVIN(active[i]);
-        }
-      end:
-        kfree(active);
-        kfree(limit_string);
-        return count;
-}
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = seq->private;
@@ -958,15 +873,10 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
        if (!tz)
                goto end;
-        if (!tz->flags.cooling_mode) {
+        if (!tz->flags.cooling_mode)
                seq_puts(seq, "<setting not supported>\n");
-        }
-        if (tz->cooling_mode == ACPI_THERMAL_MODE_CRITICAL)
-                seq_printf(seq, "cooling mode:  critical\n");
        else
-                seq_printf(seq, "cooling mode:  %s\n",
+                seq_puts(seq, "0 - Active; 1 - Passive\n");
-                           tz->cooling_mode ? "passive" : "active");
      end:
        return 0;
@@ -1223,28 +1133,6 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
        result = acpi_thermal_set_cooling_mode(tz, ACPI_THERMAL_MODE_ACTIVE);
        if (!result)
                tz->flags.cooling_mode = 1;
-        else {
-                /* Oh,we have not _SCP method.
-                   Generally show cooling_mode by _ACx, _PSV,spec 12.2 */
-                tz->flags.cooling_mode = 0;
-                if (tz->trips.active[0].flags.valid
-                    && tz->trips.passive.flags.valid) {
-                        if (tz->trips.passive.temperature >
-                            tz->trips.active[0].temperature)
-                                tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-                        else
-                                tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-                } else if (!tz->trips.active[0].flags.valid
-                           && tz->trips.passive.flags.valid) {
-                        tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-                } else if (tz->trips.active[0].flags.valid
-                           && !tz->trips.passive.flags.valid) {
-                        tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-                } else {
-                        /* _ACx and _PSV are optional, but _CRT is required */
-                        tz->cooling_mode = ACPI_THERMAL_MODE_CRITICAL;
-                }
-        }
        /* Get default polling frequency [_TZP] (optional) */
        if (tzp)
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 3906d47b9783..13369b45563f 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -524,7 +524,7 @@ static acpi_status __init add_device(void)
        return AE_OK;
 }
-static acpi_status __exit remove_device(void)
+static acpi_status remove_device(void)
 {
        ProcItem *item;
@@ -538,7 +538,7 @@ static struct backlight_ops toshiba_backlight_data = {
        .update_status  = set_lcd_status,
 };
-static void __exit toshiba_acpi_exit(void)
+static void toshiba_acpi_exit(void)
 {
        if (toshiba_backlight_device)
                backlight_device_unregister(toshiba_backlight_device);
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 55a764807499..6e56d5f7c43a 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -107,7 +107,6 @@ acpi_status acpi_ut_create_caches(void)
        if (ACPI_FAILURE(status)) {
                return (status);
        }
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
        /* Memory allocation lists */
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 870f6edeb5f2..285a0f531760 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -45,7 +45,6 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utcache")
 #ifdef ACPI_USE_LOCAL_CACHE
 /*******************************************************************************
 *
@@ -64,7 +63,7 @@ ACPI_MODULE_NAME("utcache")
 acpi_status
 acpi_os_create_cache(char *cache_name,
                     u16 object_size,
-                     u16 max_depth, struct acpi_memory_list **return_cache)
+                     u16 max_depth, struct acpi_memory_list ** return_cache)
 {
        struct acpi_memory_list *cache;
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 84d529db0a66..879eaa10d3ae 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -68,6 +68,10 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *user_obj,
                                union acpi_operand_object **return_obj);
 static acpi_status
+acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
+                                  union acpi_operand_object **internal_object);
+static acpi_status
 acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                           union acpi_operand_object *dest_desc);
@@ -518,77 +522,73 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
        return_ACPI_STATUS(AE_NO_MEMORY);
 }
-#ifdef ACPI_FUTURE_IMPLEMENTATION
-/* Code to convert packages that are parameters to control methods */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ut_copy_epackage_to_ipackage
 *
- * PARAMETERS:  *internal_object   - Pointer to the object we are returning
+ * PARAMETERS:  external_object     - The external object to be converted
- *              *Buffer            - Where the object is returned
+ *              internal_object     - Where the internal object is returned
- *              *space_used        - Where the length of the object is returned
 *
 * RETURN:      Status
 *
- * DESCRIPTION: This function is called to place a package object in a user
+ * DESCRIPTION: Copy an external package object to an internal package.
- *              buffer.  A package object by definition contains other objects.
+ *              Handles nested packages.
- *
- *              The buffer is assumed to have sufficient space for the object.
- *              The caller must have verified the buffer length needed using the
- *              acpi_ut_get_object_size function before calling this function.
 *
 ******************************************************************************/
 static acpi_status
-acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,
+acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
-                                  u8 * buffer, u32 * space_used)
+                                  union acpi_operand_object **internal_object)
 {
-        u8 *free_space;
+        acpi_status status = AE_OK;
-        union acpi_object *external_object;
+        union acpi_operand_object *package_object;
-        u32 length = 0;
+        union acpi_operand_object **package_elements;
-        u32 this_index;
+        acpi_native_uint i;
-        u32 object_space = 0;
-        union acpi_operand_object *this_internal_obj;
-        union acpi_object *this_external_obj;
        ACPI_FUNCTION_TRACE(ut_copy_epackage_to_ipackage);
-        /*
+        /* Create the package object */
-         * First package at head of the buffer
-         */
-        external_object = (union acpi_object *)buffer;
-        /*
+        package_object =
-         * Free space begins right after the first package
+            acpi_ut_create_package_object(external_object->package.count);
-         */
+        if (!package_object) {
-        free_space = buffer + sizeof(union acpi_object);
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
-        external_object->type = ACPI_GET_OBJECT_TYPE(internal_object);
+        package_elements = package_object->package.elements;
-        external_object->package.count = internal_object->package.count;
-        external_object->package.elements = (union acpi_object *)free_space;
        /*
-         * Build an array of ACPI_OBJECTS in the buffer
+         * Recursive implementation. Probably ok, since nested external packages
-         * and move the free space past it
+         * as parameters should be very rare.
         */
-        free_space +=
+        for (i = 0; i < external_object->package.count; i++) {
-            external_object->package.count * sizeof(union acpi_object);
+                status =
+                    acpi_ut_copy_eobject_to_iobject(&external_object->package.
+                                                    elements[i],
+                                                    &package_elements[i]);
+                if (ACPI_FAILURE(status)) {
-        /* Call walk_package */
+                        /* Truncate package and delete it */
-}
+                        package_object->package.count = i;
+                        package_elements[i] = NULL;
+                        acpi_ut_remove_reference(package_object);
+                        return_ACPI_STATUS(status);
+                }
+        }
-#endif                          /* Future implementation */
+        *internal_object = package_object;
+        return_ACPI_STATUS(status);
+}
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ut_copy_eobject_to_iobject
 *
- * PARAMETERS:  *internal_object   - The external object to be converted
+ * PARAMETERS:  external_object     - The external object to be converted
- *              *buffer_ptr     - Where the internal object is returned
+ *              internal_object     - Where the internal object is returned
 *
- * RETURN:      Status          - the status of the call
+ * RETURN:      Status              - the status of the call
 *
 * DESCRIPTION: Converts an external object to an internal object.
 *
@@ -603,16 +603,10 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
        ACPI_FUNCTION_TRACE(ut_copy_eobject_to_iobject);
        if (external_object->type == ACPI_TYPE_PACKAGE) {
-                /*
+                status =
-                 * Packages as external input to control methods are not supported,
+                    acpi_ut_copy_epackage_to_ipackage(external_object,
-                 */
+                                                      internal_object);
-                ACPI_ERROR((AE_INFO,
+        } else {
-                            "Packages as parameters not implemented!"));
-                return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
-        }
-        else {
                /*
                 * Build a simple object (no nested objects)
                 */
@@ -803,31 +797,19 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
                 * Create and build the package object
                 */
                target_object =
-                    acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
+                    acpi_ut_create_package_object(source_object->package.count);
                if (!target_object) {
                        return (AE_NO_MEMORY);
                }
-                target_object->package.count = source_object->package.count;
                target_object->common.flags = source_object->common.flags;
-                /*
+                /* Pass the new package object back to the package walk routine */
-                 * Create the object array
-                 */
-                target_object->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.count + 1) * sizeof(void *));
-                if (!target_object->package.elements) {
-                        status = AE_NO_MEMORY;
-                        goto error_exit;
-                }
-                /*
-                 * Pass the new package object back to the package walk routine
-                 */
                state->pkg.this_target_obj = target_object;
-                /*
+                /* Store the object pointer in the parent package object */
-                 * Store the object pointer in the parent package object
-                 */
                *this_target_ptr = target_object;
                break;
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 61ad4f2daee2..c7e128e5369b 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -45,7 +45,6 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
 #ifdef ACPI_DEBUG_OUTPUT
 static acpi_thread_id acpi_gbl_prev_thread_id;
 static char *acpi_gbl_fn_entry_str = "----Entry";
@@ -181,7 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
                if (ACPI_LV_THREADS & acpi_dbg_level) {
                        acpi_os_printf
                            ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
-                             (unsigned long)acpi_gbl_prev_thread_id, (unsigned long)thread_id);
+                             (unsigned long)acpi_gbl_prev_thread_id,
+                             (unsigned long)thread_id);
                }
                acpi_gbl_prev_thread_id = thread_id;
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 673a0caa4073..f777cebdc46d 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -170,6 +170,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                        acpi_os_delete_mutex(object->mutex.os_mutex);
                        acpi_gbl_global_lock_mutex = NULL;
                } else {
+                        acpi_ex_unlink_mutex(object);
                        acpi_os_delete_mutex(object->mutex.os_mutex);
                }
                break;
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 13d5879cd98b..8ec6f8e48138 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -59,10 +59,9 @@ acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
 /*
 * Strings supported by the _OSI predefined (internal) method.
 */
-static const char *acpi_interfaces_supported[] = {
+static char *acpi_interfaces_supported[] = {
        /* Operating System Vendor Strings */
-        "Linux",
        "Windows 2000",
        "Windows 2001",
        "Windows 2001 SP0",
@@ -158,6 +157,31 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_osi_invalidate
+ *
+ * PARAMETERS:  interface_string
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: invalidate string in pre-defiend _OSI string list
+ *
+ ******************************************************************************/
+acpi_status acpi_osi_invalidate(char *interface)
+{
+        int i;
+        for (i = 0; i < ACPI_ARRAY_LENGTH(acpi_interfaces_supported); i++) {
+                if (!ACPI_STRCMP(interface, acpi_interfaces_supported[i])) {
+                        *acpi_interfaces_supported[i] = '\0';
+                        return AE_OK;
+                }
+        }
+        return AE_NOT_FOUND;
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ut_evaluate_object
 *
 * PARAMETERS:  prefix_node         - Starting node
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index af33358a964b..1621655d6e2b 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -55,12 +55,10 @@ ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 * Static global variable initialization.
 *
 ******************************************************************************/
 /*
 * We want the debug switches statically initialized so they
 * are already set when the debugger is entered.
 */
 /* Debug switch - level and trace mask */
 u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
@@ -735,5 +733,5 @@ void acpi_ut_init_globals(void)
 }
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
-ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+    ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
-ACPI_EXPORT_SYMBOL(acpi_gpe_count)
+    ACPI_EXPORT_SYMBOL(acpi_gpe_count)
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 50133fffe420..2d19f71e9cfa 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -802,9 +802,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
                valid_digits++;
-                if (sign_of0x
+                if (sign_of0x && ((valid_digits > 16)
-                    && ((valid_digits > 16)
+                                  || ((valid_digits > 8) && mode32))) {
-                        || ((valid_digits > 8) && mode32))) {
                        /*
                         * This is to_integer operation case.
                         * No any restrictions for string-to-integer conversion,
@@ -1049,6 +1048,7 @@ acpi_ut_exception(char *module_name,
        acpi_os_vprintf(format, args);
        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
 }
 EXPORT_SYMBOL(acpi_ut_exception);
 void ACPI_INTERNAL_VAR_XFACE
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index cbad2ef5987d..4820bc86d1f5 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -244,7 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                          "Thread %lX attempting to acquire Mutex [%s]\n",
-                          (unsigned long) this_thread_id,
+                          (unsigned long)this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
        status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,
@@ -252,7 +252,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
        if (ACPI_SUCCESS(status)) {
                ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                  "Thread %lX acquired Mutex [%s]\n",
-                                  (unsigned long) this_thread_id,
+                                  (unsigned long)this_thread_id,
                                  acpi_ut_get_mutex_name(mutex_id)));
                acpi_gbl_mutex_info[mutex_id].use_count++;
@@ -260,7 +260,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
        } else {
                ACPI_EXCEPTION((AE_INFO, status,
                                "Thread %lX could not acquire Mutex [%X]",
-                                (unsigned long) this_thread_id, mutex_id));
+                                (unsigned long)this_thread_id, mutex_id));
        }
        return (status);
@@ -287,7 +287,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
        this_thread_id = acpi_os_get_thread_id();
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                          "Thread %lX releasing Mutex [%s]\n",
-                          (unsigned long) this_thread_id,
+                          (unsigned long)this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
        if (mutex_id > ACPI_MAX_MUTEX) {
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 4696124759e1..76ee766c84f9 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -146,6 +146,48 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_ut_create_package_object
+ *
+ * PARAMETERS:  Count               - Number of package elements
+ *
+ * RETURN:      Pointer to a new Package object, null on failure
+ *
+ * DESCRIPTION: Create a fully initialized package object
+ *
+ ******************************************************************************/
+union acpi_operand_object *acpi_ut_create_package_object(u32 count)
+{
+        union acpi_operand_object *package_desc;
+        union acpi_operand_object **package_elements;
+        ACPI_FUNCTION_TRACE_U32(ut_create_package_object, count);
+        /* Create a new Package object */
+        package_desc = acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
+        if (!package_desc) {
+                return_PTR(NULL);
+        }
+        /*
+         * Create the element array. Count+1 allows the array to be null
+         * terminated.
+         */
+        package_elements = ACPI_ALLOCATE_ZEROED((acpi_size)
+                                                (count + 1) * sizeof(void *));
+        if (!package_elements) {
+                acpi_ut_remove_reference(package_desc);
+                return_PTR(NULL);
+        }
+        package_desc->package.count = count;
+        package_desc->package.elements = package_elements;
+        return_PTR(package_desc);
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ut_create_buffer_object
 *
 * PARAMETERS:  buffer_size            - Size of buffer to be created
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index e8fe1ba6cc24..cbbd3315a1e2 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.c
@@ -46,7 +46,6 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
 #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
 /*
 * Strings used to decode resource descriptors.
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index de3276f4f468..2d496918b3cd 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("utxface")
 *              called, so any early initialization belongs here.
 *
 ******************************************************************************/
-acpi_status acpi_initialize_subsystem(void)
+acpi_status __init acpi_initialize_subsystem(void)
 {
        acpi_status status;
@@ -108,8 +108,6 @@ acpi_status acpi_initialize_subsystem(void)
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_enable_subsystem
@@ -337,7 +335,6 @@ acpi_status acpi_terminate(void)
 }
 ACPI_EXPORT_SYMBOL(acpi_terminate)
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
@@ -470,7 +467,6 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
 ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 /*****************************************************************************
 *
 * FUNCTION:    acpi_purge_cached_objects