Patched in Tegra support.

214 files changed, 5300 insertions, 13853 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 38c5078da11..de0e3df7677 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -181,12 +181,6 @@ config ACPI_DOCK
           This driver supports ACPI-controlled docking stations and removable
           drive bays such as the IBM Ultrabay and the Dell Module Bay.
 
-config ACPI_I2C
-        def_tristate I2C
-        depends on I2C
-        help
-          ACPI I2C enumeration support.
-
 config ACPI_PROCESSOR
         tristate "Processor"
         select THERMAL
@@ -214,7 +208,7 @@ config ACPI_IPMI
 
 config ACPI_HOTPLUG_CPU
         bool
-        depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU
+        depends on ACPI_PROCESSOR && HOTPLUG_CPU
         select ACPI_CONTAINER
         default y
 
@@ -267,15 +261,6 @@ config ACPI_CUSTOM_DSDT
         bool
         default ACPI_CUSTOM_DSDT_FILE != ""
 
-config ACPI_INITRD_TABLE_OVERRIDE
-        bool "ACPI tables can be passed via uncompressed cpio in initrd"
-        default n
-        help
-          This option provides functionality to override arbitrary ACPI tables
-          via initrd. No functional change if no ACPI tables are passed via
-          initrd, therefore it's safe to say Y.
-          See Documentation/acpi/initrd_table_override.txt for details
-
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year" if X86_32
         default 0
@@ -389,7 +374,7 @@ config ACPI_CUSTOM_METHOD
         depends on DEBUG_FS
         default n
         help
-          This debug facility allows ACPI AML methods to be inserted and/or
+          This debug facility allows ACPI AML methods to me inserted and/or
           replaced without rebooting the system. For details refer to:
           Documentation/acpi/method-customizing.txt.
 
@@ -399,15 +384,6 @@ config ACPI_CUSTOM_METHOD
           load additional kernel modules after boot, this feature may be used
           to override that restriction).
 
-config ACPI_BGRT
-        bool "Boottime Graphics Resource Table support"
-        depends on EFI
-        help
-          This driver adds support for exposing the ACPI Boottime Graphics
-          Resource Table, which allows the operating system to obtain
-          data from the firmware boot splash. It will appear under
-          /sys/firmware/acpi/bgrt/ .
-
 source "drivers/acpi/apei/Kconfig"
 
 endif   # ACPI
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 2a4502becd1..ecb26b4f29a 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -19,13 +19,12 @@ obj-y				+= acpi.o \
 
 # All the builtin files are in the "acpi." module_param namespace.
 acpi-y                          += osl.o utils.o reboot.o
-acpi-y                          += nvs.o
+acpi-y                          += atomicio.o
 
-# Power management related files
+# sleep related files
 acpi-y                          += wakeup.o
 acpi-y                          += sleep.o
-acpi-$(CONFIG_PM)               += device_pm.o
-acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
+acpi-$(CONFIG_ACPI_SLEEP)       += proc.o nvs.o
 
 
 #
@@ -33,12 +32,10 @@ acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
 #
 acpi-y                          += bus.o glue.o
 acpi-y                          += scan.o
-acpi-y                          += resource.o
 acpi-y                          += processor_core.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
 acpi-y                          += pci_root.o pci_link.o pci_irq.o pci_bind.o
-acpi-y                          += acpi_platform.o
 acpi-y                          += power.o
 acpi-y                          += event.o
 acpi-y                          += sysfs.o
@@ -50,10 +47,6 @@ acpi-y				+= video_detect.o
 endif
 
 # These are (potentially) separate modules
-
-# IPMI may be used by other drivers, so it has to initialise before them
-obj-$(CONFIG_ACPI_IPMI)         += acpi_ipmi.o
-
 obj-$(CONFIG_ACPI_AC)           += ac.o
 obj-$(CONFIG_ACPI_BUTTON)       += button.o
 obj-$(CONFIG_ACPI_FAN)          += fan.o
@@ -69,8 +62,6 @@ obj-$(CONFIG_ACPI_SBS)		+= sbs.o
 obj-$(CONFIG_ACPI_HED)          += hed.o
 obj-$(CONFIG_ACPI_EC_DEBUGFS)   += ec_sys.o
 obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
-obj-$(CONFIG_ACPI_BGRT)         += bgrt.o
-obj-$(CONFIG_ACPI_I2C)          += acpi_i2c.o
 
 # processor has its own "processor." module_param namespace
 processor-y                     := processor_driver.o processor_throttling.o
@@ -78,5 +69,6 @@ processor-y			+= processor_idle.o processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)    += processor_perflib.o
 
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
+obj-$(CONFIG_ACPI_IPMI)         += acpi_ipmi.o
 
 obj-$(CONFIG_ACPI_APEI)         += apei/
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index d5fdd36190c..6512b20aecc 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -61,6 +61,7 @@ static int acpi_ac_open_fs(struct inode *inode, struct file *file);
 
 static int acpi_ac_add(struct acpi_device *device);
 static int acpi_ac_remove(struct acpi_device *device, int type);
+static int acpi_ac_resume(struct acpi_device *device);
 static void acpi_ac_notify(struct acpi_device *device, u32 event);
 
 static const struct acpi_device_id ac_device_ids[] = {
@@ -69,11 +70,6 @@ static const struct acpi_device_id ac_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, ac_device_ids);
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_ac_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);
-
 static struct acpi_driver acpi_ac_driver = {
         .name = "ac",
         .class = ACPI_AC_CLASS,
@@ -82,9 +78,9 @@ static struct acpi_driver acpi_ac_driver = {
         .ops = {
                 .add = acpi_ac_add,
                 .remove = acpi_ac_remove,
+                .resume = acpi_ac_resume,
                 .notify = acpi_ac_notify,
                 },
-        .drv.pm = &acpi_ac_pm,
 };
 
 struct acpi_ac {
@@ -296,9 +292,7 @@ static int acpi_ac_add(struct acpi_device *device)
         ac->charger.properties = ac_props;
         ac->charger.num_properties = ARRAY_SIZE(ac_props);
         ac->charger.get_property = get_ac_property;
-        result = power_supply_register(&ac->device->dev, &ac->charger);
-        if (result)
-                goto end;
+        power_supply_register(&ac->device->dev, &ac->charger);
 
         printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
                acpi_device_name(device), acpi_device_bid(device),
@@ -315,19 +309,13 @@ static int acpi_ac_add(struct acpi_device *device)
         return result;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_ac_resume(struct device *dev)
+static int acpi_ac_resume(struct acpi_device *device)
 {
         struct acpi_ac *ac;
         unsigned old_state;
-
-        if (!dev)
-                return -EINVAL;
-
-        ac = acpi_driver_data(to_acpi_device(dev));
-        if (!ac)
+        if (!device || !acpi_driver_data(device))
                 return -EINVAL;
-
+        ac = acpi_driver_data(device);
         old_state = ac->state;
         if (acpi_ac_get_state(ac))
                 return 0;
@@ -335,7 +323,6 @@ static int acpi_ac_resume(struct device *dev)
                 kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
         return 0;
 }
-#endif
 
 static int acpi_ac_remove(struct acpi_device *device, int type)
 {
diff --git a/drivers/acpi/acpi_i2c.c b/drivers/acpi/acpi_i2c.c
deleted file mode 100644
index 82045e3f5ca..00000000000
--- a/drivers/acpi/acpi_i2c.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * ACPI I2C enumeration support
- *
- * Copyright (C) 2012, Intel Corporation
- * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/acpi.h>
-#include <linux/device.h>
-#include <linux/export.h>
-#include <linux/i2c.h>
-#include <linux/ioport.h>
-
-ACPI_MODULE_NAME("i2c");
-
-static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data)
-{
-        struct i2c_board_info *info = data;
-
-        if (ares->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
-                struct acpi_resource_i2c_serialbus *sb;
-
-                sb = &ares->data.i2c_serial_bus;
-                if (sb->type == ACPI_RESOURCE_SERIAL_TYPE_I2C) {
-                        info->addr = sb->slave_address;
-                        if (sb->access_mode == ACPI_I2C_10BIT_MODE)
-                                info->flags |= I2C_CLIENT_TEN;
-                }
-        } else if (info->irq < 0) {
-                struct resource r;
-
-                if (acpi_dev_resource_interrupt(ares, 0, &r))
-                        info->irq = r.start;
-        }
-
-        /* Tell the ACPI core to skip this resource */
-        return 1;
-}
-
-static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
-                                       void *data, void **return_value)
-{
-        struct i2c_adapter *adapter = data;
-        struct list_head resource_list;
-        struct i2c_board_info info;
-        struct acpi_device *adev;
-        int ret;
-
-        if (acpi_bus_get_device(handle, &adev))
-                return AE_OK;
-        if (acpi_bus_get_status(adev) || !adev->status.present)
-                return AE_OK;
-
-        memset(&info, 0, sizeof(info));
-        info.acpi_node.handle = handle;
-        info.irq = -1;
-
-        INIT_LIST_HEAD(&resource_list);
-        ret = acpi_dev_get_resources(adev, &resource_list,
-                                     acpi_i2c_add_resource, &info);
-        acpi_dev_free_resource_list(&resource_list);
-
-        if (ret < 0 || !info.addr)
-                return AE_OK;
-
-        strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type));
-        if (!i2c_new_device(adapter, &info)) {
-                dev_err(&adapter->dev,
-                        "failed to add I2C device %s from ACPI\n",
-                        dev_name(&adev->dev));
-        }
-
-        return AE_OK;
-}
-
-/**
- * acpi_i2c_register_devices - enumerate I2C slave devices behind adapter
- * @adapter: pointer to adapter
- *
- * Enumerate all I2C slave devices behind this adapter by walking the ACPI
- * namespace. When a device is found it will be added to the Linux device
- * model and bound to the corresponding ACPI handle.
- */
-void acpi_i2c_register_devices(struct i2c_adapter *adapter)
-{
-        acpi_handle handle;
-        acpi_status status;
-
-        handle = ACPI_HANDLE(&adapter->dev);
-        if (!handle)
-                return;
-
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,
-                                     acpi_i2c_add_device, NULL,
-                                     adapter, NULL);
-        if (ACPI_FAILURE(status))
-                dev_warn(&adapter->dev, "failed to enumerate I2C slaves\n");
-}
-EXPORT_SYMBOL_GPL(acpi_i2c_register_devices);
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index b679bf8478f..d9857138565 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -31,7 +31,6 @@
 #include <linux/types.h>
 #include <linux/memory_hotplug.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
 #include <acpi/acpi_drivers.h>
 
 #define ACPI_MEMORY_DEVICE_CLASS                "memory"
@@ -79,7 +78,6 @@ struct acpi_memory_info {
         unsigned short caching; /* memory cache attribute */
         unsigned short write_protect;   /* memory read/write attribute */
         unsigned int enabled:1;
-        unsigned int failed:1;
 };
 
 struct acpi_memory_device {
@@ -88,6 +86,8 @@ struct acpi_memory_device {
         struct list_head res_list;
 };
 
+static int acpi_hotmem_initialized;
+
 static acpi_status
 acpi_memory_get_resource(struct acpi_resource *resource, void *context)
 {
@@ -125,20 +125,12 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)
         return AE_OK;
 }
 
-static void
-acpi_memory_free_device_resources(struct acpi_memory_device *mem_device)
-{
-        struct acpi_memory_info *info, *n;
-
-        list_for_each_entry_safe(info, n, &mem_device->res_list, list)
-                kfree(info);
-        INIT_LIST_HEAD(&mem_device->res_list);
-}
-
 static int
 acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
 {
         acpi_status status;
+        struct acpi_memory_info *info, *n;
+
 
         if (!list_empty(&mem_device->res_list))
                 return 0;
@@ -146,7 +138,9 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
         status = acpi_walk_resources(mem_device->device->handle, METHOD_NAME__CRS,
                                      acpi_memory_get_resource, mem_device);
         if (ACPI_FAILURE(status)) {
-                acpi_memory_free_device_resources(mem_device);
+                list_for_each_entry_safe(info, n, &mem_device->res_list, list)
+                        kfree(info);
+                INIT_LIST_HEAD(&mem_device->res_list);
                 return -EINVAL;
         }
 
@@ -176,7 +170,7 @@ acpi_memory_get_device(acpi_handle handle,
         /* Get the parent device */
         result = acpi_bus_get_device(phandle, &pdevice);
         if (result) {
-                acpi_handle_warn(phandle, "Cannot get acpi bus device\n");
+                printk(KERN_WARNING PREFIX "Cannot get acpi bus device");
                 return -EINVAL;
         }
 
@@ -186,14 +180,14 @@ acpi_memory_get_device(acpi_handle handle,
          */
         result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
         if (result) {
-                acpi_handle_warn(handle, "Cannot add acpi bus\n");
+                printk(KERN_WARNING PREFIX "Cannot add acpi bus");
                 return -EINVAL;
         }
 
       end:
         *mem_device = acpi_driver_data(device);
         if (!(*mem_device)) {
-                dev_err(&device->dev, "driver data not found\n");
+                printk(KERN_ERR "\n driver data not found");
                 return -ENODEV;
         }
 
@@ -226,6 +220,15 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
         struct acpi_memory_info *info;
         int node;
 
+
+        /* Get the range from the _CRS */
+        result = acpi_memory_get_device_resources(mem_device);
+        if (result) {
+                printk(KERN_ERR PREFIX "get_device_resources failed\n");
+                mem_device->state = MEMORY_INVALID_STATE;
+                return result;
+        }
+
         node = acpi_get_node(mem_device->device->handle);
         /*
          * Tell the VM there is more memory here...
@@ -248,27 +251,13 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
                         node = memory_add_physaddr_to_nid(info->start_addr);
 
                 result = add_memory(node, info->start_addr, info->length);
-
-                /*
-                 * If the memory block has been used by the kernel, add_memory()
-                 * returns -EEXIST. If add_memory() returns the other error, it
-                 * means that this memory block is not used by the kernel.
-                 */
-                if (result && result != -EEXIST) {
-                        info->failed = 1;
+                if (result)
                         continue;
-                }
-
-                if (!result)
-                        info->enabled = 1;
-                /*
-                 * Add num_enable even if add_memory() returns -EEXIST, so the
-                 * device is bound to this driver.
-                 */
+                info->enabled = 1;
                 num_enabled++;
         }
         if (!num_enabled) {
-                dev_err(&mem_device->device->dev, "add_memory failed\n");
+                printk(KERN_ERR PREFIX "add_memory failed\n");
                 mem_device->state = MEMORY_INVALID_STATE;
                 return -EINVAL;
         }
@@ -283,31 +272,68 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
         return 0;
 }
 
-static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
+static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)
 {
-        int result = 0;
-        struct acpi_memory_info *info, *n;
+        acpi_status status;
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
+        unsigned long long current_status;
 
-        list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
-                if (info->failed)
-                        /* The kernel does not use this memory block */
-                        continue;
 
-                if (!info->enabled)
-                        /*
-                         * The kernel uses this memory block, but it may be not
-                         * managed by us.
-                         */
-                        return -EBUSY;
+        /* Issue the _EJ0 command */
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = 1;
+        status = acpi_evaluate_object(mem_device->device->handle,
+                                      "_EJ0", &arg_list, NULL);
+        /* Return on _EJ0 failure */
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "_EJ0 failed"));
+                return -ENODEV;
+        }
+
+        /* Evalute _STA to check if the device is disabled */
+        status = acpi_evaluate_integer(mem_device->device->handle, "_STA",
+                                       NULL, &current_status);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
+        /* Check for device status.  Device should be disabled */
+        if (current_status & ACPI_STA_DEVICE_ENABLED)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
+{
+        int result;
+        struct acpi_memory_info *info, *n;
 
-                result = remove_memory(info->start_addr, info->length);
-                if (result)
-                        return result;
 
-                list_del(&info->list);
+        /*
+         * Ask the VM to offline this memory range.
+         * Note: Assume that this function returns zero on success
+         */
+        list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
+                if (info->enabled) {
+                        result = remove_memory(info->start_addr, info->length);
+                        if (result)
+                                return result;
+                }
                 kfree(info);
         }
 
+        /* Power-off and eject the device */
+        result = acpi_memory_powerdown_device(mem_device);
+        if (result) {
+                /* Set the status of the device to invalid */
+                mem_device->state = MEMORY_INVALID_STATE;
+                return result;
+        }
+
+        mem_device->state = MEMORY_POWER_OFF_STATE;
         return result;
 }
 
@@ -315,8 +341,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 {
         struct acpi_memory_device *mem_device;
         struct acpi_device *device;
-        struct acpi_eject_event *ej_event = NULL;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
+
 
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
@@ -328,62 +353,52 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                           "\nReceived DEVICE CHECK notification for device\n"));
                 if (acpi_memory_get_device(handle, &mem_device)) {
-                        acpi_handle_err(handle, "Cannot find driver data\n");
-                        break;
+                        printk(KERN_ERR PREFIX "Cannot find driver data\n");
+                        return;
                 }
 
-                ost_code = ACPI_OST_SC_SUCCESS;
+                if (!acpi_memory_check_device(mem_device)) {
+                        if (acpi_memory_enable_device(mem_device))
+                                printk(KERN_ERR PREFIX
+                                            "Cannot enable memory device\n");
+                }
                 break;
-
         case ACPI_NOTIFY_EJECT_REQUEST:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "\nReceived EJECT REQUEST notification for device\n"));
 
                 if (acpi_bus_get_device(handle, &device)) {
-                        acpi_handle_err(handle, "Device doesn't exist\n");
+                        printk(KERN_ERR PREFIX "Device doesn't exist\n");
                         break;
                 }
                 mem_device = acpi_driver_data(device);
                 if (!mem_device) {
-                        acpi_handle_err(handle, "Driver Data is NULL\n");
+                        printk(KERN_ERR PREFIX "Driver Data is NULL\n");
                         break;
                 }
 
-                ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-                if (!ej_event) {
-                        pr_err(PREFIX "No memory, dropping EJECT\n");
-                        break;
-                }
-
-                ej_event->handle = handle;
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-                acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
-                                        (void *)ej_event);
-
-                /* eject is performed asynchronously */
-                return;
+                /*
+                 * Currently disabling memory device from kernel mode
+                 * TBD: Can also be disabled from user mode scripts
+                 * TBD: Can also be disabled by Callback registration
+                 *      with generic sysfs driver
+                 */
+                if (acpi_memory_disable_device(mem_device))
+                        printk(KERN_ERR PREFIX
+                                    "Disable memory device\n");
+                /*
+                 * TBD: Invoke acpi_bus_remove to cleanup data structures
+                 */
+                break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
-
-                /* non-hotplug event; possibly handled by other handler */
-                return;
+                break;
         }
 
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
         return;
 }
 
-static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
-{
-        if (!mem_device)
-                return;
-
-        acpi_memory_free_device_resources(mem_device);
-        kfree(mem_device);
-}
-
 static int acpi_memory_device_add(struct acpi_device *device)
 {
         int result;
@@ -413,16 +428,23 @@ static int acpi_memory_device_add(struct acpi_device *device)
         /* Set the device state */
         mem_device->state = MEMORY_POWER_ON_STATE;
 
-        pr_debug("%s\n", acpi_device_name(device));
+        printk(KERN_DEBUG "%s \n", acpi_device_name(device));
+
+        /*
+         * Early boot code has recognized memory area by EFI/E820.
+         * If DSDT shows these memory devices on boot, hotplug is not necessary
+         * for them. So, it just returns until completion of this driver's
+         * start up.
+         */
+        if (!acpi_hotmem_initialized)
+                return 0;
 
         if (!acpi_memory_check_device(mem_device)) {
                 /* call add_memory func */
                 result = acpi_memory_enable_device(mem_device);
-                if (result) {
-                        dev_err(&device->dev,
+                if (result)
+                        printk(KERN_ERR PREFIX
                                 "Error in acpi_memory_enable_device\n");
-                        acpi_memory_device_free(mem_device);
-                }
         }
         return result;
 }
@@ -430,18 +452,13 @@ static int acpi_memory_device_add(struct acpi_device *device)
 static int acpi_memory_device_remove(struct acpi_device *device, int type)
 {
         struct acpi_memory_device *mem_device = NULL;
-        int result;
+
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
         mem_device = acpi_driver_data(device);
-
-        result = acpi_memory_remove_memory(mem_device);
-        if (result)
-                return result;
-
-        acpi_memory_device_free(mem_device);
+        kfree(mem_device);
 
         return 0;
 }
@@ -530,6 +547,7 @@ static int __init acpi_memory_device_init(void)
                 return -ENODEV;
         }
 
+        acpi_hotmem_initialized = 1;
         return 0;
 }
 
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 16fa979f718..a43fa1a57d5 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -36,7 +36,6 @@
 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
 static DEFINE_MUTEX(isolated_cpus_lock);
-static DEFINE_MUTEX(round_robin_lock);
 
 static unsigned long power_saving_mwait_eax;
 
@@ -108,7 +107,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
                 return;
 
-        mutex_lock(&round_robin_lock);
+        mutex_lock(&isolated_cpus_lock);
         cpumask_clear(tmp);
         for_each_cpu(cpu, pad_busy_cpus)
                 cpumask_or(tmp, tmp, topology_thread_cpumask(cpu));
@@ -117,7 +116,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         if (cpumask_empty(tmp))
                 cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus);
         if (cpumask_empty(tmp)) {
-                mutex_unlock(&round_robin_lock);
+                mutex_unlock(&isolated_cpus_lock);
                 return;
         }
         for_each_cpu(cpu, tmp) {
@@ -132,7 +131,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         tsk_in_cpu[tsk_index] = preferred_cpu;
         cpumask_set_cpu(preferred_cpu, pad_busy_cpus);
         cpu_weight[preferred_cpu]++;
-        mutex_unlock(&round_robin_lock);
+        mutex_unlock(&isolated_cpus_lock);
 
         set_cpus_allowed_ptr(current, cpumask_of(preferred_cpu));
 }
@@ -145,7 +144,7 @@ static void exit_round_robin(unsigned int tsk_index)
 }
 
 static unsigned int idle_pct = 5; /* percentage */
-static unsigned int round_robin_time = 1; /* second */
+static unsigned int round_robin_time = 10; /* second */
 static int power_saving_thread(void *data)
 {
         struct sched_param param = {.sched_priority = 1};
@@ -235,7 +234,7 @@ static int create_power_saving_task(void)
 
         ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
                 (void *)(unsigned long)ps_tsk_num,
-                "acpi_pad/%d", ps_tsk_num);
+                "power_saving/%d", ps_tsk_num);
         rc = IS_ERR(ps_tsks[ps_tsk_num]) ? PTR_ERR(ps_tsks[ps_tsk_num]) : 0;
         if (!rc)
                 ps_tsk_num++;
@@ -286,7 +285,7 @@ static ssize_t acpi_pad_rrtime_store(struct device *dev,
         struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned long num;
-        if (kstrtoul(buf, 0, &num))
+        if (strict_strtoul(buf, 0, &num))
                 return -EINVAL;
         if (num < 1 || num >= 100)
                 return -EINVAL;
@@ -309,7 +308,7 @@ static ssize_t acpi_pad_idlepct_store(struct device *dev,
         struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned long num;
-        if (kstrtoul(buf, 0, &num))
+        if (strict_strtoul(buf, 0, &num))
                 return -EINVAL;
         if (num < 1 || num >= 100)
                 return -EINVAL;
@@ -332,7 +331,7 @@ static ssize_t acpi_pad_idlecpus_store(struct device *dev,
         struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned long num;
-        if (kstrtoul(buf, 0, &num))
+        if (strict_strtoul(buf, 0, &num))
                 return -EINVAL;
         mutex_lock(&isolated_cpus_lock);
         acpi_pad_idle_cpus(num);
@@ -457,7 +456,7 @@ static void acpi_pad_notify(acpi_handle handle, u32 event,
                         dev_name(&device->dev), event, 0);
                 break;
         default:
-                pr_warn("Unsupported event [0x%x]\n", event);
+                printk(KERN_WARNING "Unsupported event [0x%x]\n", event);
                 break;
         }
 }
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
deleted file mode 100644
index db129b9f52c..00000000000
--- a/drivers/acpi/acpi_platform.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * ACPI support for platform bus type.
- *
- * Copyright (C) 2012, Intel Corporation
- * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
- *          Mathias Nyman <mathias.nyman@linux.intel.com>
- *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/acpi.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include "internal.h"
-
-ACPI_MODULE_NAME("platform");
-
-/**
- * acpi_create_platform_device - Create platform device for ACPI device node
- * @adev: ACPI device node to create a platform device for.
- *
- * Check if the given @adev can be represented as a platform device and, if
- * that's the case, create and register a platform device, populate its common
- * resources and returns a pointer to it.  Otherwise, return %NULL.
- *
- * The platform device's name will be taken from the @adev's _HID and _UID.
- */
-struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
-{
-        struct platform_device *pdev = NULL;
-        struct acpi_device *acpi_parent;
-        struct platform_device_info pdevinfo;
-        struct resource_list_entry *rentry;
-        struct list_head resource_list;
-        struct resource *resources;
-        int count;
-
-        /* If the ACPI node already has a physical device attached, skip it. */
-        if (adev->physical_node_count)
-                return NULL;
-
-        INIT_LIST_HEAD(&resource_list);
-        count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
-        if (count <= 0)
-                return NULL;
-
-        resources = kmalloc(count * sizeof(struct resource), GFP_KERNEL);
-        if (!resources) {
-                dev_err(&adev->dev, "No memory for resources\n");
-                acpi_dev_free_resource_list(&resource_list);
-                return NULL;
-        }
-        count = 0;
-        list_for_each_entry(rentry, &resource_list, node)
-                resources[count++] = rentry->res;
-
-        acpi_dev_free_resource_list(&resource_list);
-
-        memset(&pdevinfo, 0, sizeof(pdevinfo));
-        /*
-         * If the ACPI node has a parent and that parent has a physical device
-         * attached to it, that physical device should be the parent of the
-         * platform device we are about to create.
-         */
-        pdevinfo.parent = NULL;
-        acpi_parent = adev->parent;
-        if (acpi_parent) {
-                struct acpi_device_physical_node *entry;
-                struct list_head *list;
-
-                mutex_lock(&acpi_parent->physical_node_lock);
-                list = &acpi_parent->physical_node_list;
-                if (!list_empty(list)) {
-                        entry = list_first_entry(list,
-                                        struct acpi_device_physical_node,
-                                        node);
-                        pdevinfo.parent = entry->dev;
-                }
-                mutex_unlock(&acpi_parent->physical_node_lock);
-        }
-        pdevinfo.name = dev_name(&adev->dev);
-        pdevinfo.id = -1;
-        pdevinfo.res = resources;
-        pdevinfo.num_res = count;
-        pdevinfo.acpi_node.handle = adev->handle;
-        pdev = platform_device_register_full(&pdevinfo);
-        if (IS_ERR(pdev)) {
-                dev_err(&adev->dev, "platform device creation failed: %ld\n",
-                        PTR_ERR(pdev));
-                pdev = NULL;
-        } else {
-                dev_dbg(&adev->dev, "created platform device %s\n",
-                        dev_name(&pdev->dev));
-        }
-
-        kfree(resources);
-        return pdev;
-}
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index bc7a03ded06..301bd2d388a 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -8,159 +8,41 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 # use acpi.o to put all files here into acpi.o modparam namespace
 obj-y   += acpi.o
 
-acpi-y :=               \
-        dsargs.o        \
-        dscontrol.o     \
-        dsfield.o       \
-        dsinit.o        \
-        dsmethod.o      \
-        dsmthdat.o      \
-        dsobject.o      \
-        dsopcode.o      \
-        dsutils.o       \
-        dswexec.o       \
-        dswload.o       \
-        dswload2.o      \
-        dswscope.o      \
-        dswstate.o
+acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+         dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+         dsinit.o dsargs.o dscontrol.o dswload2.o
 
-acpi-y +=               \
-        evevent.o       \
-        evgpe.o         \
-        evgpeblk.o      \
-        evgpeinit.o     \
-        evgpeutil.o     \
-        evglock.o       \
-        evmisc.o        \
-        evregion.o      \
-        evrgnini.o      \
-        evsci.o         \
-        evxface.o       \
-        evxfevnt.o      \
-        evxfgpe.o       \
-        evxfregn.o
+acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+         evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o
 
-acpi-y +=               \
-        exconfig.o      \
-        exconvrt.o      \
-        excreate.o      \
-        exdebug.o       \
-        exdump.o        \
-        exfield.o       \
-        exfldio.o       \
-        exmutex.o       \
-        exnames.o       \
-        exoparg1.o      \
-        exoparg2.o      \
-        exoparg3.o      \
-        exoparg6.o      \
-        exprep.o        \
-        exmisc.o        \
-        exregion.o      \
-        exresnte.o      \
-        exresolv.o      \
-        exresop.o       \
-        exstore.o       \
-        exstoren.o      \
-        exstorob.o      \
-        exsystem.o      \
-        exutils.o
+acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+         exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+         excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o
 
-acpi-y +=               \
-        hwacpi.o        \
-        hwesleep.o      \
-        hwgpe.o         \
-        hwpci.o         \
-        hwregs.o        \
-        hwsleep.o       \
-        hwvalid.o       \
-        hwxface.o       \
-        hwxfsleep.o
+acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 
-acpi-y +=               \
-        nsaccess.o      \
-        nsalloc.o       \
-        nsdump.o        \
-        nseval.o        \
-        nsinit.o        \
-        nsload.o        \
-        nsnames.o       \
-        nsobject.o      \
-        nsparse.o       \
-        nspredef.o      \
-        nsrepair.o      \
-        nsrepair2.o     \
-        nssearch.o      \
-        nsutils.o       \
-        nswalk.o        \
-        nsxfeval.o      \
-        nsxfname.o      \
-        nsxfobj.o
+acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+         nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o
 
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
 
-acpi-y +=               \
-        psargs.o        \
-        psloop.o        \
-        psopcode.o      \
-        psparse.o       \
-        psscope.o       \
-        pstree.o        \
-        psutils.o       \
-        pswalk.o        \
-        psxface.o
+acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+         psopcode.o  psscope.o  psutils.o  psxface.o
 
-acpi-y +=               \
-        rsaddr.o        \
-        rscalc.o        \
-        rscreate.o      \
-        rsinfo.o        \
-        rsio.o          \
-        rsirq.o         \
-        rslist.o        \
-        rsmemory.o      \
-        rsmisc.o        \
-        rsserial.o      \
-        rsutils.o       \
-        rsxface.o
+acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+         rscalc.o  rsirq.o  rsmemory.o  rsutils.o
 
 acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
 
-acpi-y +=               \
-        tbfadt.o        \
-        tbfind.o        \
-        tbinstal.o      \
-        tbutils.o       \
-        tbxface.o       \
-        tbxfload.o      \
-        tbxfroot.o
-
-acpi-y +=               \
-        utaddress.o     \
-        utalloc.o       \
-        utcopy.o        \
-        utexcep.o       \
-        utdebug.o       \
-        utdecode.o      \
-        utdelete.o      \
-        uteval.o        \
-        utglobal.o      \
-        utids.o         \
-        utinit.o        \
-        utlock.o        \
-        utmath.o        \
-        utmisc.o        \
-        utmutex.o       \
-        utobject.o      \
-        utosi.o         \
-        utresrc.o       \
-        utstate.o       \
-        utxface.o       \
-        utxfinit.o      \
-        utxferror.o     \
-        utxfmutex.o
-
-acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o
+acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
 
+acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+                utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
+                utosi.o utxferror.o utdecode.o
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 8a7d51bfb3b..e0ba17f0a7c 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@
  *
  * Note: The order of these include files is important.
  */
+#include "acconfig.h"           /* Global configuration constants */
 #include "acmacros.h"           /* C macros */
 #include "aclocal.h"            /* Internal data types */
 #include "acobject.h"           /* ACPI internal object */
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 432a318c9ed..eb0b1f8dee6 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,28 +44,17 @@
 #ifndef __ACDEBUG_H__
 #define __ACDEBUG_H__
 
-#define ACPI_DEBUG_BUFFER_SIZE  0x4000  /* 16K buffer for return objects */
+#define ACPI_DEBUG_BUFFER_SIZE  4196
 
-struct acpi_db_command_info {
+struct command_info {
         char *name;             /* Command Name */
         u8 min_args;            /* Minimum arguments required */
 };
 
-struct acpi_db_command_help {
-        u8 line_count;          /* Number of help lines */
-        char *invocation;       /* Command Invocation */
-        char *description;      /* Command Description */
-};
-
-struct acpi_db_argument_info {
+struct argument_info {
         char *name;             /* Argument Name */
 };
 
-struct acpi_db_execute_walk {
-        u32 count;
-        u32 max_count;
-};
-
 #define PARAM_LIST(pl)                  pl
 #define DBTEST_OUTPUT_LEVEL(lvl)        if (acpi_gbl_db_opt_verbose)
 #define VERBOSE_PRINT(fp)               DBTEST_OUTPUT_LEVEL(lvl) {\
@@ -88,35 +77,12 @@ acpi_db_single_step(struct acpi_walk_state *walk_state,
 /*
  * dbcmds - debug commands and output routines
  */
-struct acpi_namespace_node *acpi_db_convert_to_node(char *in_string);
+acpi_status acpi_db_disassemble_method(char *name);
 
 void acpi_db_display_table_info(char *table_arg);
 
-void acpi_db_display_template(char *buffer_arg);
-
-void acpi_db_unload_acpi_table(char *name);
-
-void acpi_db_send_notify(char *name, u32 value);
-
-void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);
-
-acpi_status acpi_db_sleep(char *object_arg);
-
-void acpi_db_display_locks(void);
-
-void acpi_db_display_resources(char *object_arg);
-
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_display_gpes(void))
-
-void acpi_db_display_handlers(void);
+void acpi_db_unload_acpi_table(char *table_arg, char *instance_arg);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void
-                              acpi_db_generate_gpe(char *gpe_arg,
-                                                   char *block_arg))
-
-/*
- * dbmethod - control method commands
- */
 void
 acpi_db_set_method_breakpoint(char *location,
                               struct acpi_walk_state *walk_state,
@@ -124,35 +90,44 @@ acpi_db_set_method_breakpoint(char *location,
 
 void acpi_db_set_method_call_breakpoint(union acpi_parse_object *op);
 
-void acpi_db_set_method_data(char *type_arg, char *index_arg, char *value_arg);
-
-acpi_status acpi_db_disassemble_method(char *name);
+void acpi_db_get_bus_info(void);
 
 void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);
 
-void acpi_db_batch_execute(char *count_arg);
-
-/*
- * dbnames - namespace commands
- */
-void acpi_db_set_scope(char *name);
-
 void acpi_db_dump_namespace(char *start_arg, char *depth_arg);
 
 void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);
 
-acpi_status acpi_db_find_name_in_namespace(char *name_arg);
+void acpi_db_send_notify(char *name, u32 value);
 
-void acpi_db_check_predefined_names(void);
+void acpi_db_set_method_data(char *type_arg, char *index_arg, char *value_arg);
 
 acpi_status
 acpi_db_display_objects(char *obj_type_arg, char *display_count_arg);
 
-void acpi_db_check_integrity(void);
+void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);
+
+acpi_status acpi_db_find_name_in_namespace(char *name_arg);
+
+void acpi_db_set_scope(char *name);
+
+acpi_status acpi_db_sleep(char *object_arg);
 
 void acpi_db_find_references(char *object_arg);
 
-void acpi_db_get_bus_info(void);
+void acpi_db_display_locks(void);
+
+void acpi_db_display_resources(char *object_arg);
+
+void acpi_db_display_gpes(void);
+
+void acpi_db_check_integrity(void);
+
+void acpi_db_generate_gpe(char *gpe_arg, char *block_arg);
+
+void acpi_db_check_predefined_names(void);
+
+void acpi_db_batch_execute(void);
 
 /*
  * dbdisply - debug display commands
@@ -184,8 +159,7 @@ acpi_db_display_argument_object(union acpi_operand_object *obj_desc,
 /*
  * dbexec - debugger control method execution
  */
-void
-acpi_db_execute(char *name, char **args, acpi_object_type * types, u32 flags);
+void acpi_db_execute(char *name, char **args, u32 flags);
 
 void
 acpi_db_create_execution_threads(char *num_threads_arg,
@@ -199,8 +173,7 @@ u32 acpi_db_get_cache_info(struct acpi_memory_list *cache);
  * dbfileio - Debugger file I/O commands
  */
 acpi_object_type
-acpi_db_match_argument(char *user_argument,
-                       struct acpi_db_argument_info *arguments);
+acpi_db_match_argument(char *user_argument, struct argument_info *arguments);
 
 void acpi_db_close_debug_file(void);
 
@@ -233,11 +206,6 @@ acpi_db_command_dispatch(char *input_buffer,
 
 void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context);
 
-acpi_status acpi_db_user_commands(char prompt, union acpi_parse_object *op);
-
-char *acpi_db_get_next_token(char *string,
-                             char **next, acpi_object_type * return_type);
-
 /*
  * dbstats - Generation and display of ACPI table statistics
  */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index ed33ebcdaeb..2d1b7ffa377 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -309,13 +309,10 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state);
 acpi_status
 acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state);
 
-struct acpi_walk_state * acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                   union acpi_parse_object
-                                                   *origin,
-                                                   union acpi_operand_object
-                                                   *mth_desc,
-                                                   struct acpi_thread_state
-                                                   *thread);
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                  *origin, union acpi_operand_object
+                                                  *mth_desc, struct acpi_thread_state
+                                                  *thread);
 
 acpi_status
 acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index e975c672044..bea3b489918 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,10 +69,11 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node,
  */
 acpi_status acpi_ev_init_global_lock_handler(void);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
-                            acpi_ev_acquire_global_lock(u16 timeout))
- ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
- acpi_status acpi_ev_remove_global_lock_handler(void);
+acpi_status acpi_ev_acquire_global_lock(u16 timeout);
+
+acpi_status acpi_ev_release_global_lock(void);
+
+acpi_status acpi_ev_remove_global_lock_handler(void);
 
 /*
  * evgpe - Low-level GPE support
@@ -84,11 +85,9 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info);
 
 acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status
-acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status
-acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
 struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                        u32 gpe_number);
@@ -115,9 +114,7 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                              struct acpi_gpe_block_info *gpe_block,
                              void *context);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
-                            acpi_ev_delete_gpe_block(struct acpi_gpe_block_info
-                                                     *gpe_block))
+acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);
 
 u32
 acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
@@ -129,10 +126,9 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
  */
 acpi_status acpi_ev_gpe_initialize(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void
-                              acpi_ev_update_gpes(acpi_owner_id table_owner_id))
+void acpi_ev_update_gpes(acpi_owner_id table_owner_id);
 
- acpi_status
+acpi_status
 acpi_ev_match_gpe_method(acpi_handle obj_handle,
                          u32 level, void *context, void **return_value);
 
@@ -166,7 +162,6 @@ acpi_status acpi_ev_initialize_op_regions(void);
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
-                               union acpi_operand_object *field_obj,
                                u32 function,
                                u32 region_offset, u32 bit_width, u64 *value);
 
@@ -239,7 +234,8 @@ u32 acpi_ev_install_sci_handler(void);
 
 acpi_status acpi_ev_remove_sci_handler(void);
 
-u32 acpi_ev_initialize_SCI(u32 program_SCI);
+u32 acpi_ev_initialize_sCI(u32 program_sCI);
+
+void acpi_ev_terminate(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))
 #endif                          /* __ACEVENTS_H__  */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 64472e4ec32..76dc02f1557 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@
 
 /*
  * Enable "slack" in the AML interpreter?  Default is FALSE, and the
- * interpreter strictly follows the ACPI specification. Setting to TRUE
+ * interpreter strictly follows the ACPI specification.  Setting to TRUE
  * allows the interpreter to ignore certain errors and/or bad AML constructs.
  *
  * Currently, these features are enabled by this flag:
@@ -108,7 +108,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
 /*
  * Optionally enable output from the AML Debug Object.
  */
-bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
+u32 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
 
 /*
  * Optionally copy the entire DSDT to local memory (instead of simply
@@ -140,18 +140,27 @@ u32 acpi_gbl_trace_flags;
 acpi_name acpi_gbl_trace_method_name;
 u8 acpi_gbl_system_awake_and_running;
 
-/*
- * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
- * that the ACPI hardware is no longer required. A flag in the FADT indicates
- * a reduced HW machine, and that flag is duplicated here for convenience.
- */
-u8 acpi_gbl_reduced_hardware;
+#endif
 
-#endif                          /* DEFINE_ACPI_GLOBALS */
+/*****************************************************************************
+ *
+ * Debug support
+ *
+ ****************************************************************************/
 
-/* Do not disassemble buffers to resource descriptors */
+/* Procedure nesting level for debug output */
 
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
+extern u32 acpi_gbl_nesting_level;
+
+ACPI_EXTERN u32 acpi_gpe_count;
+ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
+
+/* Support for dynamic control method tracing mechanism */
+
+ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
 
 /*****************************************************************************
  *
@@ -164,12 +173,8 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
  * found in the RSDT/XSDT.
  */
 ACPI_EXTERN struct acpi_table_list acpi_gbl_root_table_list;
-
-#if (!ACPI_REDUCED_HARDWARE)
 ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
 
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
 /* These addresses are calculated from the FADT Event Block addresses */
 
 ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_status;
@@ -202,7 +207,7 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;
 
 /*****************************************************************************
  *
- * Mutual exclusion within ACPICA subsystem
+ * Mutual exlusion within ACPICA subsystem
  *
  ****************************************************************************/
 
@@ -239,6 +244,15 @@ ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock;	/* For ACPI H/W except GPE reg
  *
  ****************************************************************************/
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+
+/* Lists for tracking memory allocations */
+
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;
+ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;
+#endif
+
 /* Object caches */
 
 ACPI_EXTERN acpi_cache_t *acpi_gbl_namespace_cache;
@@ -249,7 +263,8 @@ ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache;
 
 /* Global handlers */
 
-ACPI_EXTERN struct acpi_global_notify_handler acpi_gbl_global_notify[2];
+ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_device_notify;
+ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify;
 ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;
 ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
 ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;
@@ -280,8 +295,6 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
 ACPI_EXTERN u8 acpi_gbl_events_initialized;
 ACPI_EXTERN u8 acpi_gbl_osi_data;
 ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;
-ACPI_EXTERN struct acpi_address_range
-    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];
 
 #ifndef DEFINE_ACPI_GLOBALS
 
@@ -297,14 +310,13 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
 #endif
 
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-
-/* Lists for tracking memory allocations */
+/* Exception codes */
 
-ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;
-ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;
-ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;
-#endif
+extern char const *acpi_gbl_exception_names_env[];
+extern char const *acpi_gbl_exception_names_pgm[];
+extern char const *acpi_gbl_exception_names_tbl[];
+extern char const *acpi_gbl_exception_names_aml[];
+extern char const *acpi_gbl_exception_names_ctrl[];
 
 /*****************************************************************************
  *
@@ -372,37 +384,10 @@ ACPI_EXTERN struct acpi_fixed_event_handler
 ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
 ACPI_EXTERN struct acpi_gpe_block_info
 *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
-
-#if (!ACPI_REDUCED_HARDWARE)
-
 ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
-ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;
+ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
 ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
 
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
-/*****************************************************************************
- *
- * Debug support
- *
- ****************************************************************************/
-
-/* Procedure nesting level for debug output */
-
-extern u32 acpi_gbl_nesting_level;
-
-/* Event counters */
-
-ACPI_EXTERN u32 acpi_gpe_count;
-ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
-
-/* Support for dynamic control method tracing mechanism */
-
-ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
-ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
-ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
-ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
-
 /*****************************************************************************
  *
  * Debugger globals
@@ -428,11 +413,10 @@ ACPI_EXTERN u8 acpi_gbl_db_opt_stats;
 ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;
 
 ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char acpi_gbl_db_scope_buf[80];
-ACPI_EXTERN char acpi_gbl_db_debug_filename[80];
+ACPI_EXTERN char acpi_gbl_db_line_buf[80];
+ACPI_EXTERN char acpi_gbl_db_parsed_buf[80];
+ACPI_EXTERN char acpi_gbl_db_scope_buf[40];
+ACPI_EXTERN char acpi_gbl_db_debug_filename[40];
 ACPI_EXTERN u8 acpi_gbl_db_output_to_file;
 ACPI_EXTERN char *acpi_gbl_db_buffer;
 ACPI_EXTERN char *acpi_gbl_db_filename;
@@ -457,12 +441,4 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;
 
 #endif                          /* ACPI_DEBUGGER */
 
-/*****************************************************************************
- *
- * Info/help support
- *
- ****************************************************************************/
-
-extern const struct ah_predefined_name asl_predefined_info[];
-
 #endif                          /* __ACGLOBAL_H__ */
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index d902d31abc6..e7213beaafc 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,26 +81,6 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value);
 acpi_status acpi_hw_clear_acpi_status(void);
 
 /*
- * hwsleep - sleep/wake support (Legacy sleep registers)
- */
-acpi_status acpi_hw_legacy_sleep(u8 sleep_state);
-
-acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state);
-
-acpi_status acpi_hw_legacy_wake(u8 sleep_state);
-
-/*
- * hwesleep - sleep/wake support (Extended FADT-V5 sleep registers)
- */
-void acpi_hw_execute_sleep_method(char *method_name, u32 integer_argument);
-
-acpi_status acpi_hw_extended_sleep(u8 sleep_state);
-
-acpi_status acpi_hw_extended_wake_prep(u8 sleep_state);
-
-acpi_status acpi_hw_extended_wake(u8 sleep_state);
-
-/*
  * hwvalid - Port I/O with validation
  */
 acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width);
@@ -110,7 +90,8 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width);
 /*
  * hwgpe - GPE support
  */
-u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info);
+u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
+                             struct acpi_gpe_register_info *gpe_register_info);
 
 acpi_status
 acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action);
@@ -147,4 +128,16 @@ acpi_status
 acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
                       acpi_handle root_pci_device, acpi_handle pci_region);
 
+#ifdef  ACPI_FUTURE_USAGE
+/*
+ * hwtimer - ACPI Timer prototypes
+ */
+acpi_status acpi_get_timer_resolution(u32 * resolution);
+
+acpi_status acpi_get_timer(u32 * ticks);
+
+acpi_status
+acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed);
+#endif                          /* ACPI_FUTURE_USAGE */
+
 #endif                          /* __ACHWARE_H__ */
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index eb308635da7..3731e1c34b8 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -468,8 +468,6 @@ void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
 
 void acpi_ex_integer_to_string(char *dest, u64 value);
 
-u8 acpi_is_valid_space_id(u8 space_id);
-
 /*
  * exregion - default op_region handlers
  */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index ff8bd0061e8..5552125d834 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ typedef u32 acpi_mutex_handle;
 
 /* Total number of aml opcodes defined */
 
-#define AML_NUM_OPCODES                 0x81
+#define AML_NUM_OPCODES                 0x7F
 
 /* Forward declarations */
 
@@ -249,23 +249,19 @@ struct acpi_create_field_info {
         struct acpi_namespace_node *field_node;
         struct acpi_namespace_node *register_node;
         struct acpi_namespace_node *data_register_node;
-        struct acpi_namespace_node *connection_node;
-        u8 *resource_buffer;
         u32 bank_value;
         u32 field_bit_position;
         u32 field_bit_length;
-        u16 resource_length;
         u8 field_flags;
         u8 attribute;
         u8 field_type;
-        u8 access_length;
 };
 
 typedef
-acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
+acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state);
 
 /*
- * Bitmapped ACPI types. Used internally only
+ * Bitmapped ACPI types.  Used internally only
  */
 #define ACPI_BTYPE_ANY                  0x00000000
 #define ACPI_BTYPE_INTEGER              0x00000001
@@ -299,7 +295,7 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
  * Information structure for ACPI predefined names.
  * Each entry in the table contains the following items:
  *
- * name                 - The ACPI reserved name
+ * Name                 - The ACPI reserved name
  * param_count          - Number of arguments to the method
  * expected_return_btypes - Allowed type(s) for the return value
  */
@@ -319,8 +315,7 @@ struct acpi_name_info {
 
 /*
  * Used for ACPI_PTYPE1_FIXED, ACPI_PTYPE1_VAR, ACPI_PTYPE2,
- * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT,
- * ACPI_PTYPE2_FIX_VAR
+ * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT
  */
 struct acpi_package_info {
         u8 type;
@@ -370,7 +365,6 @@ struct acpi_predefined_data {
 /* Defines for Flags field above */
 
 #define ACPI_OBJECT_REPAIRED    1
-#define ACPI_OBJECT_WRAPPED     2
 
 /*
  * Bitmapped return value types
@@ -404,13 +398,6 @@ struct acpi_gpe_handler_info {
         u8 originally_enabled;  /* True if GPE was originally enabled */
 };
 
-/* Notify info for implicit notify, multiple device objects */
-
-struct acpi_gpe_notify_info {
-        struct acpi_namespace_node *device_node;        /* Device to be notified */
-        struct acpi_gpe_notify_info *next;
-};
-
 struct acpi_gpe_notify_object {
         struct acpi_namespace_node *node;
         struct acpi_gpe_notify_object *next;
@@ -419,7 +406,7 @@ struct acpi_gpe_notify_object {
 union acpi_gpe_dispatch_info {
         struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
         struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
-        struct acpi_gpe_notify_info *notify_list;       /* List of _PRW devices for implicit notifies */
+        struct acpi_gpe_notify_object device;   /* List of _PRW devices for implicit notify */
 };
 
 /*
@@ -427,7 +414,7 @@ union acpi_gpe_dispatch_info {
  * NOTE: Important to keep this struct as small as possible.
  */
 struct acpi_gpe_event_info {
-        union acpi_gpe_dispatch_info dispatch;  /* Either Method, Handler, or notify_list */
+        union acpi_gpe_dispatch_info dispatch;  /* Either Method or Handler */
         struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
         u8 flags;               /* Misc info about this GPE */
         u8 gpe_number;          /* This GPE */
@@ -486,10 +473,8 @@ struct acpi_gpe_device_info {
         struct acpi_namespace_node *gpe_device;
 };
 
-typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
-                                         gpe_xrupt_info,
-                                         struct acpi_gpe_block_info *gpe_block,
-                                         void *context);
+typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                struct acpi_gpe_block_info *gpe_block, void *context);
 
 /* Information about each particular fixed event */
 
@@ -584,7 +569,7 @@ struct acpi_pscope_state {
 };
 
 /*
- * Thread state - one per thread across multiple walk states. Multiple walk
+ * Thread state - one per thread across multiple walk states.  Multiple walk
  * states are created when there are nested control methods executing.
  */
 struct acpi_thread_state {
@@ -609,22 +594,13 @@ acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
 
 typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
 
-/* Global handlers for AML Notifies */
-
-struct acpi_global_notify_handler {
-        acpi_notify_handler handler;
-        void *context;
-};
-
 /*
  * Notify info - used to pass info to the deferred notify
  * handler/dispatcher.
  */
 struct acpi_notify_info {
-        ACPI_STATE_COMMON u8 handler_list_id;
-        struct acpi_namespace_node *node;
-        union acpi_operand_object *handler_list_head;
-        struct acpi_global_notify_handler *global;
+        ACPI_STATE_COMMON struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_obj;
 };
 
 /* Generic state is union of structs above */
@@ -647,16 +623,7 @@ union acpi_generic_state {
  *
  ****************************************************************************/
 
-typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state);
-
-/* Address Range info block */
-
-struct acpi_address_range {
-        struct acpi_address_range *next;
-        struct acpi_namespace_node *region_node;
-        acpi_physical_address start_address;
-        acpi_physical_address end_address;
-};
+typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);
 
 /*****************************************************************************
  *
@@ -709,18 +676,15 @@ union acpi_parse_value {
         u8                              disasm_opcode;  /* Subtype used for disassembly */\
         char                            aml_op_name[16])        /* Op name (debug only) */
 
-/* Flags for disasm_flags field above */
-
-#define ACPI_DASM_BUFFER                0x00    /* Buffer is a simple data buffer */
-#define ACPI_DASM_RESOURCE              0x01    /* Buffer is a Resource Descriptor */
-#define ACPI_DASM_STRING                0x02    /* Buffer is a ASCII string */
-#define ACPI_DASM_UNICODE               0x03    /* Buffer is a Unicode string */
-#define ACPI_DASM_PLD_METHOD            0x04    /* Buffer is a _PLD method bit-packed buffer */
-#define ACPI_DASM_EISAID                0x05    /* Integer is an EISAID */
-#define ACPI_DASM_MATCHOP               0x06    /* Parent opcode is a Match() operator */
-#define ACPI_DASM_LNOT_PREFIX           0x07    /* Start of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_LNOT_SUFFIX           0x08    /* End  of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_IGNORE                0x09    /* Not used at this time */
+#define ACPI_DASM_BUFFER                0x00
+#define ACPI_DASM_RESOURCE              0x01
+#define ACPI_DASM_STRING                0x02
+#define ACPI_DASM_UNICODE               0x03
+#define ACPI_DASM_EISAID                0x04
+#define ACPI_DASM_MATCHOP               0x05
+#define ACPI_DASM_LNOT_PREFIX           0x06
+#define ACPI_DASM_LNOT_SUFFIX           0x07
+#define ACPI_DASM_IGNORE                0x08
 
 /*
  * Generic operation (for example:  If, While, Store)
@@ -739,7 +703,7 @@ struct acpi_parse_obj_named {
         u32 name;               /* 4-byte name or zero if no name */
 };
 
-/* This version is used by the iASL compiler only */
+/* This version is used by the i_aSL compiler only */
 
 #define ACPI_MAX_PARSEOP_NAME   20
 
@@ -808,7 +772,6 @@ struct acpi_parse_state {
 #define ACPI_PARSEOP_IGNORE             0x01
 #define ACPI_PARSEOP_PARAMLIST          0x02
 #define ACPI_PARSEOP_EMPTY_TERMLIST     0x04
-#define ACPI_PARSEOP_PREDEF_CHECKED     0x08
 #define ACPI_PARSEOP_SPECIAL            0x10
 
 /*****************************************************************************
@@ -937,7 +900,6 @@ struct acpi_bit_register_info {
 #define ACPI_OSI_WIN_VISTA_SP1          0x09
 #define ACPI_OSI_WIN_VISTA_SP2          0x0A
 #define ACPI_OSI_WIN_7                  0x0B
-#define ACPI_OSI_WIN_8                  0x0C
 
 #define ACPI_ALWAYS_ILLEGAL             0x00
 
@@ -989,7 +951,7 @@ struct acpi_port_info {
 #define ACPI_RESOURCE_NAME_END_DEPENDENT        0x38
 #define ACPI_RESOURCE_NAME_IO                   0x40
 #define ACPI_RESOURCE_NAME_FIXED_IO             0x48
-#define ACPI_RESOURCE_NAME_FIXED_DMA            0x50
+#define ACPI_RESOURCE_NAME_RESERVED_S1          0x50
 #define ACPI_RESOURCE_NAME_RESERVED_S2          0x58
 #define ACPI_RESOURCE_NAME_RESERVED_S3          0x60
 #define ACPI_RESOURCE_NAME_RESERVED_S4          0x68
@@ -1011,9 +973,7 @@ struct acpi_port_info {
 #define ACPI_RESOURCE_NAME_EXTENDED_IRQ         0x89
 #define ACPI_RESOURCE_NAME_ADDRESS64            0x8A
 #define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B
-#define ACPI_RESOURCE_NAME_GPIO                 0x8C
-#define ACPI_RESOURCE_NAME_SERIAL_BUS           0x8E
-#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8E
+#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8B
 
 /*****************************************************************************
  *
@@ -1030,10 +990,8 @@ struct acpi_port_info {
  ****************************************************************************/
 
 struct acpi_db_method_info {
-        acpi_handle method;
         acpi_handle main_thread_gate;
         acpi_handle thread_complete_gate;
-        acpi_handle info_gate;
         acpi_thread_id *threads;
         u32 num_threads;
         u32 num_created;
@@ -1044,7 +1002,6 @@ struct acpi_db_method_info {
         u32 num_loops;
         char pathname[128];
         char **args;
-        acpi_object_type *types;
 
         /*
          * Arguments to be passed to method for the command
@@ -1101,18 +1058,4 @@ struct acpi_debug_mem_block {
 #define ACPI_MEM_LIST_MAX               1
 #define ACPI_NUM_MEM_LISTS              2
 
-/*****************************************************************************
- *
- * Info/help support
- *
- ****************************************************************************/
-
-struct ah_predefined_name {
-        char *name;
-        char *description;
-#ifndef ACPI_ASL_COMPILER
-        char *action;
-#endif
-};
-
 #endif                          /* __ACLOCAL_H__ */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 5efad99f216..b7491ee1fba 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
  * printf() format helpers
  */
 
-/* Split 64-bit integer into two 32-bit values. Use with %8.8X%8.8X */
+/* Split 64-bit integer into two 32-bit values. Use with %8.8_x%8.8_x */
 
 #define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)
 
@@ -84,29 +84,29 @@
 
 /* These macros reverse the bytes during the move, converting little-endian to big endian */
 
-         /* Big Endian      <==        Little Endian */
-         /*  Hi...Lo                     Lo...Hi     */
+                          /* Big Endian      <==        Little Endian */
+                          /*  Hi...Lo                     Lo...Hi     */
 /* 16-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_16_TO_16(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[1];\
-                          ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
+                                           ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_32(d, s)        {(*(u32 *)(void *)(d))=0;\
-                                          ((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
-                                          ((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+                                                           ((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                                           ((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
-                                                           ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
-                                                           ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
+                                                                         ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
+                                                                         ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
 
 /* 32-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
 
 #define ACPI_MOVE_32_TO_32(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[3];\
-                                                                          ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
-                                                                          ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
-                                                                          ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
+                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_32_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
                                                                                    ((u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
@@ -196,12 +196,24 @@
 #endif
 #endif
 
+/* Macros based on machine integer width */
+
+#if ACPI_MACHINE_WIDTH == 32
+#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_32_TO_16(d, s)
+
+#elif ACPI_MACHINE_WIDTH == 64
+#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_64_TO_16(d, s)
+
+#else
+#error unknown ACPI_MACHINE_WIDTH
+#endif
+
 /*
  * Fast power-of-two math macros for non-optimized compilers
  */
-#define _ACPI_DIV(value, power_of2)     ((u32) ((value) >> (power_of2)))
-#define _ACPI_MUL(value, power_of2)     ((u32) ((value) << (power_of2)))
-#define _ACPI_MOD(value, divisor)       ((u32) ((value) & ((divisor) -1)))
+#define _ACPI_DIV(value, power_of2)      ((u32) ((value) >> (power_of2)))
+#define _ACPI_MUL(value, power_of2)      ((u32) ((value) << (power_of2)))
+#define _ACPI_MOD(value, divisor)        ((u32) ((value) & ((divisor) -1)))
 
 #define ACPI_DIV_2(a)                   _ACPI_DIV(a, 1)
 #define ACPI_MUL_2(a)                   _ACPI_MUL(a, 1)
@@ -226,12 +238,12 @@
 /*
  * Rounding macros (Power of two boundaries only)
  */
-#define ACPI_ROUND_DOWN(value, boundary)    (((acpi_size)(value)) & \
-                                                                                                (~(((acpi_size) boundary)-1)))
+#define ACPI_ROUND_DOWN(value, boundary)     (((acpi_size)(value)) & \
+                                                (~(((acpi_size) boundary)-1)))
 
-#define ACPI_ROUND_UP(value, boundary)      ((((acpi_size)(value)) + \
-                                                                                                (((acpi_size) boundary)-1)) & \
-                                                                                                (~(((acpi_size) boundary)-1)))
+#define ACPI_ROUND_UP(value, boundary)       ((((acpi_size)(value)) + \
+                                                (((acpi_size) boundary)-1)) & \
+                                                (~(((acpi_size) boundary)-1)))
 
 /* Note: sizeof(acpi_size) evaluates to either 4 or 8 (32- vs 64-bit mode) */
 
@@ -252,7 +264,7 @@
 
 #define ACPI_ROUND_UP_TO(value, boundary)   (((value) + ((boundary)-1)) / (boundary))
 
-#define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) & (sizeof(acpi_size)-1))
+#define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) & (sizeof(acpi_size)-1))
 
 /*
  * Bitmask creation
@@ -265,37 +277,14 @@
 
 /* Bitfields within ACPI registers */
 
-#define ACPI_REGISTER_PREPARE_BITS(val, pos, mask) \
-        ((val << pos) & mask)
-
-#define ACPI_REGISTER_INSERT_VALUE(reg, pos, mask, val) \
-        reg = (reg & (~(mask))) | ACPI_REGISTER_PREPARE_BITS(val, pos, mask)
+#define ACPI_REGISTER_PREPARE_BITS(val, pos, mask)      ((val << pos) & mask)
+#define ACPI_REGISTER_INSERT_VALUE(reg, pos, mask, val)  reg = (reg & (~(mask))) | ACPI_REGISTER_PREPARE_BITS(val, pos, mask)
 
-#define ACPI_INSERT_BITS(target, mask, source) \
-        target = ((target & (~(mask))) | (source & mask))
-
-/* Generic bitfield macros and masks */
-
-#define ACPI_GET_BITS(source_ptr, position, mask) \
-        ((*source_ptr >> position) & mask)
-
-#define ACPI_SET_BITS(target_ptr, position, mask, value) \
-        (*target_ptr |= ((value & mask) << position))
-
-#define ACPI_1BIT_MASK      0x00000001
-#define ACPI_2BIT_MASK      0x00000003
-#define ACPI_3BIT_MASK      0x00000007
-#define ACPI_4BIT_MASK      0x0000000F
-#define ACPI_5BIT_MASK      0x0000001F
-#define ACPI_6BIT_MASK      0x0000003F
-#define ACPI_7BIT_MASK      0x0000007F
-#define ACPI_8BIT_MASK      0x000000FF
-#define ACPI_16BIT_MASK     0x0000FFFF
-#define ACPI_24BIT_MASK     0x00FFFFFF
+#define ACPI_INSERT_BITS(target, mask, source)          target = ((target & (~(mask))) | (source & mask))
 
 /*
- * An object of type struct acpi_namespace_node can appear in some contexts
- * where a pointer to an object of type union acpi_operand_object can also
+ * A struct acpi_namespace_node can appear in some contexts
+ * where a pointer to a union acpi_operand_object can also
  * appear. This macro is used to distinguish them.
  *
  * The "Descriptor" field is the first field in both structures.
@@ -343,6 +332,7 @@
  * Ascii error messages can be configured out
  */
 #ifndef ACPI_NO_ERROR_MESSAGES
+
 /*
  * Error reporting. Callers module and line number are inserted by AE_INFO,
  * the plist contains a set of parens to allow variable-length lists.
@@ -362,15 +352,18 @@
 #define ACPI_WARN_PREDEFINED(plist)
 #define ACPI_INFO_PREDEFINED(plist)
 
-#endif                          /* ACPI_NO_ERROR_MESSAGES */
+#endif          /* ACPI_NO_ERROR_MESSAGES */
 
 /*
  * Debug macros that are conditionally compiled
  */
 #ifdef ACPI_DEBUG_OUTPUT
+
 /*
  * Function entry tracing
  */
+#ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
+
 #define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \
                           acpi_ut_trace(ACPI_DEBUG_PARAMETERS)
 #define ACPI_FUNCTION_TRACE_PTR(a, b)   ACPI_FUNCTION_NAME(a) \
@@ -448,19 +441,45 @@
 
 #endif                          /* ACPI_SIMPLE_RETURN_MACROS */
 
+#else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */
+
+#define ACPI_FUNCTION_TRACE(a)
+#define ACPI_FUNCTION_TRACE_PTR(a,b)
+#define ACPI_FUNCTION_TRACE_U32(a,b)
+#define ACPI_FUNCTION_TRACE_STR(a,b)
+#define ACPI_FUNCTION_EXIT
+#define ACPI_FUNCTION_STATUS_EXIT(s)
+#define ACPI_FUNCTION_VALUE_EXIT(s)
+#define ACPI_FUNCTION_TRACE(a)
+#define ACPI_FUNCTION_ENTRY()
+
+#define return_VOID                     return
+#define return_ACPI_STATUS(s)           return(s)
+#define return_VALUE(s)                 return(s)
+#define return_UINT8(s)                 return(s)
+#define return_UINT32(s)                return(s)
+#define return_PTR(s)                   return(s)
+
+#endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */
+
 /* Conditional execution */
 
 #define ACPI_DEBUG_EXEC(a)              a
+#define ACPI_NORMAL_EXEC(a)
+
+#define ACPI_DEBUG_DEFINE(a)            a;
 #define ACPI_DEBUG_ONLY_MEMBERS(a)      a;
 #define _VERBOSE_STRUCTURES
 
-/* Various object display routines for debug */
+/* Stack and buffer dumping */
 
 #define ACPI_DUMP_STACK_ENTRY(a)        acpi_ex_dump_operand((a), 0)
-#define ACPI_DUMP_OPERANDS(a, b ,c)     acpi_ex_dump_operands(a, b, c)
+#define ACPI_DUMP_OPERANDS(a, b, c)     acpi_ex_dump_operands(a, b, c)
+
 #define ACPI_DUMP_ENTRY(a, b)           acpi_ns_dump_entry (a, b)
 #define ACPI_DUMP_PATHNAME(a, b, c, d)  acpi_ns_dump_pathname(a, b, c, d)
-#define ACPI_DUMP_BUFFER(a, b)          acpi_ut_debug_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
+#define ACPI_DUMP_RESOURCE_LIST(a)      acpi_rs_dump_resource_list(a)
+#define ACPI_DUMP_BUFFER(a, b)          acpi_ut_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
 
 #else
 /*
@@ -468,23 +487,25 @@
  * leaving no executable debug code!
  */
 #define ACPI_DEBUG_EXEC(a)
-#define ACPI_DEBUG_ONLY_MEMBERS(a)
-#define ACPI_FUNCTION_TRACE(a)
-#define ACPI_FUNCTION_TRACE_PTR(a, b)
-#define ACPI_FUNCTION_TRACE_U32(a, b)
-#define ACPI_FUNCTION_TRACE_STR(a, b)
-#define ACPI_FUNCTION_EXIT
-#define ACPI_FUNCTION_STATUS_EXIT(s)
-#define ACPI_FUNCTION_VALUE_EXIT(s)
-#define ACPI_FUNCTION_ENTRY()
-#define ACPI_DUMP_STACK_ENTRY(a)
-#define ACPI_DUMP_OPERANDS(a, b, c)
-#define ACPI_DUMP_ENTRY(a, b)
-#define ACPI_DUMP_TABLES(a, b)
-#define ACPI_DUMP_PATHNAME(a, b, c, d)
-#define ACPI_DUMP_BUFFER(a, b)
-#define ACPI_DEBUG_PRINT(pl)
-#define ACPI_DEBUG_PRINT_RAW(pl)
+#define ACPI_NORMAL_EXEC(a)             a;
+
+#define ACPI_DEBUG_DEFINE(a)            do { } while(0)
+#define ACPI_DEBUG_ONLY_MEMBERS(a)      do { } while(0)
+#define ACPI_FUNCTION_TRACE(a)          do { } while(0)
+#define ACPI_FUNCTION_TRACE_PTR(a, b)   do { } while(0)
+#define ACPI_FUNCTION_TRACE_U32(a, b)   do { } while(0)
+#define ACPI_FUNCTION_TRACE_STR(a, b)   do { } while(0)
+#define ACPI_FUNCTION_EXIT              do { } while(0)
+#define ACPI_FUNCTION_STATUS_EXIT(s)    do { } while(0)
+#define ACPI_FUNCTION_VALUE_EXIT(s)     do { } while(0)
+#define ACPI_FUNCTION_ENTRY()           do { } while(0)
+#define ACPI_DUMP_STACK_ENTRY(a)        do { } while(0)
+#define ACPI_DUMP_OPERANDS(a, b, c)     do { } while(0)
+#define ACPI_DUMP_ENTRY(a, b)           do { } while(0)
+#define ACPI_DUMP_TABLES(a, b)          do { } while(0)
+#define ACPI_DUMP_PATHNAME(a, b, c, d)  do { } while(0)
+#define ACPI_DUMP_RESOURCE_LIST(a)      do { } while(0)
+#define ACPI_DUMP_BUFFER(a, b)          do { } while(0)
 
 #define return_VOID                     return
 #define return_ACPI_STATUS(s)           return(s)
@@ -495,12 +516,6 @@
 
 #endif                          /* ACPI_DEBUG_OUTPUT */
 
-#if (!ACPI_REDUCED_HARDWARE)
-#define ACPI_HW_OPTIONAL_FUNCTION(addr)     addr
-#else
-#define ACPI_HW_OPTIONAL_FUNCTION(addr)     NULL
-#endif
-
 /*
  * Some code only gets executed when the debugger is built in.
  * Note that this is entirely independent of whether the
@@ -512,6 +527,18 @@
 #define ACPI_DEBUGGER_EXEC(a)
 #endif
 
+#ifdef ACPI_DEBUG_OUTPUT
+/*
+ * 1) Set name to blanks
+ * 2) Copy the object name
+ */
+#define ACPI_ADD_OBJECT_NAME(a,b)       ACPI_MEMSET (a->common.name, ' ', sizeof (a->common.name));\
+                                                                                ACPI_STRNCPY (a->common.name, acpi_gbl_ns_type_names[b], sizeof (a->common.name))
+#else
+
+#define ACPI_ADD_OBJECT_NAME(a,b)
+#endif
+
 /*
  * Memory allocation tracking (DEBUG ONLY)
  */
@@ -522,13 +549,13 @@
 /* Memory allocation */
 
 #ifndef ACPI_ALLOCATE
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size)(a), ACPI_MEM_PARAMETERS)
 #endif
 #ifndef ACPI_ALLOCATE_ZEROED
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size)(a), ACPI_MEM_PARAMETERS)
 #endif
 #ifndef ACPI_FREE
-#define ACPI_FREE(a)                acpi_os_free(a)
+#define ACPI_FREE(a)                acpio_os_free(a)
 #endif
 #define ACPI_MEM_TRACKING(a)
 
@@ -536,25 +563,16 @@
 
 /* Memory allocation */
 
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
 #define ACPI_FREE(a)                acpi_ut_free_and_track(a, ACPI_MEM_PARAMETERS)
 #define ACPI_MEM_TRACKING(a)        a
 
 #endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
-/*
- * Macros used for ACPICA utilities only
- */
-
-/* Generate a UUID */
-
-#define ACPI_INIT_UUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
-        (a) & 0xFF, ((a) >> 8) & 0xFF, ((a) >> 16) & 0xFF, ((a) >> 24) & 0xFF, \
-        (b) & 0xFF, ((b) >> 8) & 0xFF, \
-        (c) & 0xFF, ((c) >> 8) & 0xFF, \
-        (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7)
-
-#define ACPI_IS_OCTAL_DIGIT(d)              (((char)(d) >= '0') && ((char)(d) <= '7'))
+/* Preemption point */
+#ifndef ACPI_PREEMPTION_POINT
+#define ACPI_PREEMPTION_POINT() /* no preemption */
+#endif
 
 #endif                          /* ACMACROS_H */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 9b19d4b8642..79a598c67fe 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -283,9 +283,8 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
                       union acpi_operand_object **return_object_ptr);
 
 acpi_status
-acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
-                          union acpi_operand_object *original_object,
-                          union acpi_operand_object **obj_desc_ptr);
+acpi_ns_repair_package_list(struct acpi_predefined_data *data,
+                            union acpi_operand_object **obj_desc_ptr);
 
 acpi_status
 acpi_ns_repair_null_element(struct acpi_predefined_data *data,
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 24eb9eac951..1055769f2f0 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Name: acobject.h - Definition of union acpi_operand_object  (Internal object only)
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,8 +113,8 @@ struct acpi_object_integer {
 };
 
 /*
- * Note: The String and Buffer object must be identical through the
- * pointer and length elements. There is code that depends on this.
+ * Note: The String and Buffer object must be identical through the Pointer
+ * and length elements.  There is code that depends on this.
  *
  * Fields common to both Strings and Buffers
  */
@@ -178,7 +179,7 @@ struct acpi_object_method {
         union acpi_operand_object *mutex;
         u8 *aml_start;
         union {
-                acpi_internal_method implementation;
+                ACPI_INTERNAL_METHOD implementation;
                 union acpi_operand_object *handler;
         } dispatch;
 
@@ -197,7 +198,7 @@ struct acpi_object_method {
 
 /******************************************************************************
  *
- * Objects that can be notified. All share a common notify_info area.
+ * Objects that can be notified.  All share a common notify_info area.
  *
  *****************************************************************************/
 
@@ -205,7 +206,8 @@ struct acpi_object_method {
  * Common fields for objects that support ASL notifications
  */
 #define ACPI_COMMON_NOTIFY_INFO \
-        union acpi_operand_object       *notify_list[2];    /* Handlers for system/device notifies */\
+        union acpi_operand_object       *system_notify;     /* Handler for system notifies */\
+        union acpi_operand_object       *device_notify;     /* Handler for driver notifies */\
         union acpi_operand_object       *handler;       /* Handler for Address space */
 
 struct acpi_object_notify_common {      /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
@@ -234,7 +236,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
 
 /******************************************************************************
  *
- * Fields. All share a common header/info field.
+ * Fields.  All share a common header/info field.
  *
  *****************************************************************************/
 
@@ -252,7 +254,6 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
         u32                             base_byte_offset;   /* Byte offset within containing object */\
         u32                             value;              /* Value to store into the Bank or Index register */\
         u8                              start_field_bit_offset;/* Bit offset within first field datum (0-63) */\
-        u8                              access_length;  /* For serial regions/fields */
 
 
 struct acpi_object_field_common {       /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
@@ -260,9 +261,7 @@ struct acpi_object_field_common {	/* COMMON FIELD (for BUFFER, REGION, BANK, and
 };
 
 struct acpi_object_region_field {
-        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length;
-        union acpi_operand_object *region_obj;  /* Containing op_region object */
-        u8 *resource_buffer;    /* resource_template for serial regions/fields */
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Containing op_region object */
 };
 
 struct acpi_object_bank_field {
@@ -294,10 +293,10 @@ struct acpi_object_buffer_field {
 
 struct acpi_object_notify_handler {
         ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *node;     /* Parent device */
-        u32 handler_type;       /* Type: Device/System/Both */
-        acpi_notify_handler handler;    /* Handler address */
+        u32 handler_type;
+        acpi_notify_handler handler;
         void *context;
-        union acpi_operand_object *next[2];     /* Device and System handler lists */
+        struct acpi_object_notify_handler *next;
 };
 
 struct acpi_object_addr_handler {
@@ -359,7 +358,6 @@ typedef enum {
  */
 struct acpi_object_extra {
         ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;       /* _REG method for this region (if any) */
-        struct acpi_namespace_node *scope_node;
         void *region_context;   /* Region-specific data */
         u8 *aml_start;
         u32 aml_length;
@@ -380,7 +378,7 @@ struct acpi_object_cache_list {
 
 /******************************************************************************
  *
- * union acpi_operand_object descriptor - a giant union of all of the above
+ * union acpi_operand_object Descriptor - a giant union of all of the above
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index d786a5128b7..bb2ccfad737 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 #define _UNK                        0x6B
 
 /*
- * Reserved ASCII characters. Do not use any of these for
+ * Reserved ASCII characters.  Do not use any of these for
  * internal opcodes, since they are used to differentiate
  * name strings from AML opcodes
  */
@@ -63,7 +63,7 @@
 #define _PFX                        0x6D
 
 /*
- * All AML opcodes and the parse-time arguments for each. Used by the AML
+ * All AML opcodes and the parse-time arguments for each.  Used by the AML
  * parser  Each list is compressed into a 32-bit number and stored in the
  * master opcode table (in psopcode.c).
  */
@@ -93,7 +93,6 @@
 #define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_SUPERNAME)
-#define ARGP_CONNECTFIELD_OP            ARGP_LIST1 (ARGP_NAMESTRING)
 #define ARGP_CONTINUE_OP                ARG_NONE
 #define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)
 #define ARGP_CREATE_BIT_FIELD_OP        ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
@@ -165,7 +164,6 @@
 #define ARGP_RETURN_OP                  ARGP_LIST1 (ARGP_TERMARG)
 #define ARGP_REVISION_OP                ARG_NONE
 #define ARGP_SCOPE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_TERMLIST)
-#define ARGP_SERIALFIELD_OP             ARGP_LIST1 (ARGP_NAMESTRING)
 #define ARGP_SHIFT_LEFT_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_SHIFT_RIGHT_OP             ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
 #define ARGP_SIGNAL_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
@@ -193,7 +191,7 @@
 #define ARGP_ZERO_OP                    ARG_NONE
 
 /*
- * All AML opcodes and the runtime arguments for each. Used by the AML
+ * All AML opcodes and the runtime arguments for each.  Used by the AML
  * interpreter  Each list is compressed into a 32-bit number and stored
  * in the master opcode table (in psopcode.c).
  *
@@ -225,7 +223,6 @@
 #define ARGI_CONCAT_OP                  ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA,   ARGI_TARGETREF)
 #define ARGI_CONCAT_RES_OP              ARGI_LIST3 (ARGI_BUFFER,     ARGI_BUFFER,        ARGI_TARGETREF)
 #define ARGI_COND_REF_OF_OP             ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)
-#define ARGI_CONNECTFIELD_OP            ARGI_INVALID_OPCODE
 #define ARGI_CONTINUE_OP                ARGI_INVALID_OPCODE
 #define ARGI_COPY_OP                    ARGI_LIST2 (ARGI_ANYTYPE,    ARGI_SIMPLE_TARGET)
 #define ARGI_CREATE_BIT_FIELD_OP        ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
@@ -297,7 +294,6 @@
 #define ARGI_RETURN_OP                  ARGI_INVALID_OPCODE
 #define ARGI_REVISION_OP                ARG_NONE
 #define ARGI_SCOPE_OP                   ARGI_INVALID_OPCODE
-#define ARGI_SERIALFIELD_OP             ARGI_INVALID_OPCODE
 #define ARGI_SHIFT_LEFT_OP              ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
 #define ARGI_SHIFT_RIGHT_OP             ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
 #define ARGI_SIGNAL_OP                  ARGI_LIST1 (ARGI_EVENT)
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index eefcf47a61a..5ea1e06afa2 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -150,7 +150,8 @@ u8 acpi_ps_has_completed_scope(struct acpi_parse_state *parser_state);
 
 void
 acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
-                  union acpi_parse_object **op, u32 *arg_list, u32 *arg_count);
+                  union acpi_parse_object **op,
+                  u32 * arg_list, u32 * arg_count);
 
 acpi_status
 acpi_ps_push_scope(struct acpi_parse_state *parser_state,
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 9dfa1c83bd4..c445cca490e 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,14 +94,6 @@
  * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
  *      (Used for _ART, _FPS)
  *
- * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements
- *      followed by an optional element
- *      object type
- *      count
- *      object type
- *      count = 0 (optional)
- *      (Used for _DLM)
- *
  *****************************************************************************/
 
 enum acpi_return_package_types {
@@ -113,8 +105,7 @@ enum acpi_return_package_types {
         ACPI_PTYPE2_PKG_COUNT = 6,
         ACPI_PTYPE2_FIXED = 7,
         ACPI_PTYPE2_MIN = 8,
-        ACPI_PTYPE2_REV_FIXED = 9,
-        ACPI_PTYPE2_FIX_VAR = 10
+        ACPI_PTYPE2_REV_FIXED = 9
 };
 
 #ifdef ACPI_CREATE_PREDEFINED_TABLE
@@ -140,7 +131,7 @@ enum acpi_return_package_types {
  *
  * The main entries in the table each contain the following items:
  *
- * name                 - The ACPI reserved name
+ * Name                 - The ACPI reserved name
  * param_count          - Number of arguments to the method
  * expected_btypes      - Allowed type(s) for the return value.
  *                        0 means that no return value is expected.
@@ -150,7 +141,8 @@ enum acpi_return_package_types {
  * is saved here (rather than in a separate table) in order to minimize the
  * overall size of the stored data.
  */
-static const union acpi_predefined_info predefined_names[] = {
+static const union acpi_predefined_info predefined_names[] =
+{
         {{"_AC0", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC1", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC2", 0, ACPI_RTYPE_INTEGER}},
@@ -162,7 +154,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_AC8", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC9", 0, ACPI_RTYPE_INTEGER}},
         {{"_ADR", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AEI", 0, ACPI_RTYPE_BUFFER}},
         {{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
 
@@ -238,13 +229,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,0}, 0,0}},
 
-        {{"_CLS", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
-
-        {{"_CPC", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Ints/Bufs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0,
-          0}},
-
         {{"_CRS", 0, ACPI_RTYPE_BUFFER}},
         {{"_CRT", 0, ACPI_RTYPE_INTEGER}},
         {{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */
@@ -253,21 +237,12 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
                           {{{ACPI_PTYPE2_PKG_COUNT,ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,0}},
 
-        {{"_CWS", 1, ACPI_RTYPE_INTEGER}},
         {{"_DCK", 1, ACPI_RTYPE_INTEGER}},
         {{"_DCS", 0, ACPI_RTYPE_INTEGER}},
         {{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
         {{"_DDN", 0, ACPI_RTYPE_STRING}},
-        {{"_DEP", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
         {{"_DGS", 0, ACPI_RTYPE_INTEGER}},
         {{"_DIS", 0, 0}},
-
-        {{"_DLM", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
-        {{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,
-           ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}},
-
         {{"_DMA", 0, ACPI_RTYPE_BUFFER}},
         {{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
@@ -287,7 +262,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_EJ3", 1, 0}},
         {{"_EJ4", 1, 0}},
         {{"_EJD", 0, ACPI_RTYPE_STRING}},
-        {{"_EVT", 1, 0}},
         {{"_FDE", 0, ACPI_RTYPE_BUFFER}},
         {{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */
                           {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},
@@ -307,17 +281,14 @@ static const union acpi_predefined_info predefined_names[] = {
         {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
 
         {{"_GAI", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GCP", 0, ACPI_RTYPE_INTEGER}},
         {{"_GHL", 0, ACPI_RTYPE_INTEGER}},
         {{"_GLK", 0, ACPI_RTYPE_INTEGER}},
         {{"_GPD", 0, ACPI_RTYPE_INTEGER}},
         {{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */
-        {{"_GRT", 0, ACPI_RTYPE_BUFFER}},
         {{"_GSB", 0, ACPI_RTYPE_INTEGER}},
         {{"_GTF", 0, ACPI_RTYPE_BUFFER}},
         {{"_GTM", 0, ACPI_RTYPE_BUFFER}},
         {{"_GTS", 1, 0}},
-        {{"_GWS", 1, ACPI_RTYPE_INTEGER}},
         {{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
         {{"_HOT", 0, ACPI_RTYPE_INTEGER}},
         {{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
@@ -332,7 +303,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */
                           {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
-        {{"_HRV", 0, ACPI_RTYPE_INTEGER}},
         {{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
         {{"_INI", 0, 0}},
         {{"_IRC", 0, 0}},
@@ -391,9 +361,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_PR3", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
 
-        {{"_PRE", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
         {{"_PRL", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
         {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
 
@@ -424,7 +391,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */
                           {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}},
 
-        {{"_PSE", 1, 0}},
         {{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
                           {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
 
@@ -491,7 +457,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_SLI", 0, ACPI_RTYPE_BUFFER}},
         {{"_SPD", 1, ACPI_RTYPE_INTEGER}},
         {{"_SRS", 1, 0}},
-        {{"_SRT", 1, ACPI_RTYPE_INTEGER}},
         {{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
         {{"_SST", 1, 0}},
         {{"_STA", 0, ACPI_RTYPE_INTEGER}},
@@ -499,7 +464,6 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_STP", 2, ACPI_RTYPE_INTEGER}},
         {{"_STR", 0, ACPI_RTYPE_BUFFER}},
         {{"_STV", 2, ACPI_RTYPE_INTEGER}},
-        {{"_SUB", 0, ACPI_RTYPE_STRING}},
         {{"_SUN", 0, ACPI_RTYPE_INTEGER}},
         {{"_SWS", 0, ACPI_RTYPE_INTEGER}},
         {{"_TC1", 0, ACPI_RTYPE_INTEGER}},
@@ -510,14 +474,14 @@ static const union acpi_predefined_info predefined_names[] = {
         {{"_TMP", 0, ACPI_RTYPE_INTEGER}},
         {{"_TPC", 0, ACPI_RTYPE_INTEGER}},
         {{"_TPT", 1, 0}},
-        {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
+        {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2_ref/6_int */
                           {{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
 
-        {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int with count */
+        {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int with count */
                           {{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
         {{"_TSP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int */
+        {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int */
                           {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
         {{"_TST", 0, ACPI_RTYPE_INTEGER}},
@@ -537,8 +501,7 @@ static const union acpi_predefined_info predefined_names[] = {
 
         /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
 
-        {{"_WAK", 1,
-          ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
+        {{"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
                           {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */
 
         /* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
@@ -551,12 +514,11 @@ static const union acpi_predefined_info predefined_names[] = {
 };
 
 #if 0
-
         /* This is an internally implemented control method, no need to check */
-{ {
-"_OSI", 1, ACPI_RTYPE_INTEGER}},
+        {{"_OSI", 1, ACPI_RTYPE_INTEGER}},
 
         /* TBD: */
+
         _PRT - currently ignore reversed entries. attempt to fix here?
         think about possibly fixing package elements like _BIF, etc.
 #endif
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 0347d099349..f08b55b7f3a 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,40 +73,28 @@ typedef const struct acpi_rsconvert_info {
 
 /* Resource conversion opcodes */
 
-typedef enum {
-        ACPI_RSC_INITGET = 0,
-        ACPI_RSC_INITSET,
-        ACPI_RSC_FLAGINIT,
-        ACPI_RSC_1BITFLAG,
-        ACPI_RSC_2BITFLAG,
-        ACPI_RSC_3BITFLAG,
-        ACPI_RSC_ADDRESS,
-        ACPI_RSC_BITMASK,
-        ACPI_RSC_BITMASK16,
-        ACPI_RSC_COUNT,
-        ACPI_RSC_COUNT16,
-        ACPI_RSC_COUNT_GPIO_PIN,
-        ACPI_RSC_COUNT_GPIO_RES,
-        ACPI_RSC_COUNT_GPIO_VEN,
-        ACPI_RSC_COUNT_SERIAL_RES,
-        ACPI_RSC_COUNT_SERIAL_VEN,
-        ACPI_RSC_DATA8,
-        ACPI_RSC_EXIT_EQ,
-        ACPI_RSC_EXIT_LE,
-        ACPI_RSC_EXIT_NE,
-        ACPI_RSC_LENGTH,
-        ACPI_RSC_MOVE_GPIO_PIN,
-        ACPI_RSC_MOVE_GPIO_RES,
-        ACPI_RSC_MOVE_SERIAL_RES,
-        ACPI_RSC_MOVE_SERIAL_VEN,
-        ACPI_RSC_MOVE8,
-        ACPI_RSC_MOVE16,
-        ACPI_RSC_MOVE32,
-        ACPI_RSC_MOVE64,
-        ACPI_RSC_SET8,
-        ACPI_RSC_SOURCE,
-        ACPI_RSC_SOURCEX
-} ACPI_RSCONVERT_OPCODES;
+#define ACPI_RSC_INITGET                0
+#define ACPI_RSC_INITSET                1
+#define ACPI_RSC_FLAGINIT               2
+#define ACPI_RSC_1BITFLAG               3
+#define ACPI_RSC_2BITFLAG               4
+#define ACPI_RSC_COUNT                  5
+#define ACPI_RSC_COUNT16                6
+#define ACPI_RSC_LENGTH                 7
+#define ACPI_RSC_MOVE8                  8
+#define ACPI_RSC_MOVE16                 9
+#define ACPI_RSC_MOVE32                 10
+#define ACPI_RSC_MOVE64                 11
+#define ACPI_RSC_SET8                   12
+#define ACPI_RSC_DATA8                  13
+#define ACPI_RSC_ADDRESS                14
+#define ACPI_RSC_SOURCE                 15
+#define ACPI_RSC_SOURCEX                16
+#define ACPI_RSC_BITMASK                17
+#define ACPI_RSC_BITMASK16              18
+#define ACPI_RSC_EXIT_NE                19
+#define ACPI_RSC_EXIT_LE                20
+#define ACPI_RSC_EXIT_EQ                21
 
 /* Resource Conversion sub-opcodes */
 
@@ -118,9 +106,6 @@ typedef enum {
 #define ACPI_RS_OFFSET(f)               (u8) ACPI_OFFSET (struct acpi_resource,f)
 #define AML_OFFSET(f)                   (u8) ACPI_OFFSET (union aml_resource,f)
 
-/*
- * Individual entry for the resource dump tables
- */
 typedef const struct acpi_rsdump_info {
         u8 opcode;
         u8 offset;
@@ -131,25 +116,20 @@ typedef const struct acpi_rsdump_info {
 
 /* Values for the Opcode field above */
 
-typedef enum {
-        ACPI_RSD_TITLE = 0,
-        ACPI_RSD_1BITFLAG,
-        ACPI_RSD_2BITFLAG,
-        ACPI_RSD_3BITFLAG,
-        ACPI_RSD_ADDRESS,
-        ACPI_RSD_DWORDLIST,
-        ACPI_RSD_LITERAL,
-        ACPI_RSD_LONGLIST,
-        ACPI_RSD_SHORTLIST,
-        ACPI_RSD_SHORTLISTX,
-        ACPI_RSD_SOURCE,
-        ACPI_RSD_STRING,
-        ACPI_RSD_UINT8,
-        ACPI_RSD_UINT16,
-        ACPI_RSD_UINT32,
-        ACPI_RSD_UINT64,
-        ACPI_RSD_WORDLIST
-} ACPI_RSDUMP_OPCODES;
+#define ACPI_RSD_TITLE                  0
+#define ACPI_RSD_LITERAL                1
+#define ACPI_RSD_STRING                 2
+#define ACPI_RSD_UINT8                  3
+#define ACPI_RSD_UINT16                 4
+#define ACPI_RSD_UINT32                 5
+#define ACPI_RSD_UINT64                 6
+#define ACPI_RSD_1BITFLAG               7
+#define ACPI_RSD_2BITFLAG               8
+#define ACPI_RSD_SHORTLIST              9
+#define ACPI_RSD_LONGLIST               10
+#define ACPI_RSD_DWORDLIST              11
+#define ACPI_RSD_ADDRESS                12
+#define ACPI_RSD_SOURCE                 13
 
 /* restore default alignment */
 
@@ -158,18 +138,13 @@ typedef enum {
 /* Resource tables indexed by internal resource type */
 
 extern const u8 acpi_gbl_aml_resource_sizes[];
-extern const u8 acpi_gbl_aml_resource_serial_bus_sizes[];
 extern struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[];
 
 /* Resource tables indexed by raw AML resource descriptor type */
 
 extern const u8 acpi_gbl_resource_struct_sizes[];
-extern const u8 acpi_gbl_resource_struct_serial_bus_sizes[];
 extern struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[];
 
-extern struct acpi_rsconvert_info
-    *acpi_gbl_convert_resource_serial_bus_dispatch[];
-
 struct acpi_vendor_walk_info {
         struct acpi_vendor_uuid *uuid;
         struct acpi_buffer *buffer;
@@ -215,10 +190,6 @@ acpi_status
 acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
                             struct acpi_buffer *ret_buffer);
 
-acpi_status
-acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
-                            struct acpi_buffer *ret_buffer);
-
 /*
  * rscalc
  */
@@ -322,11 +293,6 @@ extern struct acpi_rsconvert_info acpi_rs_convert_address16[];
 extern struct acpi_rsconvert_info acpi_rs_convert_ext_irq[];
 extern struct acpi_rsconvert_info acpi_rs_convert_address64[];
 extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[];
-extern struct acpi_rsconvert_info acpi_rs_convert_gpio[];
-extern struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[];
-extern struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[];
-extern struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[];
-extern struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[];
 
 /* These resources require separate get/set tables */
 
@@ -344,7 +310,6 @@ extern struct acpi_rsconvert_info acpi_rs_set_vendor[];
  * rsinfo
  */
 extern struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[];
-extern struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[];
 
 /*
  * rsdump
@@ -366,12 +331,6 @@ extern struct acpi_rsdump_info acpi_rs_dump_address64[];
 extern struct acpi_rsdump_info acpi_rs_dump_ext_address64[];
 extern struct acpi_rsdump_info acpi_rs_dump_ext_irq[];
 extern struct acpi_rsdump_info acpi_rs_dump_generic_reg[];
-extern struct acpi_rsdump_info acpi_rs_dump_gpio[];
-extern struct acpi_rsdump_info acpi_rs_dump_fixed_dma[];
-extern struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[];
-extern struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[];
-extern struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[];
-extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[];
 #endif
 
 #endif                          /* __ACRESRC_H__ */
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 937e66c65d1..1623b245dde 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /*
- * Walk state - current state of a parse tree walk. Used for both a leisurely
+ * Walk state - current state of a parse tree walk.  Used for both a leisurely
  * stroll through the tree (for whatever reason), and for control method
  * execution.
  */
@@ -68,7 +68,7 @@
 #define ACPI_WALK_METHOD            0x01
 #define ACPI_WALK_METHOD_RESTART    0x02
 
-/* Flags for iASL compiler only */
+/* Flags for i_aSL compiler only */
 
 #define ACPI_WALK_CONST_REQUIRED    0x10
 #define ACPI_WALK_CONST_OPTIONAL    0x20
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 6712965ba8a..967f08124eb 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,11 +67,6 @@ acpi_status acpi_tb_resize_root_table_list(void);
 
 acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc);
 
-struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
-                                                 *table_header,
-                                                 struct acpi_table_desc
-                                                 *table_desc);
-
 acpi_status
 acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index);
 
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index b0f5f92b674..99c140d8e34 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,6 @@
 #define _ACUTILS_H
 
 extern const u8 acpi_gbl_resource_aml_sizes[];
-extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[];
 
 /* Strings used by the disassembler and debugger resource dump routines */
 
@@ -69,22 +68,6 @@ extern const char *acpi_gbl_siz_decode[];
 extern const char *acpi_gbl_trs_decode[];
 extern const char *acpi_gbl_ttp_decode[];
 extern const char *acpi_gbl_typ_decode[];
-extern const char *acpi_gbl_ppc_decode[];
-extern const char *acpi_gbl_ior_decode[];
-extern const char *acpi_gbl_dts_decode[];
-extern const char *acpi_gbl_ct_decode[];
-extern const char *acpi_gbl_sbt_decode[];
-extern const char *acpi_gbl_am_decode[];
-extern const char *acpi_gbl_sm_decode[];
-extern const char *acpi_gbl_wm_decode[];
-extern const char *acpi_gbl_cph_decode[];
-extern const char *acpi_gbl_cpo_decode[];
-extern const char *acpi_gbl_dp_decode[];
-extern const char *acpi_gbl_ed_decode[];
-extern const char *acpi_gbl_bpb_decode[];
-extern const char *acpi_gbl_sb_decode[];
-extern const char *acpi_gbl_fc_decode[];
-extern const char *acpi_gbl_pt_decode[];
 #endif
 
 /* Types for Resource descriptor entries */
@@ -95,14 +78,14 @@ extern const char *acpi_gbl_pt_decode[];
 #define ACPI_SMALL_VARIABLE_LENGTH      3
 
 typedef
-acpi_status(*acpi_walk_aml_callback) (u8 *aml,
+acpi_status(*acpi_walk_aml_callback) (u8 * aml,
                                       u32 length,
                                       u32 offset,
                                       u8 resource_index, void **context);
 
 typedef
 acpi_status(*acpi_pkg_callback) (u8 object_type,
-                                 union acpi_operand_object *source_object,
+                                 union acpi_operand_object * source_object,
                                  union acpi_generic_state * state,
                                  void *context);
 
@@ -218,9 +201,7 @@ extern const u8 _acpi_ctype[];
 #define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU))
 #define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
 
-#endif                          /* !ACPI_USE_SYSTEM_CLIBRARY */
-
-#define ACPI_IS_ASCII(c)  ((c) < 0x80)
+#endif                          /* ACPI_USE_SYSTEM_CLIBRARY */
 
 /*
  * utcopy - Object construction and conversion interfaces
@@ -228,11 +209,11 @@ extern const u8 _acpi_ctype[];
 acpi_status
 acpi_ut_build_simple_object(union acpi_operand_object *obj,
                             union acpi_object *user_obj,
-                            u8 *data_space, u32 *buffer_space_used);
+                            u8 * data_space, u32 * buffer_space_used);
 
 acpi_status
 acpi_ut_build_package_object(union acpi_operand_object *obj,
-                             u8 *buffer, u32 *space_used);
+                             u8 * buffer, u32 * space_used);
 
 acpi_status
 acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *obj,
@@ -305,10 +286,9 @@ acpi_ut_ptr_exit(u32 line_number,
                  const char *function_name,
                  const char *module_name, u32 component_id, u8 *ptr);
 
-void
-acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id);
+void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id);
 
-void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 offset);
+void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display);
 
 void acpi_ut_report_error(char *module_name, u32 line_number);
 
@@ -356,19 +336,15 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
  */
 acpi_status
 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id ** return_id);
+                    struct acpica_device_id **return_id);
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id ** return_id);
-
-acpi_status
-acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id **return_id);
+                    struct acpica_device_id **return_id);
 
 acpi_status
 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id_list ** return_cid_list);
+                    struct acpica_device_id_list **return_cid_list);
 
 /*
  * utlock - reader/writer locks
@@ -483,8 +459,6 @@ acpi_ut_short_divide(u64 in_dividend,
 /*
  * utmisc
  */
-void ut_convert_backslashes(char *pathname);
-
 const char *acpi_ut_validate_exception(acpi_status status);
 
 u8 acpi_ut_is_pci_root_bridge(char *id);
@@ -502,19 +476,15 @@ acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
 
 void acpi_ut_strupr(char *src_string);
 
-void acpi_ut_strlwr(char *src_string);
-
-int acpi_ut_stricmp(char *string1, char *string2);
-
 void acpi_ut_print_string(char *string, u8 max_length);
 
 u8 acpi_ut_valid_acpi_name(u32 name);
 
-void acpi_ut_repair_name(char *name);
+acpi_name acpi_ut_repair_name(char *name);
 
 u8 acpi_ut_valid_acpi_char(char character, u32 position);
 
-acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer);
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer);
 
 /* Values for Base above (16=Hex, 10=Decimal) */
 
@@ -535,12 +505,12 @@ acpi_ut_display_init_pathname(u8 type,
  * utresrc
  */
 acpi_status
-acpi_ut_walk_aml_resources(u8 *aml,
+acpi_ut_walk_aml_resources(u8 * aml,
                            acpi_size aml_length,
                            acpi_walk_aml_callback user_function,
                            void **context);
 
-acpi_status acpi_ut_validate_resource(void *aml, u8 *return_index);
+acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);
 
 u32 acpi_ut_get_descriptor_length(void *aml);
 
@@ -551,7 +521,8 @@ u8 acpi_ut_get_resource_header_length(void *aml);
 u8 acpi_ut_get_resource_type(void *aml);
 
 acpi_status
-acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag);
+acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc,
+                             u8 ** end_tag);
 
 /*
  * utmutex - mutex support
@@ -608,24 +579,6 @@ acpi_ut_create_list(char *list_name,
 #endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
 /*
- * utaddress - address range check
- */
-acpi_status
-acpi_ut_add_address_range(acpi_adr_space_type space_id,
-                          acpi_physical_address address,
-                          u32 length, struct acpi_namespace_node *region_node);
-
-void
-acpi_ut_remove_address_range(acpi_adr_space_type space_id,
-                             struct acpi_namespace_node *region_node);
-
-u32
-acpi_ut_check_address_range(acpi_adr_space_type space_id,
-                            acpi_physical_address address, u32 length, u8 warn);
-
-void acpi_ut_delete_address_lists(void);
-
-/*
  * utxferror - various error/warning output functions
  */
 void ACPI_INTERNAL_VAR_XFACE
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index c26f8ff6c3b..1077f17859e 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -182,21 +182,13 @@
 
 /*
  * Combination opcodes (actually two one-byte opcodes)
- * Used by the disassembler and iASL compiler
+ * Used by the disassembler and i_aSL compiler
  */
 #define AML_LGREATEREQUAL_OP        (u16) 0x9295
 #define AML_LLESSEQUAL_OP           (u16) 0x9294
 #define AML_LNOTEQUAL_OP            (u16) 0x9293
 
 /*
- * Opcodes for "Field" operators
- */
-#define AML_FIELD_OFFSET_OP         (u8) 0x00
-#define AML_FIELD_ACCESS_OP         (u8) 0x01
-#define AML_FIELD_CONNECTION_OP     (u8) 0x02   /* ACPI 5.0 */
-#define AML_FIELD_EXT_ACCESS_OP     (u8) 0x03   /* ACPI 5.0 */
-
-/*
  * Internal opcodes
  * Use only "Unknown" AML opcodes, don't attempt to use
  * any valid ACPI ASCII values (A-Z, 0-9, '-')
@@ -210,8 +202,6 @@
 #define AML_INT_METHODCALL_OP       (u16) 0x0035
 #define AML_INT_RETURN_VALUE_OP     (u16) 0x0036
 #define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037
-#define AML_INT_CONNECTION_OP       (u16) 0x0038
-#define AML_INT_EXTACCESSFIELD_OP   (u16) 0x0039
 
 #define ARG_NONE                    0x0
 
@@ -280,7 +270,7 @@
 
 /* Multiple/complex types */
 
-#define ARGI_DATAOBJECT             0x12        /* Buffer, String, package or reference to a node - Used only by size_of operator */
+#define ARGI_DATAOBJECT             0x12        /* Buffer, String, package or reference to a Node - Used only by size_of operator */
 #define ARGI_COMPLEXOBJ             0x13        /* Buffer, String, or package (Used by INDEX op only) */
 #define ARGI_REF_OR_STRING          0x14        /* Reference or String (Used by DEREFOF op only) */
 #define ARGI_REGION_OR_BUFFER       0x15        /* Used by LOAD op only */
@@ -466,16 +456,13 @@ typedef enum {
  * access_as keyword
  */
 typedef enum {
-        AML_FIELD_ATTRIB_QUICK = 0x02,
-        AML_FIELD_ATTRIB_SEND_RCV = 0x04,
-        AML_FIELD_ATTRIB_BYTE = 0x06,
-        AML_FIELD_ATTRIB_WORD = 0x08,
-        AML_FIELD_ATTRIB_BLOCK = 0x0A,
-        AML_FIELD_ATTRIB_MULTIBYTE = 0x0B,
-        AML_FIELD_ATTRIB_WORD_CALL = 0x0C,
-        AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D,
-        AML_FIELD_ATTRIB_RAW_BYTES = 0x0E,
-        AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F
+        AML_FIELD_ATTRIB_SMB_QUICK = 0x02,
+        AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04,
+        AML_FIELD_ATTRIB_SMB_BYTE = 0x06,
+        AML_FIELD_ATTRIB_SMB_WORD = 0x08,
+        AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A,
+        AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C,
+        AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
 } AML_ACCESS_ATTRIBUTE;
 
 /* Bit fields in the AML method_flags byte */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 968449685e0..59122cde247 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: amlresrc.h - AML resource descriptors
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,48 +58,29 @@
 #define ACPI_RESTAG_TYPESPECIFICATTRIBUTES      "_ATT"
 #define ACPI_RESTAG_BASEADDRESS                 "_BAS"
 #define ACPI_RESTAG_BUSMASTER                   "_BM_"  /* Master(1), Slave(0) */
-#define ACPI_RESTAG_DEBOUNCETIME                "_DBT"
 #define ACPI_RESTAG_DECODE                      "_DEC"
-#define ACPI_RESTAG_DEVICEPOLARITY              "_DPL"
 #define ACPI_RESTAG_DMA                         "_DMA"
 #define ACPI_RESTAG_DMATYPE                     "_TYP"  /* Compatible(0), A(1), B(2), F(3) */
-#define ACPI_RESTAG_DRIVESTRENGTH               "_DRS"
-#define ACPI_RESTAG_ENDIANNESS                  "_END"
-#define ACPI_RESTAG_FLOWCONTROL                 "_FLC"
 #define ACPI_RESTAG_GRANULARITY                 "_GRA"
 #define ACPI_RESTAG_INTERRUPT                   "_INT"
 #define ACPI_RESTAG_INTERRUPTLEVEL              "_LL_"  /* active_lo(1), active_hi(0) */
 #define ACPI_RESTAG_INTERRUPTSHARE              "_SHR"  /* Shareable(1), no_share(0) */
 #define ACPI_RESTAG_INTERRUPTTYPE               "_HE_"  /* Edge(1), Level(0) */
-#define ACPI_RESTAG_IORESTRICTION               "_IOR"
 #define ACPI_RESTAG_LENGTH                      "_LEN"
-#define ACPI_RESTAG_LINE                        "_LIN"
 #define ACPI_RESTAG_MEMATTRIBUTES               "_MTP"  /* Memory(0), Reserved(1), ACPI(2), NVS(3) */
 #define ACPI_RESTAG_MEMTYPE                     "_MEM"  /* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */
 #define ACPI_RESTAG_MAXADDR                     "_MAX"
 #define ACPI_RESTAG_MINADDR                     "_MIN"
 #define ACPI_RESTAG_MAXTYPE                     "_MAF"
 #define ACPI_RESTAG_MINTYPE                     "_MIF"
-#define ACPI_RESTAG_MODE                        "_MOD"
-#define ACPI_RESTAG_PARITY                      "_PAR"
-#define ACPI_RESTAG_PHASE                       "_PHA"
-#define ACPI_RESTAG_PIN                         "_PIN"
-#define ACPI_RESTAG_PINCONFIG                   "_PPI"
-#define ACPI_RESTAG_POLARITY                    "_POL"
 #define ACPI_RESTAG_REGISTERBITOFFSET           "_RBO"
 #define ACPI_RESTAG_REGISTERBITWIDTH            "_RBW"
 #define ACPI_RESTAG_RANGETYPE                   "_RNG"
 #define ACPI_RESTAG_READWRITETYPE               "_RW_"  /* read_only(0), Writeable (1) */
-#define ACPI_RESTAG_LENGTH_RX                   "_RXL"
-#define ACPI_RESTAG_LENGTH_TX                   "_TXL"
-#define ACPI_RESTAG_SLAVEMODE                   "_SLV"
-#define ACPI_RESTAG_SPEED                       "_SPE"
-#define ACPI_RESTAG_STOPBITS                    "_STB"
 #define ACPI_RESTAG_TRANSLATION                 "_TRA"
 #define ACPI_RESTAG_TRANSTYPE                   "_TRS"  /* Sparse(1), Dense(0) */
 #define ACPI_RESTAG_TYPE                        "_TTP"  /* Translation(1), Static (0) */
-#define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8And16(1), 16(2) */
-#define ACPI_RESTAG_VENDORDATA                  "_VEN"
+#define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8_and16(1), 16(2) */
 
 /* Default sizes for "small" resource descriptors */
 
@@ -108,7 +90,6 @@
 #define ASL_RDESC_END_DEPEND_SIZE               0x00
 #define ASL_RDESC_IO_SIZE                       0x07
 #define ASL_RDESC_FIXED_IO_SIZE                 0x03
-#define ASL_RDESC_FIXED_DMA_SIZE                0x05
 #define ASL_RDESC_END_TAG_SIZE                  0x01
 
 struct asl_resource_node {
@@ -183,12 +164,6 @@ struct aml_resource_end_tag {
         AML_RESOURCE_SMALL_HEADER_COMMON u8 checksum;
 };
 
-struct aml_resource_fixed_dma {
-        AML_RESOURCE_SMALL_HEADER_COMMON u16 request_lines;
-        u16 channels;
-        u8 width;
-};
-
 /*
  * LARGE descriptors
  */
@@ -234,7 +209,7 @@ AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_ADDRESS_COMMON};
 
 struct aml_resource_extended_address64 {
         AML_RESOURCE_LARGE_HEADER_COMMON
-            AML_RESOURCE_ADDRESS_COMMON u8 revision_ID;
+            AML_RESOURCE_ADDRESS_COMMON u8 revision_iD;
         u8 reserved;
         u64 granularity;
         u64 minimum;
@@ -288,110 +263,6 @@ struct aml_resource_generic_register {
         u64 address;
 };
 
-/* Common descriptor for gpio_int and gpio_io (ACPI 5.0) */
-
-struct aml_resource_gpio {
-        AML_RESOURCE_LARGE_HEADER_COMMON u8 revision_id;
-        u8 connection_type;
-        u16 flags;
-        u16 int_flags;
-        u8 pin_config;
-        u16 drive_strength;
-        u16 debounce_timeout;
-        u16 pin_table_offset;
-        u8 res_source_index;
-        u16 res_source_offset;
-        u16 vendor_offset;
-        u16 vendor_length;
-        /*
-         * Optional fields follow immediately:
-         * 1) PIN list (Words)
-         * 2) Resource Source String
-         * 3) Vendor Data bytes
-         */
-};
-
-#define AML_RESOURCE_GPIO_REVISION              1       /* ACPI 5.0 */
-
-/* Values for connection_type above */
-
-#define AML_RESOURCE_GPIO_TYPE_INT              0
-#define AML_RESOURCE_GPIO_TYPE_IO               1
-#define AML_RESOURCE_MAX_GPIOTYPE               1
-
-/* Common preamble for all serial descriptors (ACPI 5.0) */
-
-#define AML_RESOURCE_SERIAL_COMMON \
-        u8                              revision_id; \
-        u8                              res_source_index; \
-        u8                              type; \
-        u8                              flags; \
-        u16                             type_specific_flags; \
-        u8                              type_revision_id; \
-        u16                             type_data_length; \
-
-/* Values for the type field above */
-
-#define AML_RESOURCE_I2C_SERIALBUSTYPE          1
-#define AML_RESOURCE_SPI_SERIALBUSTYPE          2
-#define AML_RESOURCE_UART_SERIALBUSTYPE         3
-#define AML_RESOURCE_MAX_SERIALBUSTYPE          3
-#define AML_RESOURCE_VENDOR_SERIALBUSTYPE       192     /* Vendor defined is 0xC0-0xFF (NOT SUPPORTED) */
-
-struct aml_resource_common_serialbus {
-AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON};
-
-struct aml_resource_i2c_serialbus {
-        AML_RESOURCE_LARGE_HEADER_COMMON
-            AML_RESOURCE_SERIAL_COMMON u32 connection_speed;
-        u16 slave_address;
-        /*
-         * Optional fields follow immediately:
-         * 1) Vendor Data bytes
-         * 2) Resource Source String
-         */
-};
-
-#define AML_RESOURCE_I2C_REVISION               1       /* ACPI 5.0 */
-#define AML_RESOURCE_I2C_TYPE_REVISION          1       /* ACPI 5.0 */
-#define AML_RESOURCE_I2C_MIN_DATA_LEN           6
-
-struct aml_resource_spi_serialbus {
-        AML_RESOURCE_LARGE_HEADER_COMMON
-            AML_RESOURCE_SERIAL_COMMON u32 connection_speed;
-        u8 data_bit_length;
-        u8 clock_phase;
-        u8 clock_polarity;
-        u16 device_selection;
-        /*
-         * Optional fields follow immediately:
-         * 1) Vendor Data bytes
-         * 2) Resource Source String
-         */
-};
-
-#define AML_RESOURCE_SPI_REVISION               1       /* ACPI 5.0 */
-#define AML_RESOURCE_SPI_TYPE_REVISION          1       /* ACPI 5.0 */
-#define AML_RESOURCE_SPI_MIN_DATA_LEN           9
-
-struct aml_resource_uart_serialbus {
-        AML_RESOURCE_LARGE_HEADER_COMMON
-            AML_RESOURCE_SERIAL_COMMON u32 default_baud_rate;
-        u16 rx_fifo_size;
-        u16 tx_fifo_size;
-        u8 parity;
-        u8 lines_enabled;
-        /*
-         * Optional fields follow immediately:
-         * 1) Vendor Data bytes
-         * 2) Resource Source String
-         */
-};
-
-#define AML_RESOURCE_UART_REVISION              1       /* ACPI 5.0 */
-#define AML_RESOURCE_UART_TYPE_REVISION         1       /* ACPI 5.0 */
-#define AML_RESOURCE_UART_MIN_DATA_LEN          10
-
 /* restore default alignment */
 
 #pragma pack()
@@ -413,7 +284,6 @@ union aml_resource {
         struct aml_resource_end_dependent end_dpf;
         struct aml_resource_io io;
         struct aml_resource_fixed_io fixed_io;
-        struct aml_resource_fixed_dma fixed_dma;
         struct aml_resource_vendor_small vendor_small;
         struct aml_resource_end_tag end_tag;
 
@@ -429,11 +299,6 @@ union aml_resource {
         struct aml_resource_address64 address64;
         struct aml_resource_extended_address64 ext_address64;
         struct aml_resource_extended_irq extended_irq;
-        struct aml_resource_gpio gpio;
-        struct aml_resource_i2c_serialbus i2c_serial_bus;
-        struct aml_resource_spi_serialbus spi_serial_bus;
-        struct aml_resource_uart_serialbus uart_serial_bus;
-        struct aml_resource_common_serialbus common_serial_bus;
 
         /* Utility overlays */
 
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index c8b5e2565b9..8c7b99728aa 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_ds_execute_arguments
  *
- * PARAMETERS:  node                - Object NS node
+ * PARAMETERS:  Node                - Object NS node
  *              scope_node          - Parent NS node
  *              aml_length          - Length of executable AML
  *              aml_start           - Pointer to the AML
@@ -250,13 +250,6 @@ acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)
         status = acpi_ds_execute_arguments(node, node->parent,
                                            extra_desc->extra.aml_length,
                                            extra_desc->extra.aml_start);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_ut_add_address_range(obj_desc->region.space_id,
-                                           obj_desc->region.address,
-                                           obj_desc->region.length, node);
         return_ACPI_STATUS(status);
 }
 
@@ -391,15 +384,8 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
 
         /* Execute the argument AML */
 
-        status = acpi_ds_execute_arguments(node, extra_desc->extra.scope_node,
+        status = acpi_ds_execute_arguments(node, node->parent,
                                            extra_desc->extra.aml_length,
                                            extra_desc->extra.aml_start);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_ut_add_address_range(obj_desc->region.space_id,
-                                           obj_desc->region.address,
-                                           obj_desc->region.length, node);
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 57895db3231..26c49fff58d 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("dscontrol")
  * FUNCTION:    acpi_ds_exec_begin_control_op
  *
  * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              op              - The control Op
+ *              Op              - The control Op
  *
  * RETURN:      Status
  *
@@ -153,7 +153,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_exec_end_control_op
  *
  * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              op              - The control Op
+ *              Op              - The control Op
  *
  * RETURN:      Status
  *
@@ -280,7 +280,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
                         /*
                          * Get the return value and save as the last result
-                         * value. This is the only place where walk_state->return_desc
+                         * value.  This is the only place where walk_state->return_desc
                          * is set to anything other than zero!
                          */
                         walk_state->return_desc = walk_state->operands[0];
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index b5b904ee815..34be60c0e44 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,84 +53,16 @@
 ACPI_MODULE_NAME("dsfield")
 
 /* Local prototypes */
-#ifdef ACPI_ASL_COMPILER
-#include "acdisasm.h"
-static acpi_status
-acpi_ds_create_external_region(acpi_status lookup_status,
-                               union acpi_parse_object *op,
-                               char *path,
-                               struct acpi_walk_state *walk_state,
-                               struct acpi_namespace_node **node);
-#endif
-
 static acpi_status
 acpi_ds_get_field_names(struct acpi_create_field_info *info,
                         struct acpi_walk_state *walk_state,
                         union acpi_parse_object *arg);
 
-#ifdef ACPI_ASL_COMPILER
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_create_external_region (iASL Disassembler only)
- *
- * PARAMETERS:  lookup_status   - Status from ns_lookup operation
- *              op              - Op containing the Field definition and args
- *              path            - Pathname of the region
- *  `           walk_state      - Current method state
- *              node            - Where the new region node is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Add region to the external list if NOT_FOUND. Create a new
- *              region node/object.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ds_create_external_region(acpi_status lookup_status,
-                               union acpi_parse_object *op,
-                               char *path,
-                               struct acpi_walk_state *walk_state,
-                               struct acpi_namespace_node **node)
-{
-        acpi_status status;
-        union acpi_operand_object *obj_desc;
-
-        if (lookup_status != AE_NOT_FOUND) {
-                return (lookup_status);
-        }
-
-        /*
-         * Table disassembly:
-         * operation_region not found. Generate an External for it, and
-         * insert the name into the namespace.
-         */
-        acpi_dm_add_to_external_list(op, path, ACPI_TYPE_REGION, 0);
-        status = acpi_ns_lookup(walk_state->scope_info, path, ACPI_TYPE_REGION,
-                                ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT,
-                                walk_state, node);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Must create and install a region object for the new node */
-
-        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_REGION);
-        if (!obj_desc) {
-                return (AE_NO_MEMORY);
-        }
-
-        obj_desc->region.node = *node;
-        status = acpi_ns_attach_object(*node, obj_desc, ACPI_TYPE_REGION);
-        return (status);
-}
-#endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_create_buffer_field
  *
- * PARAMETERS:  op                  - Current parse op (create_XXField)
+ * PARAMETERS:  Op                  - Current parse op (create_xXField)
  *              walk_state          - Current state
  *
  * RETURN:      Status
@@ -167,7 +99,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
 
                 arg = acpi_ps_get_arg(op, 3);
         } else {
-                /* For all other create_XXXField operators, name is the 3rd argument */
+                /* For all other create_xXXField operators, name is the 3rd argument */
 
                 arg = acpi_ps_get_arg(op, 2);
         }
@@ -271,13 +203,13 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
  *
  * FUNCTION:    acpi_ds_get_field_names
  *
- * PARAMETERS:  info            - create_field info structure
+ * PARAMETERS:  Info            - create_field info structure
  *  `           walk_state      - Current method state
- *              arg             - First parser arg for the field name list
+ *              Arg             - First parser arg for the field name list
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Process all named fields in a field declaration. Names are
+ * DESCRIPTION: Process all named fields in a field declaration.  Names are
  *              entered into the namespace.
  *
  ******************************************************************************/
@@ -289,7 +221,6 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 {
         acpi_status status;
         u64 position;
-        union acpi_parse_object *child;
 
         ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
 
@@ -301,11 +232,10 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 
         while (arg) {
                 /*
-                 * Four types of field elements are handled:
-                 * 1) name - Enters a new named field into the namespace
-                 * 2) offset - specifies a bit offset
-                 * 3) access_as - changes the access mode/attributes
-                 * 4) connection - Associate a resource template with the field
+                 * Three types of field elements are handled:
+                 * 1) Offset - specifies a bit offset
+                 * 2) access_as - changes the access mode
+                 * 3) Name - Enters a new named field into the namespace
                  */
                 switch (arg->common.aml_opcode) {
                 case AML_INT_RESERVEDFIELD_OP:
@@ -323,70 +253,21 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                         break;
 
                 case AML_INT_ACCESSFIELD_OP:
-                case AML_INT_EXTACCESSFIELD_OP:
+
                         /*
-                         * Get new access_type, access_attribute, and access_length fields
-                         * -- to be used for all field units that follow, until the
-                         * end-of-field or another access_as keyword is encountered.
-                         * NOTE. These three bytes are encoded in the integer value
-                         * of the parseop for convenience.
+                         * Get a new access_type and access_attribute -- to be used for all
+                         * field units that follow, until field end or another access_as
+                         * keyword.
                          *
                          * In field_flags, preserve the flag bits other than the
-                         * ACCESS_TYPE bits.
+                         * ACCESS_TYPE bits
                          */
-
-                        /* access_type (byte_acc, word_acc, etc.) */
-
                         info->field_flags = (u8)
                             ((info->
                               field_flags & ~(AML_FIELD_ACCESS_TYPE_MASK)) |
-                             ((u8)((u32)(arg->common.value.integer & 0x07))));
+                             ((u8) ((u32) arg->common.value.integer >> 8)));
 
-                        /* access_attribute (attrib_quick, attrib_byte, etc.) */
-
-                        info->attribute =
-                            (u8)((arg->common.value.integer >> 8) & 0xFF);
-
-                        /* access_length (for serial/buffer protocols) */
-
-                        info->access_length =
-                            (u8)((arg->common.value.integer >> 16) & 0xFF);
-                        break;
-
-                case AML_INT_CONNECTION_OP:
-                        /*
-                         * Clear any previous connection. New connection is used for all
-                         * fields that follow, similar to access_as
-                         */
-                        info->resource_buffer = NULL;
-                        info->connection_node = NULL;
-
-                        /*
-                         * A Connection() is either an actual resource descriptor (buffer)
-                         * or a named reference to a resource template
-                         */
-                        child = arg->common.value.arg;
-                        if (child->common.aml_opcode == AML_INT_BYTELIST_OP) {
-                                info->resource_buffer = child->named.data;
-                                info->resource_length =
-                                    (u16)child->named.value.integer;
-                        } else {
-                                /* Lookup the Connection() namepath, it should already exist */
-
-                                status = acpi_ns_lookup(walk_state->scope_info,
-                                                        child->common.value.
-                                                        name, ACPI_TYPE_ANY,
-                                                        ACPI_IMODE_EXECUTE,
-                                                        ACPI_NS_DONT_OPEN_SCOPE,
-                                                        walk_state,
-                                                        &info->connection_node);
-                                if (ACPI_FAILURE(status)) {
-                                        ACPI_ERROR_NAMESPACE(child->common.
-                                                             value.name,
-                                                             status);
-                                        return_ACPI_STATUS(status);
-                                }
-                        }
+                        info->attribute = (u8) (arg->common.value.integer);
                         break;
 
                 case AML_INT_NAMEDFIELD_OP:
@@ -457,7 +338,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
  *
  * FUNCTION:    acpi_ds_create_field
  *
- * PARAMETERS:  op              - Op containing the Field definition and args
+ * PARAMETERS:  Op              - Op containing the Field definition and args
  *              region_node     - Object for the containing Operation Region
  *  `           walk_state      - Current method state
  *
@@ -481,27 +362,18 @@ acpi_ds_create_field(union acpi_parse_object *op,
         /* First arg is the name of the parent op_region (must already exist) */
 
         arg = op->common.value.arg;
-
         if (!region_node) {
                 status =
                     acpi_ns_lookup(walk_state->scope_info,
                                    arg->common.value.name, ACPI_TYPE_REGION,
                                    ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                    walk_state, &region_node);
-#ifdef ACPI_ASL_COMPILER
-                status = acpi_ds_create_external_region(status, arg,
-                                                        arg->common.value.name,
-                                                        walk_state,
-                                                        &region_node);
-#endif
                 if (ACPI_FAILURE(status)) {
                         ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                         return_ACPI_STATUS(status);
                 }
         }
 
-        ACPI_MEMSET(&info, 0, sizeof(struct acpi_create_field_info));
-
         /* Second arg is the field flags */
 
         arg = arg->common.next;
@@ -514,6 +386,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
         info.region_node = region_node;
 
         status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
+
         return_ACPI_STATUS(status);
 }
 
@@ -521,7 +394,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
  *
  * FUNCTION:    acpi_ds_init_field_objects
  *
- * PARAMETERS:  op              - Op containing the Field definition and args
+ * PARAMETERS:  Op              - Op containing the Field definition and args
  *  `           walk_state      - Current method state
  *
  * RETURN:      Status
@@ -601,8 +474,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
          */
         while (arg) {
                 /*
-                 * Ignore OFFSET/ACCESSAS/CONNECTION terms here; we are only interested
-                 * in the field names in order to enter them into the namespace.
+                 * Ignore OFFSET and ACCESSAS terms here; we are only interested in the
+                 * field names in order to enter them into the namespace.
                  */
                 if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
                         status = acpi_ns_lookup(walk_state->scope_info,
@@ -636,7 +509,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
  *
  * FUNCTION:    acpi_ds_create_bank_field
  *
- * PARAMETERS:  op              - Op containing the Field definition and args
+ * PARAMETERS:  Op              - Op containing the Field definition and args
  *              region_node     - Object for the containing Operation Region
  *              walk_state      - Current method state
  *
@@ -666,12 +539,6 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
                                    arg->common.value.name, ACPI_TYPE_REGION,
                                    ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                    walk_state, &region_node);
-#ifdef ACPI_ASL_COMPILER
-                status = acpi_ds_create_external_region(status, arg,
-                                                        arg->common.value.name,
-                                                        walk_state,
-                                                        &region_node);
-#endif
                 if (ACPI_FAILURE(status)) {
                         ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                         return_ACPI_STATUS(status);
@@ -726,7 +593,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
  *
  * FUNCTION:    acpi_ds_create_index_field
  *
- * PARAMETERS:  op              - Op containing the Field definition and args
+ * PARAMETERS:  Op              - Op containing the Field definition and args
  *              region_node     - Object for the containing Operation Region
  *  `           walk_state      - Current method state
  *
@@ -784,5 +651,6 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
         info.region_node = region_node;
 
         status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
+
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index 87eff701ecf..a7718bf2b9a 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,8 +60,8 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
  * FUNCTION:    acpi_ds_init_one_object
  *
  * PARAMETERS:  obj_handle      - Node for the object
- *              level           - Current nesting level
- *              context         - Points to a init info struct
+ *              Level           - Current nesting level
+ *              Context         - Points to a init info struct
  *              return_value    - Not used
  *
  * RETURN:      Status
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 52eb4e01622..5d797751e20 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc);
  *
  * FUNCTION:    acpi_ds_method_error
  *
- * PARAMETERS:  status          - Execution status
+ * PARAMETERS:  Status          - Execution status
  *              walk_state      - Current state
  *
  * RETURN:      Status
@@ -170,7 +170,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Prepare a method for execution. Parses the method if necessary,
+ * DESCRIPTION: Prepare a method for execution.  Parses the method if necessary,
  *              increments the thread count, and waits at the method semaphore
  *              for clearance to execute.
  *
@@ -306,9 +306,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
  *
  * FUNCTION:    acpi_ds_call_control_method
  *
- * PARAMETERS:  thread              - Info for this thread
+ * PARAMETERS:  Thread              - Info for this thread
  *              this_walk_state     - Current walk state
- *              op                  - Current Op to be walked
+ *              Op                  - Current Op to be walked
  *
  * RETURN:      Status
  *
@@ -444,7 +444,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
  * RETURN:      Status
  *
  * DESCRIPTION: Restart a method that was preempted by another (nested) method
- *              invocation. Handle the return value (if any) from the callee.
+ *              invocation.  Handle the return value (if any) from the callee.
  *
  ******************************************************************************/
 
@@ -530,7 +530,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Terminate a control method. Delete everything that the method
+ * DESCRIPTION: Terminate a control method.  Delete everything that the method
  *              created, delete all locals and arguments, and delete the parse
  *              tree if requested.
  *
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 9a83b7e0f3b..905ce29a92e 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,7 @@ acpi_ds_method_data_get_type(u16 opcode,
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize the data structures that hold the method's arguments
- *              and locals. The data struct is an array of namespace nodes for
+ *              and locals.  The data struct is an array of namespace nodes for
  *              each - this allows ref_of and de_ref_of to work properly for these
  *              special data types.
  *
@@ -129,7 +129,7 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete method locals and arguments. Arguments are only
+ * DESCRIPTION: Delete method locals and arguments.  Arguments are only
  *              deleted if this method was called from another method.
  *
  ******************************************************************************/
@@ -177,13 +177,13 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)
  *
  * FUNCTION:    acpi_ds_method_data_init_args
  *
- * PARAMETERS:  *params         - Pointer to a parameter list for the method
+ * PARAMETERS:  *Params         - Pointer to a parameter list for the method
  *              max_param_count - The arg count for this method
  *              walk_state      - Current walk state object
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Initialize arguments for a method. The parameter list is a list
+ * DESCRIPTION: Initialize arguments for a method.  The parameter list is a list
  *              of ACPI operand objects, either null terminated or whose length
  *              is defined by max_param_count.
  *
@@ -232,11 +232,11 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params,
  *
  * FUNCTION:    acpi_ds_method_data_get_node
  *
- * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
  *                                    ACPI_REFCLASS_ARG
- *              index               - Which Local or Arg whose type to get
+ *              Index               - Which Local or Arg whose type to get
  *              walk_state          - Current walk state object
- *              node                - Where the node is returned.
+ *              Node                - Where the node is returned.
  *
  * RETURN:      Status and node
  *
@@ -296,10 +296,10 @@ acpi_ds_method_data_get_node(u8 type,
  *
  * FUNCTION:    acpi_ds_method_data_set_value
  *
- * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
  *                                    ACPI_REFCLASS_ARG
- *              index               - Which Local or Arg to get
- *              object              - Object to be inserted into the stack entry
+ *              Index               - Which Local or Arg to get
+ *              Object              - Object to be inserted into the stack entry
  *              walk_state          - Current walk state object
  *
  * RETURN:      Status
@@ -336,7 +336,7 @@ acpi_ds_method_data_set_value(u8 type,
          * Increment ref count so object can't be deleted while installed.
          * NOTE: We do not copy the object in order to preserve the call by
          * reference semantics of ACPI Control Method invocation.
-         * (See ACPI Specification 2.0C)
+         * (See ACPI Specification 2.0_c)
          */
         acpi_ut_add_reference(object);
 
@@ -350,9 +350,9 @@ acpi_ds_method_data_set_value(u8 type,
  *
  * FUNCTION:    acpi_ds_method_data_get_value
  *
- * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
  *                                    ACPI_REFCLASS_ARG
- *              index               - Which localVar or argument to get
+ *              Index               - Which local_var or argument to get
  *              walk_state          - Current walk state object
  *              dest_desc           - Where Arg or Local value is returned
  *
@@ -401,7 +401,7 @@ acpi_ds_method_data_get_value(u8 type,
                  * This means that either 1) The expected argument was
                  * not passed to the method, or 2) A local variable
                  * was referenced by the method (via the ASL)
-                 * before it was initialized. Either case is an error.
+                 * before it was initialized.  Either case is an error.
                  */
 
                 /* If slack enabled, init the local_x/arg_x to an Integer of value zero */
@@ -458,14 +458,14 @@ acpi_ds_method_data_get_value(u8 type,
  *
  * FUNCTION:    acpi_ds_method_data_delete_value
  *
- * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
  *                                    ACPI_REFCLASS_ARG
- *              index               - Which localVar or argument to delete
+ *              Index               - Which local_var or argument to delete
  *              walk_state          - Current walk state object
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete the entry at Opcode:Index. Inserts
+ * DESCRIPTION: Delete the entry at Opcode:Index.  Inserts
  *              a null into the stack slot after the object is deleted.
  *
  ******************************************************************************/
@@ -515,15 +515,15 @@ acpi_ds_method_data_delete_value(u8 type,
  *
  * FUNCTION:    acpi_ds_store_object_to_local
  *
- * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
  *                                    ACPI_REFCLASS_ARG
- *              index               - Which Local or Arg to set
+ *              Index               - Which Local or Arg to set
  *              obj_desc            - Value to be stored
  *              walk_state          - Current walk state
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Store a value in an Arg or Local. The obj_desc is installed
+ * DESCRIPTION: Store a value in an Arg or Local.  The obj_desc is installed
  *              as the new value for the Arg or Local and the reference count
  *              for obj_desc is incremented.
  *
@@ -566,7 +566,7 @@ acpi_ds_store_object_to_local(u8 type,
 
         /*
          * If the reference count on the object is more than one, we must
-         * take a copy of the object before we store. A reference count
+         * take a copy of the object before we store.  A reference count
          * of exactly 1 means that the object was just created during the
          * evaluation of an expression, and we can safely use it since it
          * is not used anywhere else.
@@ -670,8 +670,8 @@ acpi_ds_store_object_to_local(u8 type,
  *
  * FUNCTION:    acpi_ds_method_data_get_type
  *
- * PARAMETERS:  opcode              - Either AML_LOCAL_OP or AML_ARG_OP
- *              index               - Which Local or Arg whose type to get
+ * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP
+ *              Index               - Which Local or Arg whose type to get
  *              walk_state          - Current walk state object
  *
  * RETURN:      Data type of current value of the selected Arg or Local
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index c9f15d3a368..f42e17e5c25 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_build_internal_object
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              op              - Parser object to be translated
+ *              Op              - Parser object to be translated
  *              obj_desc_ptr    - Where the ACPI internal object is returned
  *
  * RETURN:      Status
@@ -250,7 +250,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_build_internal_buffer_obj
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              op              - Parser object to be translated
+ *              Op              - Parser object to be translated
  *              buffer_length   - Length of the buffer
  *              obj_desc_ptr    - Where the ACPI internal object is returned
  *
@@ -293,7 +293,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 
         /*
          * Second arg is the buffer data (optional) byte_list can be either
-         * individual bytes or a string initializer. In either case, a
+         * individual bytes or a string initializer.  In either case, a
          * byte_list appears in the AML.
          */
         arg = op->common.value.arg;     /* skip first arg */
@@ -354,7 +354,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_build_internal_package_obj
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              op              - Parser object to be translated
+ *              Op              - Parser object to be translated
  *              element_count   - Number of elements in the package - this is
  *                                the num_elements argument to Package()
  *              obj_desc_ptr    - Where the ACPI internal object is returned
@@ -547,8 +547,8 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_create_node
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              node            - NS Node to be initialized
- *              op              - Parser object to be translated
+ *              Node            - NS Node to be initialized
+ *              Op              - Parser object to be translated
  *
  * RETURN:      Status
  *
@@ -568,7 +568,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
 
         /*
          * Because of the execution pass through the non-control-method
-         * parts of the table, we can arrive here twice. Only init
+         * parts of the table, we can arrive here twice.  Only init
          * the named object node the first time through
          */
         if (acpi_ns_get_attached_object(node)) {
@@ -611,14 +611,14 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_init_object_from_op
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              op              - Parser op used to init the internal object
- *              opcode          - AML opcode associated with the object
+ *              Op              - Parser op used to init the internal object
+ *              Opcode          - AML opcode associated with the object
  *              ret_obj_desc    - Namespace object to be initialized
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize a namespace object from a parser Op and its
- *              associated arguments. The namespace object is a more compact
+ *              associated arguments.  The namespace object is a more compact
  *              representation of the Op and its arguments.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index d09c6b4bab2..c627a288e02 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -1,11 +1,11 @@
 /******************************************************************************
  *
- * Module Name: dsopcode - Dispatcher support for regions and fields
+ * Module Name: dsopcode - Dispatcher suport for regions and fields
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286,7 +286,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
  * FUNCTION:    acpi_ds_eval_buffer_field_operands
  *
  * PARAMETERS:  walk_state      - Current walk
- *              op              - A valid buffer_field Op object
+ *              Op              - A valid buffer_field Op object
  *
  * RETURN:      Status
  *
@@ -370,7 +370,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_eval_region_operands
  *
  * PARAMETERS:  walk_state      - Current walk
- *              op              - A valid region Op object
+ *              Op              - A valid region Op object
  *
  * RETURN:      Status
  *
@@ -397,7 +397,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
          */
         node = op->common.node;
 
-        /* next_op points to the op that holds the space_ID */
+        /* next_op points to the op that holds the space_iD */
 
         next_op = op->common.value.arg;
 
@@ -461,7 +461,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_eval_table_region_operands
  *
  * PARAMETERS:  walk_state      - Current walk
- *              op              - A valid region Op object
+ *              Op              - A valid region Op object
  *
  * RETURN:      Status
  *
@@ -560,7 +560,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_eval_data_object_operands
  *
  * PARAMETERS:  walk_state      - Current walk
- *              op              - A valid data_object Op object
+ *              Op              - A valid data_object Op object
  *              obj_desc        - data_object
  *
  * RETURN:      Status
@@ -649,8 +649,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 !=
-                         AML_NAME_OP))) {
+                     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {
                         walk_state->result_obj = obj_desc;
                 }
         }
@@ -663,7 +662,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ds_eval_bank_field_operands
  *
  * PARAMETERS:  walk_state      - Current walk
- *              op              - A valid bank_field Op object
+ *              Op              - A valid bank_field Op object
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index afeb99f4948..2c477ce172f 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("dsutils")
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Clear and remove a reference on an implicit return value. Used
+ * DESCRIPTION: Clear and remove a reference on an implicit return value.  Used
  *              to delete "stale" return values (if enabled, the return value
  *              from every operator is saved at least momentarily, in case the
  *              parent method exits.)
@@ -107,7 +107,7 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
  *
  * DESCRIPTION: Implements the optional "implicit return".  We save the result
  *              of every ASL operator and control method invocation in case the
- *              parent method exit. Before storing a new return value, we
+ *              parent method exit.  Before storing a new return value, we
  *              delete the previous return value.
  *
  ******************************************************************************/
@@ -157,7 +157,7 @@ acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,
  *
  * FUNCTION:    acpi_ds_is_result_used
  *
- * PARAMETERS:  op                  - Current Op
+ * PARAMETERS:  Op                  - Current Op
  *              walk_state          - Current State
  *
  * RETURN:      TRUE if result is used, FALSE otherwise
@@ -198,7 +198,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
          *
          * If there is no parent, or the parent is a scope_op, we are executing
          * at the method level. An executing method typically has no parent,
-         * since each method is parsed separately. A method invoked externally
+         * since each method is parsed separately.  A method invoked externally
          * via execute_control_method has a scope_op as the parent.
          */
         if ((!op->common.parent) ||
@@ -223,7 +223,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
         }
 
         /*
-         * Decide what to do with the result based on the parent. If
+         * Decide what to do with the result based on the parent.  If
          * the parent opcode will not use the result, delete the object.
          * Otherwise leave it as is, it will be deleted when it is used
          * as an operand later.
@@ -266,7 +266,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 
                 /*
                  * These opcodes allow term_arg(s) as operands and therefore
-                 * the operands can be method calls. The result is used.
+                 * the operands can be method calls.  The result is used.
                  */
                 goto result_used;
 
@@ -284,7 +284,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                         AML_BANK_FIELD_OP)) {
                         /*
                          * These opcodes allow term_arg(s) as operands and therefore
-                         * the operands can be method calls. The result is used.
+                         * the operands can be method calls.  The result is used.
                          */
                         goto result_used;
                 }
@@ -323,15 +323,15 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
  *
  * FUNCTION:    acpi_ds_delete_result_if_not_used
  *
- * PARAMETERS:  op              - Current parse Op
+ * PARAMETERS:  Op              - Current parse Op
  *              result_obj      - Result of the operation
  *              walk_state      - Current state
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Used after interpretation of an opcode. If there is an internal
+ * DESCRIPTION: Used after interpretation of an opcode.  If there is an internal
  *              result descriptor, check if the parent opcode will actually use
- *              this result. If not, delete the result now so that it will
+ *              this result.  If not, delete the result now so that it will
  *              not become orphaned.
  *
  ******************************************************************************/
@@ -376,7 +376,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Resolve all operands to their values. Used to prepare
+ * DESCRIPTION: Resolve all operands to their values.  Used to prepare
  *              arguments to a control method invocation (a call from one
  *              method to another.)
  *
@@ -391,7 +391,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)
 
         /*
          * Attempt to resolve each of the valid operands
-         * Method arguments are passed by reference, not by value. This means
+         * Method arguments are passed by reference, not by value.  This means
          * that the actual objects are passed, not copies of the objects.
          */
         for (i = 0; i < walk_state->num_operands; i++) {
@@ -445,13 +445,13 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
  * FUNCTION:    acpi_ds_create_operand
  *
  * PARAMETERS:  walk_state      - Current walk state
- *              arg             - Parse object for the argument
+ *              Arg             - Parse object for the argument
  *              arg_index       - Which argument (zero based)
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Translate a parse tree object that is an argument to an AML
- *              opcode to the equivalent interpreter object. This may include
+ *              opcode to the equivalent interpreter object.  This may include
  *              looking up a name or entering a new name into the internal
  *              namespace.
  *
@@ -496,9 +496,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                 /*
                  * Special handling for buffer_field declarations. This is a deferred
                  * opcode that unfortunately defines the field name as the last
-                 * parameter instead of the first. We get here when we are performing
+                 * parameter instead of the first.  We get here when we are performing
                  * the deferred execution, so the actual name of the field is already
-                 * in the namespace. We don't want to attempt to look it up again
+                 * in the namespace.  We don't want to attempt to look it up again
                  * because we may be executing in a different scope than where the
                  * actual opcode exists.
                  */
@@ -560,8 +560,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                          * indicate this to the interpreter, set the
                                          * object to the root
                                          */
-                                        obj_desc =
-                                            ACPI_CAST_PTR(union
+                                        obj_desc = ACPI_CAST_PTR(union
                                                                  acpi_operand_object,
                                                                  acpi_gbl_root_node);
                                         status = AE_OK;
@@ -605,8 +604,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                         /*
                          * If the name is null, this means that this is an
                          * optional result parameter that was not specified
-                         * in the original ASL. Create a Zero Constant for a
-                         * placeholder. (Store to a constant is a Noop.)
+                         * in the original ASL.  Create a Zero Constant for a
+                         * placeholder.  (Store to a constant is a Noop.)
                          */
                         opcode = AML_ZERO_OP;   /* Has no arguments! */
 
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 58593931be9..fe40e4c6554 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ ACPI_MODULE_NAME("dswexec")
 /*
  * Dispatch table for opcode classes
  */
-static acpi_execute_op acpi_gbl_op_type_dispatch[] = {
+static ACPI_EXECUTE_OP acpi_gbl_op_type_dispatch[] = {
         acpi_ex_opcode_0A_0T_1R,
         acpi_ex_opcode_1A_0T_0R,
         acpi_ex_opcode_1A_0T_1R,
@@ -204,7 +204,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
  * RETURN:      Status
  *
  * DESCRIPTION: Descending callback used during the execution of control
- *              methods. This is where most operators and operands are
+ *              methods.  This is where most operators and operands are
  *              dispatched to the interpreter.
  *
  ****************************************************************************/
@@ -297,7 +297,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                 if (walk_state->walk_type & ACPI_WALK_METHOD) {
                         /*
                          * Found a named object declaration during method execution;
-                         * we must enter this object into the namespace. The created
+                         * we must enter this object into the namespace.  The created
                          * object is temporary and will be deleted upon completion of
                          * the execution of this method.
                          *
@@ -348,7 +348,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
  * RETURN:      Status
  *
  * DESCRIPTION: Ascending callback used during the execution of control
- *              methods. The only thing we really need to do here is to
+ *              methods.  The only thing we really need to do here is to
  *              notice the beginning of IF, ELSE, and WHILE blocks.
  *
  ****************************************************************************/
@@ -432,7 +432,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                 if (ACPI_SUCCESS(status)) {
                         /*
                          * Dispatch the request to the appropriate interpreter handler
-                         * routine. There is one routine per opcode "type" based upon the
+                         * routine.  There is one routine per opcode "type" based upon the
                          * number of opcode arguments and return type.
                          */
                         status =
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 557510084c7..324acec1179 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,20 +230,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                         walk_state->scope_info->common.value = ACPI_TYPE_ANY;
                         break;
 
-                case ACPI_TYPE_METHOD:
-
-                        /*
-                         * Allow scope change to root during execution of module-level
-                         * code. Root is typed METHOD during this time.
-                         */
-                        if ((node == acpi_gbl_root_node) &&
-                            (walk_state->
-                             parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
-                                break;
-                        }
-
-                        /*lint -fallthrough */
-
                 default:
 
                         /* All other types are an error */
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 37983574835..976318138c5 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,20 +230,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                         walk_state->scope_info->common.value = ACPI_TYPE_ANY;
                         break;
 
-                case ACPI_TYPE_METHOD:
-
-                        /*
-                         * Allow scope change to root during execution of module-level
-                         * code. Root is typed METHOD during this time.
-                         */
-                        if ((node == acpi_gbl_root_node) &&
-                            (walk_state->
-                             parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
-                                break;
-                        }
-
-                        /*lint -fallthrough */
-
                 default:
 
                         /* All other types are an error */
@@ -254,7 +240,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                                     acpi_ut_get_type_name(node->type),
                                     acpi_ut_get_node_name(node)));
 
-                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+                        return (AE_AML_OPERAND_TYPE);
                 }
                 break;
 
@@ -602,7 +588,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                                                           region_space,
                                                           walk_state);
                                 if (ACPI_FAILURE(status)) {
-                                        return_ACPI_STATUS(status);
+                                        return (status);
                                 }
 
                                 acpi_ex_exit_interpreter();
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index f6c4295470a..76a661fc1e0 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,8 +85,8 @@ void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)
  *
  * FUNCTION:    acpi_ds_scope_stack_push
  *
- * PARAMETERS:  node            - Name to be made current
- *              type            - Type of frame being pushed
+ * PARAMETERS:  Node            - Name to be made current
+ *              Type            - Type of frame being pushed
  *              walk_state      - Current state
  *
  * RETURN:      Status
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 3e65a15a735..a6c374ef991 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,15 +51,14 @@
 ACPI_MODULE_NAME("dswstate")
 
   /* Local prototypes */
-static acpi_status
-acpi_ds_result_stack_push(struct acpi_walk_state *walk_state);
-static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state);
+static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *ws);
+static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *ws);
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ds_result_pop
  *
- * PARAMETERS:  object              - Where to return the popped object
+ * PARAMETERS:  Object              - Where to return the popped object
  *              walk_state          - Current Walk state
  *
  * RETURN:      Status
@@ -133,7 +132,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
  *
  * FUNCTION:    acpi_ds_result_push
  *
- * PARAMETERS:  object              - Where to return the popped object
+ * PARAMETERS:  Object              - Where to return the popped object
  *              walk_state          - Current Walk state
  *
  * RETURN:      Status
@@ -297,7 +296,7 @@ static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state)
  *
  * FUNCTION:    acpi_ds_obj_stack_push
  *
- * PARAMETERS:  object              - Object to push
+ * PARAMETERS:  Object              - Object to push
  *              walk_state          - Current Walk state
  *
  * RETURN:      Status
@@ -348,7 +347,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Pop this walk's object stack. Objects on the stack are NOT
+ * DESCRIPTION: Pop this walk's object stack.  Objects on the stack are NOT
  *              deleted by this routine.
  *
  ******************************************************************************/
@@ -434,7 +433,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
  *
  * FUNCTION:    acpi_ds_get_current_walk_state
  *
- * PARAMETERS:  thread          - Get current active state for this Thread
+ * PARAMETERS:  Thread          - Get current active state for this Thread
  *
  * RETURN:      Pointer to the current walk state
  *
@@ -463,7 +462,7 @@ struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
  * FUNCTION:    acpi_ds_push_walk_state
  *
  * PARAMETERS:  walk_state      - State to push
- *              thread          - Thread state object
+ *              Thread          - Thread state object
  *
  * RETURN:      None
  *
@@ -487,12 +486,12 @@ acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
  *
  * FUNCTION:    acpi_ds_pop_walk_state
  *
- * PARAMETERS:  thread      - Current thread state
+ * PARAMETERS:  Thread      - Current thread state
  *
  * RETURN:      A walk_state object popped from the thread's stack
  *
  * DESCRIPTION: Remove and return the walkstate object that is at the head of
- *              the walk stack for the given walk list. NULL indicates that
+ *              the walk stack for the given walk list.  NULL indicates that
  *              the list is empty.
  *
  ******************************************************************************/
@@ -526,23 +525,20 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
  * FUNCTION:    acpi_ds_create_walk_state
  *
  * PARAMETERS:  owner_id        - ID for object creation
- *              origin          - Starting point for this walk
+ *              Origin          - Starting point for this walk
  *              method_desc     - Method object
- *              thread          - Current thread state
+ *              Thread          - Current thread state
  *
  * RETURN:      Pointer to the new walk state.
  *
- * DESCRIPTION: Allocate and initialize a new walk state. The current walk
+ * DESCRIPTION: Allocate and initialize a new walk state.  The current walk
  *              state is set to this new state.
  *
  ******************************************************************************/
 
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                  union acpi_parse_object
-                                                  *origin,
-                                                  union acpi_operand_object
-                                                  *method_desc,
-                                                  struct acpi_thread_state
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                  *origin, union acpi_operand_object
+                                                  *method_desc, struct acpi_thread_state
                                                   *thread)
 {
         struct acpi_walk_state *walk_state;
@@ -582,11 +578,11 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
  * FUNCTION:    acpi_ds_init_aml_walk
  *
  * PARAMETERS:  walk_state      - New state to be initialized
- *              op              - Current parse op
+ *              Op              - Current parse op
  *              method_node     - Control method NS node, if any
  *              aml_start       - Start of AML
  *              aml_length      - Length of AML
- *              info            - Method info block (params, etc.)
+ *              Info            - Method info block (params, etc.)
  *              pass_number     - 1, 2, or 3
  *
  * RETURN:      Status
@@ -657,7 +653,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
                 /*
                  * Setup the current scope.
                  * Find a Named Op that has a namespace node associated with it.
-                 * search upwards from this Op. Current scope is the first
+                 * search upwards from this Op.  Current scope is the first
                  * Op with a namespace node.
                  */
                 extra_op = parser_state->start_op;
@@ -708,13 +704,13 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
         ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);
 
         if (!walk_state) {
-                return_VOID;
+                return;
         }
 
         if (walk_state->descriptor_type != ACPI_DESC_TYPE_WALK) {
                 ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
                             walk_state));
-                return_VOID;
+                return;
         }
 
         /* There should not be any open scopes */
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index d4acfbbe5b2..d458b041e65 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evevent")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static acpi_status acpi_ev_fixed_event_initialize(void);
 
@@ -71,12 +71,6 @@ acpi_status acpi_ev_initialize_events(void)
 
         ACPI_FUNCTION_TRACE(ev_initialize_events);
 
-        /* If Hardware Reduced flag is set, there are no fixed events */
-
-        if (acpi_gbl_reduced_hardware) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
         /*
          * Initialize the Fixed and General Purpose Events. This is done prior to
          * enabling SCIs to prevent interrupts from occurring before the handlers
@@ -117,12 +111,6 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 
         ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);
 
-        /* If Hardware Reduced flag is set, there is no ACPI h/w */
-
-        if (acpi_gbl_reduced_hardware) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
         /* Install the SCI handler */
 
         status = acpi_ev_install_sci_handler();
@@ -251,7 +239,7 @@ u32 acpi_ev_fixed_event_detect(void)
  *
  * FUNCTION:    acpi_ev_fixed_event_dispatch
  *
- * PARAMETERS:  event               - Event type
+ * PARAMETERS:  Event               - Event type
  *
  * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED
  *
@@ -291,5 +279,3 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
         return ((acpi_gbl_fixed_event_handlers[event].
                  handler) (acpi_gbl_fixed_event_handlers[event].context));
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index af14a713763..56a562a1e5d 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evglock")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static u32 acpi_ev_global_lock_handler(void *context);
 
@@ -70,12 +70,6 @@ acpi_status acpi_ev_init_global_lock_handler(void)
 
         ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
 
-        /* If Hardware Reduced flag is set, there is no global lock */
-
-        if (acpi_gbl_reduced_hardware) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
         /* Attempt installation of the global lock handler */
 
         status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
@@ -135,7 +129,7 @@ acpi_status acpi_ev_remove_global_lock_handler(void)
  *
  * FUNCTION:    acpi_ev_global_lock_handler
  *
- * PARAMETERS:  context         - From thread interface, not used
+ * PARAMETERS:  Context         - From thread interface, not used
  *
  * RETURN:      ACPI_INTERRUPT_HANDLED
  *
@@ -182,7 +176,7 @@ static u32 acpi_ev_global_lock_handler(void *context)
  *
  * FUNCTION:    acpi_ev_acquire_global_lock
  *
- * PARAMETERS:  timeout         - Max time to wait for the lock, in millisec.
+ * PARAMETERS:  Timeout         - Max time to wait for the lock, in millisec.
  *
  * RETURN:      Status
  *
@@ -339,5 +333,3 @@ acpi_status acpi_ev_release_global_lock(void)
         acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex);
         return_ACPI_STATUS(status);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 36d12057442..65c79add3b1 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpe")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
 
@@ -80,7 +80,8 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
                 return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
+        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
+                                                gpe_register_info);
 
         /* Clear the run bit up front */
 
@@ -89,8 +90,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
         /* Set the mask bit only if there are references to this GPE */
 
         if (gpe_event_info->runtime_count) {
-                ACPI_SET_BIT(gpe_register_info->enable_for_run,
-                             (u8)register_bit);
+                ACPI_SET_BIT(gpe_register_info->enable_for_run, (u8)register_bit);
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -107,7 +107,8 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
  * DESCRIPTION: Clear a GPE of stale events and enable it.
  *
  ******************************************************************************/
-acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status
+acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status;
 
@@ -131,8 +132,8 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
         }
 
         /* Enable the requested GPE */
-
         status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
+
         return_ACPI_STATUS(status);
 }
 
@@ -150,8 +151,7 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
@@ -192,8 +192,7 @@ acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
@@ -210,8 +209,7 @@ acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
-                        status =
-                            acpi_hw_low_set_gpe(gpe_event_info,
+                        status = acpi_hw_low_set_gpe(gpe_event_info,
                                                      ACPI_GPE_DISABLE);
                 }
 
@@ -309,8 +307,7 @@ 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 =
-            acpi_ns_get_attached_object((struct acpi_namespace_node *)
+        obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)
                                                gpe_device);
         if (!obj_desc || !obj_desc->device.gpe_block) {
                 return (NULL);
@@ -382,18 +379,6 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                          */
                         if (!(gpe_register_info->enable_for_run |
                               gpe_register_info->enable_for_wake)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                                  "Ignore disabled registers for GPE%02X-GPE%02X: "
-                                                  "RunEnable=%02X, WakeEnable=%02X\n",
-                                                  gpe_register_info->
-                                                  base_gpe_number,
-                                                  gpe_register_info->
-                                                  base_gpe_number +
-                                                  (ACPI_GPE_REGISTER_WIDTH - 1),
-                                                  gpe_register_info->
-                                                  enable_for_run,
-                                                  gpe_register_info->
-                                                  enable_for_wake));
                                 continue;
                         }
 
@@ -416,14 +401,9 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         }
 
                         ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                          "Read registers for GPE%02X-GPE%02X: Status=%02X, Enable=%02X, "
-                                          "RunEnable=%02X, WakeEnable=%02X\n",
+                                          "Read GPE Register at GPE%02X: Status=%02X, Enable=%02X\n",
                                           gpe_register_info->base_gpe_number,
-                                          gpe_register_info->base_gpe_number +
-                                          (ACPI_GPE_REGISTER_WIDTH - 1),
-                                          status_reg, enable_reg,
-                                          gpe_register_info->enable_for_run,
-                                          gpe_register_info->enable_for_wake));
+                                          status_reg, enable_reg));
 
                         /* Check if there is anything active at all in this register */
 
@@ -486,7 +466,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
         acpi_status status;
         struct acpi_gpe_event_info *local_gpe_event_info;
         struct acpi_evaluate_info *info;
-        struct acpi_gpe_notify_info *notify;
+        struct acpi_gpe_notify_object *notify_object;
 
         ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
 
@@ -537,17 +517,17 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                  * completes. The notify handlers are NOT invoked synchronously
                  * from this thread -- because handlers may in turn run other
                  * control methods.
-                 *
-                 * June 2012: Expand implicit notify mechanism to support
-                 * notifies on multiple device objects.
                  */
-                notify = local_gpe_event_info->dispatch.notify_list;
-                while (ACPI_SUCCESS(status) && notify) {
-                        status =
-                            acpi_ev_queue_notify_request(notify->device_node,
-                                                         ACPI_NOTIFY_DEVICE_WAKE);
-
-                        notify = notify->next;
+                status = acpi_ev_queue_notify_request(
+                                local_gpe_event_info->dispatch.device.node,
+                                ACPI_NOTIFY_DEVICE_WAKE);
+
+                notify_object = local_gpe_event_info->dispatch.device.next;
+                while (ACPI_SUCCESS(status) && notify_object) {
+                        status = acpi_ev_queue_notify_request(
+                                        notify_object->node,
+                                        ACPI_NOTIFY_DEVICE_WAKE);
+                        notify_object = notify_object->next;
                 }
 
                 break;
@@ -786,5 +766,3 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
 
         return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 1571a61a783..ca2c41a5331 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeblk")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static acpi_status
 acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
@@ -318,7 +318,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
  * FUNCTION:    acpi_ev_create_gpe_block
  *
  * PARAMETERS:  gpe_device          - Handle to the parent GPE block
- *              gpe_block_address   - Address and space_ID
+ *              gpe_block_address   - Address and space_iD
  *              register_count      - Number of GPE register pairs in the block
  *              gpe_block_base_number - Starting GPE number for the block
  *              interrupt_number    - H/W interrupt for the block
@@ -486,8 +486,7 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not enable GPE 0x%02X",
-                                        gpe_index +
-                                        gpe_block->block_base_number));
+                                        gpe_index + gpe_block->block_base_number));
                                 continue;
                         }
 
@@ -505,5 +504,3 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
         return_ACPI_STATUS(AE_OK);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index da0add858f8..ce9aa9f9a97 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeinit")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /*
  * Note: History of _PRW support in ACPICA
  *
@@ -440,5 +440,3 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
                           name, gpe_number));
         return_ACPI_STATUS(AE_OK);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 228a0c3b1d4..80a81d0c4a8 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,13 +48,12 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeutil")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_walk_gpe_list
  *
  * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
- *              context             - Value passed to callback
+ *              Context             - Value passed to callback
  *
  * RETURN:      Status
  *
@@ -347,8 +346,6 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                             void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_gpe_notify_info *notify;
-        struct acpi_gpe_notify_info *next;
         u32 i;
         u32 j;
 
@@ -367,34 +364,13 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
                         if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                             ACPI_GPE_DISPATCH_HANDLER) {
-
-                                /* Delete an installed handler block */
-
                                 ACPI_FREE(gpe_event_info->dispatch.handler);
                                 gpe_event_info->dispatch.handler = NULL;
                                 gpe_event_info->flags &=
                                     ~ACPI_GPE_DISPATCH_MASK;
-                        } else
-                            if ((gpe_event_info->
-                                 flags & ACPI_GPE_DISPATCH_MASK) ==
-                                ACPI_GPE_DISPATCH_NOTIFY) {
-
-                                /* Delete the implicit notification device list */
-
-                                notify = gpe_event_info->dispatch.notify_list;
-                                while (notify) {
-                                        next = notify->next;
-                                        ACPI_FREE(notify);
-                                        notify = next;
-                                }
-                                gpe_event_info->dispatch.notify_list = NULL;
-                                gpe_event_info->flags &=
-                                    ~ACPI_GPE_DISPATCH_MASK;
                         }
                 }
         }
 
         return_ACPI_STATUS(AE_OK);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 51f537937c1..d0b33184442 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context);
  *
  * FUNCTION:    acpi_ev_is_notify_object
  *
- * PARAMETERS:  node            - Node to check
+ * PARAMETERS:  Node            - Node to check
  *
  * RETURN:      TRUE if notifies allowed on this object
  *
@@ -86,7 +86,7 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node)
  *
  * FUNCTION:    acpi_ev_queue_notify_request
  *
- * PARAMETERS:  node            - NS node for the notified object
+ * PARAMETERS:  Node            - NS node for the notified object
  *              notify_value    - Value from the Notify() request
  *
  * RETURN:      Status
@@ -101,77 +101,99 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                              u32 notify_value)
 {
         union acpi_operand_object *obj_desc;
-        union acpi_operand_object *handler_list_head = NULL;
-        union acpi_generic_state *info;
-        u8 handler_list_id = 0;
+        union acpi_operand_object *handler_obj = NULL;
+        union acpi_generic_state *notify_info;
         acpi_status status = AE_OK;
 
         ACPI_FUNCTION_NAME(ev_queue_notify_request);
 
-        /* Are Notifies allowed on this object? */
+        /*
+         * For value 3 (Ejection Request), some device method may need to be run.
+         * For value 2 (Device Wake) if _PRW exists, the _PS0 method may need
+         *   to be run.
+         * For value 0x80 (Status Change) on the power button or sleep button,
+         *   initiate soft-off or sleep operation?
+         */
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                          "Dispatching Notify on [%4.4s] Node %p Value 0x%2.2X (%s)\n",
+                          acpi_ut_get_node_name(node), node, notify_value,
+                          acpi_ut_get_notify_name(notify_value)));
 
-        if (!acpi_ev_is_notify_object(node)) {
-                return (AE_TYPE);
-        }
+        /* Get the notify object attached to the NS Node */
 
-        /* Get the correct notify list type (System or Device) */
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (obj_desc) {
 
-        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
-                handler_list_id = ACPI_SYSTEM_HANDLER_LIST;
-        } else {
-                handler_list_id = ACPI_DEVICE_HANDLER_LIST;
-        }
+                /* We have the notify object, Get the right handler */
 
-        /* Get the notify object attached to the namespace Node */
+                switch (node->type) {
 
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (obj_desc) {
+                        /* Notify allowed only on these types */
 
-                /* We have an attached object, Get the correct handler list */
+                case ACPI_TYPE_DEVICE:
+                case ACPI_TYPE_THERMAL:
+                case ACPI_TYPE_PROCESSOR:
 
-                handler_list_head =
-                    obj_desc->common_notify.notify_list[handler_list_id];
-        }
+                        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+                                handler_obj =
+                                    obj_desc->common_notify.system_notify;
+                        } else {
+                                handler_obj =
+                                    obj_desc->common_notify.device_notify;
+                        }
+                        break;
 
-        /*
-         * If there is no notify handler (Global or Local)
-         * for this object, just ignore the notify
-         */
-        if (!acpi_gbl_global_notify[handler_list_id].handler
-            && !handler_list_head) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "No notify handler for Notify, ignoring (%4.4s, %X) node %p\n",
-                                  acpi_ut_get_node_name(node), notify_value,
-                                  node));
+                default:
 
-                return (AE_OK);
+                        /* All other types are not supported */
+
+                        return (AE_TYPE);
+                }
         }
 
-        /* Setup notify info and schedule the notify dispatcher */
+        /*
+         * If there is any handler to run, schedule the dispatcher.
+         * Check for:
+         * 1) Global system notify handler
+         * 2) Global device notify handler
+         * 3) Per-device notify handler
+         */
+        if ((acpi_gbl_system_notify.handler &&
+             (notify_value <= ACPI_MAX_SYS_NOTIFY)) ||
+            (acpi_gbl_device_notify.handler &&
+             (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {
+                notify_info = acpi_ut_create_generic_state();
+                if (!notify_info) {
+                        return (AE_NO_MEMORY);
+                }
 
-        info = acpi_ut_create_generic_state();
-        if (!info) {
-                return (AE_NO_MEMORY);
-        }
+                if (!handler_obj) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "Executing system notify handler for Notify (%4.4s, %X) "
+                                          "node %p\n",
+                                          acpi_ut_get_node_name(node),
+                                          notify_value, node));
+                }
 
-        info->common.descriptor_type = ACPI_DESC_TYPE_STATE_NOTIFY;
+                notify_info->common.descriptor_type =
+                    ACPI_DESC_TYPE_STATE_NOTIFY;
+                notify_info->notify.node = node;
+                notify_info->notify.value = (u16) notify_value;
+                notify_info->notify.handler_obj = handler_obj;
 
-        info->notify.node = node;
-        info->notify.value = (u16)notify_value;
-        info->notify.handler_list_id = handler_list_id;
-        info->notify.handler_list_head = handler_list_head;
-        info->notify.global = &acpi_gbl_global_notify[handler_list_id];
+                status =
+                    acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
+                                    notify_info);
+                if (ACPI_FAILURE(status)) {
+                        acpi_ut_delete_generic_state(notify_info);
+                }
+        } else {
+                /* There is no notify handler (per-device or system) for this device */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
-                          acpi_ut_get_node_name(node),
-                          acpi_ut_get_type_name(node->type), notify_value,
-                          acpi_ut_get_notify_name(notify_value), node));
-
-        status = acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
-                                 info);
-        if (ACPI_FAILURE(status)) {
-                acpi_ut_delete_generic_state(info);
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "No notify handler for Notify (%4.4s, %X) node %p\n",
+                                  acpi_ut_get_node_name(node), notify_value,
+                                  node));
         }
 
         return (status);
@@ -181,7 +203,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
  *
  * FUNCTION:    acpi_ev_notify_dispatch
  *
- * PARAMETERS:  context         - To be passed to the notify handler
+ * PARAMETERS:  Context         - To be passed to the notify handler
  *
  * RETURN:      None.
  *
@@ -192,37 +214,62 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
 
 static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
 {
-        union acpi_generic_state *info = (union acpi_generic_state *)context;
+        union acpi_generic_state *notify_info =
+            (union acpi_generic_state *)context;
+        acpi_notify_handler global_handler = NULL;
+        void *global_context = NULL;
         union acpi_operand_object *handler_obj;
 
         ACPI_FUNCTION_ENTRY();
 
-        /* Invoke a global notify handler if installed */
+        /*
+         * We will invoke a global notify handler if installed. This is done
+         * _before_ we invoke the per-device handler attached to the device.
+         */
+        if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) {
 
-        if (info->notify.global->handler) {
-                info->notify.global->handler(info->notify.node,
-                                             info->notify.value,
-                                             info->notify.global->context);
+                /* Global system notification handler */
+
+                if (acpi_gbl_system_notify.handler) {
+                        global_handler = acpi_gbl_system_notify.handler;
+                        global_context = acpi_gbl_system_notify.context;
+                }
+        } else {
+                /* Global driver notification handler */
+
+                if (acpi_gbl_device_notify.handler) {
+                        global_handler = acpi_gbl_device_notify.handler;
+                        global_context = acpi_gbl_device_notify.context;
+                }
         }
 
-        /* Now invoke the local notify handler(s) if any are installed */
+        /* Invoke the system handler first, if present */
 
-        handler_obj = info->notify.handler_list_head;
-        while (handler_obj) {
-                handler_obj->notify.handler(info->notify.node,
-                                            info->notify.value,
-                                            handler_obj->notify.context);
+        if (global_handler) {
+                global_handler(notify_info->notify.node,
+                               notify_info->notify.value, global_context);
+        }
+
+        /* Now invoke the per-device handler, if present */
+
+        handler_obj = notify_info->notify.handler_obj;
+        if (handler_obj) {
+                struct acpi_object_notify_handler *notifier;
 
-                handler_obj =
-                    handler_obj->notify.next[info->notify.handler_list_id];
+                notifier = &handler_obj->notify;
+                while (notifier) {
+                        notifier->handler(notify_info->notify.node,
+                                          notify_info->notify.value,
+                                          notifier->context);
+                        notifier = notifier->next;
+                }
         }
 
         /* All done with the info object */
 
-        acpi_ut_delete_generic_state(info);
+        acpi_ut_delete_generic_state(notify_info);
 }
 
-#if (!ACPI_REDUCED_HARDWARE)
 /******************************************************************************
  *
  * FUNCTION:    acpi_ev_terminate
@@ -291,5 +338,3 @@ void acpi_ev_terminate(void)
         }
         return_VOID;
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 0cc6a16fedc..f0edf5c43c0 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -150,7 +150,7 @@ acpi_status acpi_ev_install_region_handlers(void)
  *
  * FUNCTION:    acpi_ev_has_default_handler
  *
- * PARAMETERS:  node                - Namespace node for the device
+ * PARAMETERS:  Node                - Namespace node for the device
  *              space_id            - The address space ID
  *
  * RETURN:      TRUE if default handler is installed, FALSE otherwise
@@ -244,7 +244,7 @@ acpi_status acpi_ev_initialize_op_regions(void)
  * FUNCTION:    acpi_ev_execute_reg_method
  *
  * PARAMETERS:  region_obj          - Region object
- *              function            - Passed to _REG: On (1) or Off (0)
+ *              Function            - Passed to _REG: On (1) or Off (0)
  *
  * RETURN:      Status
  *
@@ -286,10 +286,10 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
         /*
          * The _REG method has two arguments:
          *
-         * arg0 - Integer:
+         * Arg0 - Integer:
          *  Operation region space ID Same value as region_obj->Region.space_id
          *
-         * arg1 - Integer:
+         * Arg1 - Integer:
          *  connection status 1 for connecting the handler, 0 for disconnecting
          *  the handler (Passed as a parameter)
          */
@@ -329,11 +329,10 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
  * FUNCTION:    acpi_ev_address_space_dispatch
  *
  * PARAMETERS:  region_obj          - Internal region object
- *              field_obj           - Corresponding field. Can be NULL.
- *              function            - Read or Write operation
+ *              Function            - Read or Write operation
  *              region_offset       - Where in the region to read or write
  *              bit_width           - Field width in bits (8, 16, 32, or 64)
- *              value               - Pointer to in or out value, must be
+ *              Value               - Pointer to in or out value, must be
  *                                    a full 64-bit integer
  *
  * RETURN:      Status
@@ -345,7 +344,6 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
-                               union acpi_operand_object *field_obj,
                                u32 function,
                                u32 region_offset, u32 bit_width, u64 *value)
 {
@@ -355,7 +353,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         union acpi_operand_object *handler_desc;
         union acpi_operand_object *region_obj2;
         void *region_context = NULL;
-        struct acpi_connection_info *context;
 
         ACPI_FUNCTION_TRACE(ev_address_space_dispatch);
 
@@ -378,8 +375,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
-        context = handler_desc->address_space.context;
-
         /*
          * It may be the case that the region has never been initialized.
          * Some types of regions require special init code
@@ -409,7 +404,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 acpi_ex_exit_interpreter();
 
                 status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
-                                      context, &region_context);
+                                      handler_desc->address_space.context,
+                                      &region_context);
 
                 /* Re-enter the interpreter */
 
@@ -459,25 +455,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                           acpi_ut_get_region_name(region_obj->region.
                                                   space_id)));
 
-        /*
-         * Special handling for generic_serial_bus and general_purpose_io:
-         * There are three extra parameters that must be passed to the
-         * handler via the context:
-         *   1) Connection buffer, a resource template from Connection() op.
-         *   2) Length of the above buffer.
-         *   3) Actual access length from the access_as() op.
-         */
-        if (((region_obj->region.space_id == ACPI_ADR_SPACE_GSBUS) ||
-             (region_obj->region.space_id == ACPI_ADR_SPACE_GPIO)) &&
-            context && field_obj) {
-
-                /* Get the Connection (resource_template) buffer */
-
-                context->connection = field_obj->field.resource_buffer;
-                context->length = field_obj->field.resource_length;
-                context->access_length = field_obj->field.access_length;
-        }
-
         if (!(handler_desc->address_space.handler_flags &
               ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
                 /*
@@ -492,7 +469,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
         status = handler(function,
                          (region_obj->region.address + region_offset),
-                         bit_width, value, context,
+                         bit_width, value, handler_desc->address_space.context,
                          region_obj2->extra.region_context);
 
         if (ACPI_FAILURE(status)) {
@@ -840,11 +817,11 @@ acpi_ev_install_handler(acpi_handle obj_handle,
  *
  * FUNCTION:    acpi_ev_install_space_handler
  *
- * PARAMETERS:  node            - Namespace node for the device
+ * PARAMETERS:  Node            - Namespace node for the device
  *              space_id        - The address space ID
- *              handler         - Address of the handler
- *              setup           - Address of the setup function
- *              context         - Value passed to the handler on each access
+ *              Handler         - Address of the handler
+ *              Setup           - Address of the setup function
+ *              Context         - Value passed to the handler on each access
  *
  * RETURN:      Status
  *
@@ -1061,7 +1038,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
  *
  * FUNCTION:    acpi_ev_execute_reg_methods
  *
- * PARAMETERS:  node            - Namespace node for the device
+ * PARAMETERS:  Node            - Namespace node for the device
  *              space_id        - The address space ID
  *
  * RETURN:      Status
@@ -1104,7 +1081,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
  *
  * PARAMETERS:  walk_namespace callback
  *
- * DESCRIPTION: Run _REG method for region objects of the requested spaceID
+ * DESCRIPTION: Run _REG method for region objects of the requested space_iD
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 1474241bfc7..55a5d35ef34 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,8 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);
  *
  * FUNCTION:    acpi_ev_system_memory_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
@@ -118,8 +118,8 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
  *
  * FUNCTION:    acpi_ev_io_space_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
@@ -149,8 +149,8 @@ acpi_ev_io_space_region_setup(acpi_handle handle,
  *
  * FUNCTION:    acpi_ev_pci_config_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
@@ -227,7 +227,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) {
                                                 /*
@@ -337,7 +338,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
  *
  * FUNCTION:    acpi_ev_is_pci_root_bridge
  *
- * PARAMETERS:  node            - Device node being examined
+ * PARAMETERS:  Node            - Device node being examined
  *
  * RETURN:      TRUE if device is a PCI/PCI-Express Root Bridge
  *
@@ -349,8 +350,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
 {
         acpi_status status;
-        struct acpi_pnp_device_id *hid;
-        struct acpi_pnp_device_id_list *cid;
+        struct acpica_device_id *hid;
+        struct acpica_device_id_list *cid;
         u32 i;
         u8 match;
 
@@ -392,14 +393,14 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
  *
  * FUNCTION:    acpi_ev_pci_bar_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Setup a pci_BAR operation region
+ * DESCRIPTION: Setup a pci_bAR operation region
  *
  * MUTEX:       Assumes namespace is not locked
  *
@@ -419,8 +420,8 @@ acpi_ev_pci_bar_region_setup(acpi_handle handle,
  *
  * FUNCTION:    acpi_ev_cmos_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
@@ -446,8 +447,8 @@ acpi_ev_cmos_region_setup(acpi_handle handle,
  *
  * FUNCTION:    acpi_ev_default_region_setup
  *
- * PARAMETERS:  handle              - Region we are interested in
- *              function            - Start or stop
+ * PARAMETERS:  Handle              - Region we are interested in
+ *              Function            - Start or stop
  *              handler_context     - Address space handler context
  *              region_context      - Region specific context
  *
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index f9661e2b46a..2ebd40e1a3e 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evsci")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context);
 
@@ -56,7 +56,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context);
  *
  * FUNCTION:    acpi_ev_sci_xrupt_handler
  *
- * PARAMETERS:  context   - Calling Context
+ * PARAMETERS:  Context   - Calling Context
  *
  * RETURN:      Status code indicates whether interrupt was handled.
  *
@@ -96,7 +96,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
  *
  * FUNCTION:    acpi_ev_gpe_xrupt_handler
  *
- * PARAMETERS:  context   - Calling Context
+ * PARAMETERS:  Context   - Calling Context
  *
  * RETURN:      Status code indicates whether interrupt was handled.
  *
@@ -181,5 +181,3 @@ acpi_status acpi_ev_remove_sci_handler(void)
 
         return_ACPI_STATUS(status);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index ae668f32cf1..e1141402dbe 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -51,298 +50,11 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxface")
 
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_install_notify_handler
- *
- * PARAMETERS:  Device          - The device for which notifies will be handled
- *              handler_type    - The type of handler:
- *                                  ACPI_SYSTEM_NOTIFY: System Handler (00-7F)
- *                                  ACPI_DEVICE_NOTIFY: Device Handler (80-FF)
- *                                  ACPI_ALL_NOTIFY:    Both System and Device
- *              Handler         - Address of the handler
- *              Context         - Value passed to the handler on each GPE
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Install a handler for notifications on an ACPI Device,
- *              thermal_zone, or Processor object.
- *
- * NOTES:       The Root namespace object may have only one handler for each
- *              type of notify (System/Device). Device/Thermal/Processor objects
- *              may have one device notify handler, and multiple system notify
- *              handlers.
- *
- ******************************************************************************/
-acpi_status
-acpi_install_notify_handler(acpi_handle device,
-                            u32 handler_type,
-                            acpi_notify_handler handler, void *context)
-{
-        struct acpi_namespace_node *node =
-            ACPI_CAST_PTR(struct acpi_namespace_node, device);
-        union acpi_operand_object *obj_desc;
-        union acpi_operand_object *handler_obj;
-        acpi_status status;
-        u32 i;
-
-        ACPI_FUNCTION_TRACE(acpi_install_notify_handler);
-
-        /* Parameter validation */
-
-        if ((!device) || (!handler) || (!handler_type) ||
-            (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * Root Object:
-         * Registering a notify handler on the root object indicates that the
-         * caller wishes to receive notifications for all objects. Note that
-         * only one global handler can be registered per notify type.
-         * Ensure that a handler is not already installed.
-         */
-        if (device == ACPI_ROOT_OBJECT) {
-                for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                        if (handler_type & (i + 1)) {
-                                if (acpi_gbl_global_notify[i].handler) {
-                                        status = AE_ALREADY_EXISTS;
-                                        goto unlock_and_exit;
-                                }
-
-                                acpi_gbl_global_notify[i].handler = handler;
-                                acpi_gbl_global_notify[i].context = context;
-                        }
-                }
-
-                goto unlock_and_exit;   /* Global notify handler installed, all done */
-        }
-
-        /*
-         * All Other Objects:
-         * Caller will only receive notifications specific to the target
-         * object. Note that only certain object types are allowed to
-         * receive notifications.
-         */
-
-        /* Are Notifies allowed on this object? */
-
-        if (!acpi_ev_is_notify_object(node)) {
-                status = AE_TYPE;
-                goto unlock_and_exit;
-        }
-
-        /* Check for an existing internal object, might not exist */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc) {
-
-                /* Create a new object */
-
-                obj_desc = acpi_ut_create_internal_object(node->type);
-                if (!obj_desc) {
-                        status = AE_NO_MEMORY;
-                        goto unlock_and_exit;
-                }
-
-                /* Attach new object to the Node, remove local reference */
-
-                status = acpi_ns_attach_object(device, obj_desc, node->type);
-                acpi_ut_remove_reference(obj_desc);
-                if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
-                }
-        }
-
-        /* Ensure that the handler is not already installed in the lists */
-
-        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                if (handler_type & (i + 1)) {
-                        handler_obj = obj_desc->common_notify.notify_list[i];
-                        while (handler_obj) {
-                                if (handler_obj->notify.handler == handler) {
-                                        status = AE_ALREADY_EXISTS;
-                                        goto unlock_and_exit;
-                                }
-
-                                handler_obj = handler_obj->notify.next[i];
-                        }
-                }
-        }
-
-        /* Create and populate a new notify handler object */
-
-        handler_obj = acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_NOTIFY);
-        if (!handler_obj) {
-                status = AE_NO_MEMORY;
-                goto unlock_and_exit;
-        }
-
-        handler_obj->notify.node = node;
-        handler_obj->notify.handler_type = handler_type;
-        handler_obj->notify.handler = handler;
-        handler_obj->notify.context = context;
-
-        /* Install the handler at the list head(s) */
-
-        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                if (handler_type & (i + 1)) {
-                        handler_obj->notify.next[i] =
-                            obj_desc->common_notify.notify_list[i];
-
-                        obj_desc->common_notify.notify_list[i] = handler_obj;
-                }
-        }
-
-        /* Add an extra reference if handler was installed in both lists */
-
-        if (handler_type == ACPI_ALL_NOTIFY) {
-                acpi_ut_add_reference(handler_obj);
-        }
-
-unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_install_notify_handler)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_remove_notify_handler
- *
- * PARAMETERS:  Device          - The device for which the handler is installed
- *              handler_type    - The type of handler:
- *                                  ACPI_SYSTEM_NOTIFY: System Handler (00-7F)
- *                                  ACPI_DEVICE_NOTIFY: Device Handler (80-FF)
- *                                  ACPI_ALL_NOTIFY:    Both System and Device
- *              Handler         - Address of the handler
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove a handler for notifies on an ACPI device
- *
- ******************************************************************************/
-acpi_status
-acpi_remove_notify_handler(acpi_handle device,
-                           u32 handler_type, acpi_notify_handler handler)
-{
-        struct acpi_namespace_node *node =
-            ACPI_CAST_PTR(struct acpi_namespace_node, device);
-        union acpi_operand_object *obj_desc;
-        union acpi_operand_object *handler_obj;
-        union acpi_operand_object *previous_handler_obj;
-        acpi_status status;
-        u32 i;
-
-        ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
-
-        /* Parameter validation */
-
-        if ((!device) || (!handler) || (!handler_type) ||
-            (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Make sure all deferred tasks are completed */
-
-        acpi_os_wait_events_complete();
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Root Object. Global handlers are removed here */
-
-        if (device == ACPI_ROOT_OBJECT) {
-                for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                        if (handler_type & (i + 1)) {
-                                if (!acpi_gbl_global_notify[i].handler ||
-                                    (acpi_gbl_global_notify[i].handler !=
-                                     handler)) {
-                                        status = AE_NOT_EXIST;
-                                        goto unlock_and_exit;
-                                }
-
-                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                  "Removing global notify handler\n"));
-
-                                acpi_gbl_global_notify[i].handler = NULL;
-                                acpi_gbl_global_notify[i].context = NULL;
-                        }
-                }
-
-                goto unlock_and_exit;
-        }
-
-        /* All other objects: Are Notifies allowed on this object? */
-
-        if (!acpi_ev_is_notify_object(node)) {
-                status = AE_TYPE;
-                goto unlock_and_exit;
-        }
-
-        /* Must have an existing internal object */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc) {
-                status = AE_NOT_EXIST;
-                goto unlock_and_exit;
-        }
-
-        /* Internal object exists. Find the handler and remove it */
-
-        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                if (handler_type & (i + 1)) {
-                        handler_obj = obj_desc->common_notify.notify_list[i];
-                        previous_handler_obj = NULL;
-
-                        /* Attempt to find the handler in the handler list */
-
-                        while (handler_obj &&
-                               (handler_obj->notify.handler != handler)) {
-                                previous_handler_obj = handler_obj;
-                                handler_obj = handler_obj->notify.next[i];
-                        }
-
-                        if (!handler_obj) {
-                                status = AE_NOT_EXIST;
-                                goto unlock_and_exit;
-                        }
-
-                        /* Remove the handler object from the list */
-
-                        if (previous_handler_obj) {     /* Handler is not at the list head */
-                                previous_handler_obj->notify.next[i] =
-                                    handler_obj->notify.next[i];
-                        } else {        /* Handler is at the list head */
-
-                                obj_desc->common_notify.notify_list[i] =
-                                    handler_obj->notify.next[i];
-                        }
-
-                        acpi_ut_remove_reference(handler_obj);
-                }
-        }
-
-unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_exception_handler
  *
- * PARAMETERS:  handler         - Pointer to the handler function for the
+ * PARAMETERS:  Handler         - Pointer to the handler function for the
  *                                event
  *
  * RETURN:      Status
@@ -381,13 +93,12 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
 
-#if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_global_event_handler
  *
- * PARAMETERS:  handler         - Pointer to the global event handler function
- *              context         - Value passed to the handler on each event
+ * PARAMETERS:  Handler         - Pointer to the global event handler function
+ *              Context         - Value passed to the handler on each event
  *
  * RETURN:      Status
  *
@@ -398,7 +109,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
  *
  ******************************************************************************/
 acpi_status
-acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)
+acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)
 {
         acpi_status status;
 
@@ -436,10 +147,10 @@ ACPI_EXPORT_SYMBOL(acpi_install_global_event_handler)
  *
  * FUNCTION:    acpi_install_fixed_event_handler
  *
- * PARAMETERS:  event           - Event type to enable.
- *              handler         - Pointer to the handler function for the
+ * PARAMETERS:  Event           - Event type to enable.
+ *              Handler         - Pointer to the handler function for the
  *                                event
- *              context         - Value passed to the handler on each GPE
+ *              Context         - Value passed to the handler on each GPE
  *
  * RETURN:      Status
  *
@@ -506,8 +217,8 @@ ACPI_EXPORT_SYMBOL(acpi_install_fixed_event_handler)
  *
  * FUNCTION:    acpi_remove_fixed_event_handler
  *
- * PARAMETERS:  event           - Event type to disable.
- *              handler         - Address of the handler
+ * PARAMETERS:  Event           - Event type to disable.
+ *              Handler         - Address of the handler
  *
  * RETURN:      Status
  *
@@ -558,15 +269,450 @@ ACPI_EXPORT_SYMBOL(acpi_remove_fixed_event_handler)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_populate_handler_object
+ *
+ * PARAMETERS:  handler_obj        - Handler object to populate
+ *              handler_type       - The type of handler:
+ *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
+ *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
+ *                                  ACPI_ALL_NOTIFY:  both system and device
+ *              handler            - Address of the handler
+ *              context            - Value passed to the handler on each GPE
+ *              next               - Address of a handler object to link to
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Populate a handler object.
+ *
+ ******************************************************************************/
+static void
+acpi_populate_handler_object(struct acpi_object_notify_handler *handler_obj,
+                             u32 handler_type,
+                             acpi_notify_handler handler, void *context,
+                             struct acpi_object_notify_handler *next)
+{
+        handler_obj->handler_type = handler_type;
+        handler_obj->handler = handler;
+        handler_obj->context = context;
+        handler_obj->next = next;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_add_handler_object
+ *
+ * PARAMETERS:  parent_obj         - Parent of the new object
+ *              handler            - Address of the handler
+ *              context            - Value passed to the handler on each GPE
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a new handler object and populate it.
+ *
+ ******************************************************************************/
+static acpi_status
+acpi_add_handler_object(struct acpi_object_notify_handler *parent_obj,
+                        acpi_notify_handler handler, void *context)
+{
+        struct acpi_object_notify_handler *handler_obj;
+
+        /* The parent must not be a defice notify handler object. */
+        if (parent_obj->handler_type & ACPI_DEVICE_NOTIFY)
+                return AE_BAD_PARAMETER;
+
+        handler_obj = ACPI_ALLOCATE_ZEROED(sizeof(*handler_obj));
+        if (!handler_obj)
+                return AE_NO_MEMORY;
+
+        acpi_populate_handler_object(handler_obj,
+                                        ACPI_SYSTEM_NOTIFY,
+                                        handler, context,
+                                        parent_obj->next);
+        parent_obj->next = handler_obj;
+
+        return AE_OK;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_notify_handler
+ *
+ * PARAMETERS:  Device          - The device for which notifies will be handled
+ *              handler_type    - The type of handler:
+ *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
+ *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
+ *                                  ACPI_ALL_NOTIFY:  both system and device
+ *              Handler         - Address of the handler
+ *              Context         - Value passed to the handler on each GPE
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Install a handler for notifies on an ACPI device
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_notify_handler(acpi_handle device,
+                            u32 handler_type,
+                            acpi_notify_handler handler, void *context)
+{
+        union acpi_operand_object *obj_desc;
+        union acpi_operand_object *notify_obj;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_install_notify_handler);
+
+        /* Parameter validation */
+
+        if ((!device) ||
+            (!handler) || (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Convert and validate the device handle */
+
+        node = acpi_ns_validate_handle(device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /*
+         * Root Object:
+         * Registering a notify handler on the root object indicates that the
+         * caller wishes to receive notifications for all objects. Note that
+         * only one <external> global handler can be regsitered (per notify type).
+         */
+        if (device == ACPI_ROOT_OBJECT) {
+
+                /* Make sure the handler is not already installed */
+
+                if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
+                     acpi_gbl_system_notify.handler) ||
+                    ((handler_type & ACPI_DEVICE_NOTIFY) &&
+                     acpi_gbl_device_notify.handler)) {
+                        status = AE_ALREADY_EXISTS;
+                        goto unlock_and_exit;
+                }
+
+                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                        acpi_gbl_system_notify.node = node;
+                        acpi_gbl_system_notify.handler = handler;
+                        acpi_gbl_system_notify.context = context;
+                }
+
+                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                        acpi_gbl_device_notify.node = node;
+                        acpi_gbl_device_notify.handler = handler;
+                        acpi_gbl_device_notify.context = context;
+                }
+
+                /* Global notify handler installed */
+        }
+
+        /*
+         * All Other Objects:
+         * Caller will only receive notifications specific to the target object.
+         * Note that only certain object types can receive notifications.
+         */
+        else {
+                /* Notifies allowed on this object? */
+
+                if (!acpi_ev_is_notify_object(node)) {
+                        status = AE_TYPE;
+                        goto unlock_and_exit;
+                }
+
+                /* Check for an existing internal object */
+
+                obj_desc = acpi_ns_get_attached_object(node);
+                if (obj_desc) {
+
+                        /* Object exists. */
+
+                        /* For a device notify, make sure there's no handler. */
+                        if ((handler_type & ACPI_DEVICE_NOTIFY) &&
+                             obj_desc->common_notify.device_notify) {
+                                status = AE_ALREADY_EXISTS;
+                                goto unlock_and_exit;
+                        }
+
+                        /* System notifies may have more handlers installed. */
+                        notify_obj = obj_desc->common_notify.system_notify;
+
+                        if ((handler_type & ACPI_SYSTEM_NOTIFY) && notify_obj) {
+                                struct acpi_object_notify_handler *parent_obj;
+
+                                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                                        status = AE_ALREADY_EXISTS;
+                                        goto unlock_and_exit;
+                                }
+
+                                parent_obj = &notify_obj->notify;
+                                status = acpi_add_handler_object(parent_obj,
+                                                                 handler,
+                                                                 context);
+                                goto unlock_and_exit;
+                        }
+                } else {
+                        /* Create a new object */
+
+                        obj_desc = acpi_ut_create_internal_object(node->type);
+                        if (!obj_desc) {
+                                status = AE_NO_MEMORY;
+                                goto unlock_and_exit;
+                        }
+
+                        /* Attach new object to the Node */
+
+                        status =
+                            acpi_ns_attach_object(device, obj_desc, node->type);
+
+                        /* Remove local reference to the object */
+
+                        acpi_ut_remove_reference(obj_desc);
+                        if (ACPI_FAILURE(status)) {
+                                goto unlock_and_exit;
+                        }
+                }
+
+                /* Install the handler */
+
+                notify_obj =
+                    acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_NOTIFY);
+                if (!notify_obj) {
+                        status = AE_NO_MEMORY;
+                        goto unlock_and_exit;
+                }
+
+                acpi_populate_handler_object(&notify_obj->notify,
+                                                handler_type,
+                                                handler, context,
+                                                NULL);
+
+                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                        obj_desc->common_notify.system_notify = notify_obj;
+                }
+
+                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                        obj_desc->common_notify.device_notify = notify_obj;
+                }
+
+                if (handler_type == ACPI_ALL_NOTIFY) {
+
+                        /* Extra ref if installed in both */
+
+                        acpi_ut_add_reference(notify_obj);
+                }
+        }
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_notify_handler)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_remove_notify_handler
+ *
+ * PARAMETERS:  Device          - The device for which notifies will be handled
+ *              handler_type    - The type of handler:
+ *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
+ *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
+ *                                  ACPI_ALL_NOTIFY:  both system and device
+ *              Handler         - Address of the handler
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a handler for notifies on an ACPI device
+ *
+ ******************************************************************************/
+acpi_status
+acpi_remove_notify_handler(acpi_handle device,
+                           u32 handler_type, acpi_notify_handler handler)
+{
+        union acpi_operand_object *notify_obj;
+        union acpi_operand_object *obj_desc;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
+
+        /* Parameter validation */
+
+        if ((!device) ||
+            (!handler) || (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
+                status = AE_BAD_PARAMETER;
+                goto exit;
+        }
+
+
+        /* Make sure all deferred tasks are completed */
+        acpi_os_wait_events_complete(NULL);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                goto exit;
+        }
+
+        /* Convert and validate the device handle */
+
+        node = acpi_ns_validate_handle(device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /* Root Object */
+
+        if (device == ACPI_ROOT_OBJECT) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Removing notify handler for namespace root object\n"));
+
+                if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
+                     !acpi_gbl_system_notify.handler) ||
+                    ((handler_type & ACPI_DEVICE_NOTIFY) &&
+                     !acpi_gbl_device_notify.handler)) {
+                        status = AE_NOT_EXIST;
+                        goto unlock_and_exit;
+                }
+
+                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                        acpi_gbl_system_notify.node = NULL;
+                        acpi_gbl_system_notify.handler = NULL;
+                        acpi_gbl_system_notify.context = NULL;
+                }
+
+                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                        acpi_gbl_device_notify.node = NULL;
+                        acpi_gbl_device_notify.handler = NULL;
+                        acpi_gbl_device_notify.context = NULL;
+                }
+        }
+
+        /* All Other Objects */
+
+        else {
+                /* Notifies allowed on this object? */
+
+                if (!acpi_ev_is_notify_object(node)) {
+                        status = AE_TYPE;
+                        goto unlock_and_exit;
+                }
+
+                /* Check for an existing internal object */
+
+                obj_desc = acpi_ns_get_attached_object(node);
+                if (!obj_desc) {
+                        status = AE_NOT_EXIST;
+                        goto unlock_and_exit;
+                }
+
+                /* Object exists - make sure there's an existing handler */
+
+                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                        struct acpi_object_notify_handler *handler_obj;
+                        struct acpi_object_notify_handler *parent_obj;
+
+                        notify_obj = obj_desc->common_notify.system_notify;
+                        if (!notify_obj) {
+                                status = AE_NOT_EXIST;
+                                goto unlock_and_exit;
+                        }
+
+                        handler_obj = &notify_obj->notify;
+                        parent_obj = NULL;
+                        while (handler_obj->handler != handler) {
+                                if (handler_obj->next) {
+                                        parent_obj = handler_obj;
+                                        handler_obj = handler_obj->next;
+                                } else {
+                                        break;
+                                }
+                        }
+
+                        if (handler_obj->handler != handler) {
+                                status = AE_BAD_PARAMETER;
+                                goto unlock_and_exit;
+                        }
+
+                        /*
+                         * Remove the handler.  There are three possible cases.
+                         * First, we may need to remove a non-embedded object.
+                         * Second, we may need to remove the embedded object's
+                         * handler data, while non-embedded objects exist.
+                         * Finally, we may need to remove the embedded object
+                         * entirely along with its container.
+                         */
+                        if (parent_obj) {
+                                /* Non-embedded object is being removed. */
+                                parent_obj->next = handler_obj->next;
+                                ACPI_FREE(handler_obj);
+                        } else if (notify_obj->notify.next) {
+                                /*
+                                 * The handler matches the embedded object, but
+                                 * there are more handler objects in the list.
+                                 * Replace the embedded object's data with the
+                                 * first next object's data and remove that
+                                 * object.
+                                 */
+                                parent_obj = &notify_obj->notify;
+                                handler_obj = notify_obj->notify.next;
+                                *parent_obj = *handler_obj;
+                                ACPI_FREE(handler_obj);
+                        } else {
+                                /* No more handler objects in the list. */
+                                obj_desc->common_notify.system_notify = NULL;
+                                acpi_ut_remove_reference(notify_obj);
+                        }
+                }
+
+                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                        notify_obj = obj_desc->common_notify.device_notify;
+                        if (!notify_obj) {
+                                status = AE_NOT_EXIST;
+                                goto unlock_and_exit;
+                        }
+
+                        if (notify_obj->notify.handler != handler) {
+                                status = AE_BAD_PARAMETER;
+                                goto unlock_and_exit;
+                        }
+
+                        /* Remove the handler */
+                        obj_desc->common_notify.device_notify = NULL;
+                        acpi_ut_remove_reference(notify_obj);
+                }
+        }
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+      exit:
+        if (ACPI_FAILURE(status))
+                ACPI_EXCEPTION((AE_INFO, status, "Removing notify handler"));
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_install_gpe_handler
  *
  * PARAMETERS:  gpe_device      - Namespace node for the GPE (NULL for FADT
  *                                defined GPEs)
  *              gpe_number      - The GPE number within the GPE block
- *              type            - Whether this GPE should be treated as an
+ *              Type            - Whether this GPE should be treated as an
  *                                edge- or level-triggered interrupt.
- *              address         - Address of the handler
- *              context         - Value passed to the handler on each GPE
+ *              Address         - Address of the handler
+ *              Context         - Value passed to the handler on each GPE
  *
  * RETURN:      Status
  *
@@ -673,7 +819,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)
  * PARAMETERS:  gpe_device      - Namespace node for the GPE (NULL for FADT
  *                                defined GPEs)
  *              gpe_number      - The event to remove a handler
- *              address         - Address of the handler
+ *              Address         - Address of the handler
  *
  * RETURN:      Status
  *
@@ -699,7 +845,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
 
         /* Make sure all deferred tasks are completed */
 
-        acpi_os_wait_events_complete();
+        acpi_os_wait_events_complete(NULL);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
@@ -769,8 +915,8 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_handler)
  *
  * FUNCTION:    acpi_acquire_global_lock
  *
- * PARAMETERS:  timeout         - How long the caller is willing to wait
- *              handle          - Where the handle to the lock is returned
+ * PARAMETERS:  Timeout         - How long the caller is willing to wait
+ *              Handle          - Where the handle to the lock is returned
  *                                (if acquired)
  *
  * RETURN:      Status
@@ -817,7 +963,7 @@ ACPI_EXPORT_SYMBOL(acpi_acquire_global_lock)
  *
  * FUNCTION:    acpi_release_global_lock
  *
- * PARAMETERS:  handle      - Returned from acpi_acquire_global_lock
+ * PARAMETERS:  Handle      - Returned from acpi_acquire_global_lock
  *
  * RETURN:      Status
  *
@@ -837,4 +983,3 @@ acpi_status acpi_release_global_lock(u32 handle)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_release_global_lock)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 35520c6eeef..c57b5c707a7 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "actables.h"
@@ -49,7 +48,6 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable
@@ -153,8 +151,8 @@ ACPI_EXPORT_SYMBOL(acpi_disable)
  *
  * FUNCTION:    acpi_enable_event
  *
- * PARAMETERS:  event           - The fixed eventto be enabled
- *              flags           - Reserved
+ * PARAMETERS:  Event           - The fixed eventto be enabled
+ *              Flags           - Reserved
  *
  * RETURN:      Status
  *
@@ -265,7 +263,7 @@ ACPI_EXPORT_SYMBOL(acpi_disable_event)
  *
  * FUNCTION:    acpi_clear_event
  *
- * PARAMETERS:  event           - The fixed event to be cleared
+ * PARAMETERS:  Event           - The fixed event to be cleared
  *
  * RETURN:      Status
  *
@@ -301,7 +299,7 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
  *
  * FUNCTION:    acpi_get_event_status
  *
- * PARAMETERS:  event           - The fixed event
+ * PARAMETERS:  Event           - The fixed event
  *              event_status    - Where the current status of the event will
  *                                be returned
  *
@@ -353,4 +351,3 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_event_status)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 3f30e753b65..52aaff3df56 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
@@ -50,7 +49,6 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfgpe")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /******************************************************************************
  *
  * FUNCTION:    acpi_update_all_gpes
@@ -197,12 +195,12 @@ acpi_status
 acpi_setup_gpe_for_wake(acpi_handle wake_device,
                         acpi_handle gpe_device, u32 gpe_number)
 {
-        acpi_status status;
+        acpi_status status = AE_BAD_PARAMETER;
         struct acpi_gpe_event_info *gpe_event_info;
         struct acpi_namespace_node *device_node;
-        struct acpi_gpe_notify_info *notify;
-        struct acpi_gpe_notify_info *new_notify;
+        struct acpi_gpe_notify_object *notify_object;
         acpi_cpu_flags flags;
+        u8 gpe_dispatch_mask;
 
         ACPI_FUNCTION_TRACE(acpi_setup_gpe_for_wake);
 
@@ -216,96 +214,63 @@ acpi_setup_gpe_for_wake(acpi_handle wake_device,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Handle root object case */
-
-        if (wake_device == ACPI_ROOT_OBJECT) {
-                device_node = acpi_gbl_root_node;
-        } else {
-                device_node =
-                    ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
-        }
-
-        /* Validate WakeDevice is of type Device */
-
-        if (device_node->type != ACPI_TYPE_DEVICE) {
-                return_ACPI_STATUS (AE_BAD_PARAMETER);
-        }
-
-        /*
-         * Allocate a new notify object up front, in case it is needed.
-         * Memory allocation while holding a spinlock is a big no-no
-         * on some hosts.
-         */
-        new_notify = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_notify_info));
-        if (!new_notify) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
         /* Ensure that we have a valid GPE number */
 
         gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
         if (!gpe_event_info) {
-                status = AE_BAD_PARAMETER;
                 goto unlock_and_exit;
         }
 
+        if (wake_device == ACPI_ROOT_OBJECT) {
+                goto out;
+        }
+
         /*
          * If there is no method or handler for this GPE, then the
-         * wake_device will be notified whenever this GPE fires. This is
-         * known as an "implicit notify". Note: The GPE is assumed to be
+         * wake_device will be notified whenever this GPE fires (aka
+         * "implicit notify") Note: The GPE is assumed to be
          * level-triggered (for windows compatibility).
          */
-        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-            ACPI_GPE_DISPATCH_NONE) {
-                /*
-                 * This is the first device for implicit notify on this GPE.
-                 * Just set the flags here, and enter the NOTIFY block below.
-                 */
-                gpe_event_info->flags =
-                    (ACPI_GPE_DISPATCH_NOTIFY | ACPI_GPE_LEVEL_TRIGGERED);
+        gpe_dispatch_mask = gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK;
+        if (gpe_dispatch_mask != ACPI_GPE_DISPATCH_NONE
+            && gpe_dispatch_mask != ACPI_GPE_DISPATCH_NOTIFY) {
+                goto out;
         }
 
-        /*
-         * If we already have an implicit notify on this GPE, add
-         * this device to the notify list.
-         */
-        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-            ACPI_GPE_DISPATCH_NOTIFY) {
-
-                /* Ensure that the device is not already in the list */
-
-                notify = gpe_event_info->dispatch.notify_list;
-                while (notify) {
-                        if (notify->device_node == device_node) {
-                                status = AE_ALREADY_EXISTS;
-                                goto unlock_and_exit;
-                        }
-                        notify = notify->next;
-                }
+        /* Validate wake_device is of type Device */
 
-                /* Add this device to the notify list for this GPE */
-
-                new_notify->device_node = device_node;
-                new_notify->next = gpe_event_info->dispatch.notify_list;
-                gpe_event_info->dispatch.notify_list = new_notify;
-                new_notify = NULL;
+        device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
+        if (device_node->type != ACPI_TYPE_DEVICE) {
+                goto unlock_and_exit;
         }
 
-        /* Mark the GPE as a possible wake event */
+        if (gpe_dispatch_mask == ACPI_GPE_DISPATCH_NONE) {
+                gpe_event_info->flags = (ACPI_GPE_DISPATCH_NOTIFY |
+                                         ACPI_GPE_LEVEL_TRIGGERED);
+                gpe_event_info->dispatch.device.node = device_node;
+                gpe_event_info->dispatch.device.next = NULL;
+        } else {
+                /* There are multiple devices to notify implicitly. */
+
+                notify_object = ACPI_ALLOCATE_ZEROED(sizeof(*notify_object));
+                if (!notify_object) {
+                        status = AE_NO_MEMORY;
+                        goto unlock_and_exit;
+                }
 
+                notify_object->node = device_node;
+                notify_object->next = gpe_event_info->dispatch.device.next;
+                gpe_event_info->dispatch.device.next = notify_object;
+        }
+
+ out:
         gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
         status = AE_OK;
 
-unlock_and_exit:
+ unlock_and_exit:
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-
-        /* Delete the notify object if it was not used above */
-
-        if (new_notify) {
-                ACPI_FREE(new_notify);
-        }
         return_ACPI_STATUS(status);
 }
 ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
@@ -316,7 +281,7 @@ ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
  *
  * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              action              - Enable or Disable
+ *              Action          - Enable or Disable
  *
  * RETURN:      Status
  *
@@ -325,8 +290,7 @@ ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
  *
  ******************************************************************************/
 
-acpi_status
-acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
+acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
 {
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
@@ -359,7 +323,8 @@ acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
                 goto unlock_and_exit;
         }
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
+        register_bit =
+            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
 
         /* Perform the action */
 
@@ -541,7 +506,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_all_runtime_gpes)
  * FUNCTION:    acpi_install_gpe_block
  *
  * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *              gpe_block_address   - Address and space_ID
+ *              gpe_block_address   - Address and space_iD
  *              register_count      - Number of GPE register pairs in the block
  *              interrupt_number    - H/W interrupt for the block
  *
@@ -569,7 +534,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                return (status);
         }
 
         node = acpi_ns_validate_handle(gpe_device);
@@ -652,7 +617,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                return (status);
         }
 
         node = acpi_ns_validate_handle(gpe_device);
@@ -686,7 +651,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
  *
  * FUNCTION:    acpi_get_gpe_device
  *
- * PARAMETERS:  index               - System GPE index (0-current_gpe_count)
+ * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
  *              gpe_device          - Where the parent GPE Device is returned
  *
  * RETURN:      Status
@@ -696,7 +661,8 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
  *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
  *
  ******************************************************************************/
-acpi_status acpi_get_gpe_device(u32 index, acpi_handle * gpe_device)
+acpi_status
+acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
 {
         struct acpi_gpe_device_info info;
         acpi_status status;
@@ -728,4 +694,3 @@ acpi_status acpi_get_gpe_device(u32 index, acpi_handle * gpe_device)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 96b412d0395..00cd95692a9 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -55,11 +54,11 @@ ACPI_MODULE_NAME("evxfregn")
  *
  * FUNCTION:    acpi_install_address_space_handler
  *
- * PARAMETERS:  device          - Handle for the device
+ * PARAMETERS:  Device          - Handle for the device
  *              space_id        - The address space ID
- *              handler         - Address of the handler
- *              setup           - Address of the setup function
- *              context         - Value passed to the handler on each access
+ *              Handler         - Address of the handler
+ *              Setup           - Address of the setup function
+ *              Context         - Value passed to the handler on each access
  *
  * RETURN:      Status
  *
@@ -112,16 +111,16 @@ acpi_install_address_space_handler(acpi_handle device,
         }
 
         /*
-         * For the default space_IDs, (the IDs for which there are default region handlers
+         * For the default space_iDs, (the IDs for which there are default region handlers
          * installed) Only execute the _REG methods if the global initialization _REG
          * methods have already been run (via acpi_initialize_objects). In other words,
-         * we will defer the execution of the _REG methods for these space_IDs until
+         * we will defer the execution of the _REG methods for these space_iDs until
          * execution of acpi_initialize_objects. This is done because we need the handlers
          * for the default spaces (mem/io/pci/table) to be installed before we can run
          * any control methods (or _REG methods). There is known BIOS code that depends
          * on this.
          *
-         * For all other space_IDs, we can safely execute the _REG methods immediately.
+         * For all other space_iDs, we can safely execute the _REG methods immediately.
          * This means that for IDs like embedded_controller, this function should be called
          * only after acpi_enable_subsystem has been called.
          */
@@ -157,9 +156,9 @@ ACPI_EXPORT_SYMBOL(acpi_install_address_space_handler)
  *
  * FUNCTION:    acpi_remove_address_space_handler
  *
- * PARAMETERS:  device          - Handle for the device
+ * PARAMETERS:  Device          - Handle for the device
  *              space_id        - The address space ID
- *              handler         - Address of the handler
+ *              Handler         - Address of the handler
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 16219bde48d..745a42b401f 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_add_table
  *
- * PARAMETERS:  table               - Pointer to raw table
+ * PARAMETERS:  Table               - Pointer to raw table
  *              parent_node         - Where to load the table (scope)
  *              ddb_handle          - Where to return the table handle.
  *
@@ -276,8 +276,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ex_region_read
  *
  * PARAMETERS:  obj_desc        - Region descriptor
- *              length          - Number of bytes to read
- *              buffer          - Pointer to where to put the data
+ *              Length          - Number of bytes to read
+ *              Buffer          - Pointer to where to put the data
  *
  * RETURN:      Status
  *
@@ -297,9 +297,9 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
         /* Bytewise reads */
 
         for (i = 0; i < length; i++) {
-                status =
-                    acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ,
-                                                   region_offset, 8, &value);
+                status = acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
+                                                        region_offset, 8,
+                                                        &value);
                 if (ACPI_FAILURE(status)) {
                         return status;
                 }
@@ -318,7 +318,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
  *
  * PARAMETERS:  obj_desc        - Region or Buffer/Field where the table will be
  *                                obtained
- *              target          - Where a handle to the table will be stored
+ *              Target          - Where a handle to the table will be stored
  *              walk_state      - Current state
  *
  * RETURN:      Status
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 4492a4e0302..74162a11817 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 max_length);
  * PARAMETERS:  obj_desc        - Object to be converted. Must be an
  *                                Integer, Buffer, or String
  *              result_desc     - Where the new Integer object is returned
- *              flags           - Used for string conversion
+ *              Flags           - Used for string conversion
  *
  * RETURN:      Status
  *
@@ -272,9 +272,9 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_convert_to_ascii
  *
- * PARAMETERS:  integer         - Value to be converted
- *              base            - ACPI_STRING_DECIMAL or ACPI_STRING_HEX
- *              string          - Where the string is returned
+ * PARAMETERS:  Integer         - Value to be converted
+ *              Base            - ACPI_STRING_DECIMAL or ACPI_STRING_HEX
+ *              String          - Where the string is returned
  *              data_width      - Size of data item to be converted, in bytes
  *
  * RETURN:      Actual string length
@@ -385,7 +385,7 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
  * PARAMETERS:  obj_desc        - Object to be converted. Must be an
  *                                Integer, Buffer, or String
  *              result_desc     - Where the string object is returned
- *              type            - String flags (base and conversion type)
+ *              Type            - String flags (base and conversion type)
  *
  * RETURN:      Status
  *
@@ -516,8 +516,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                         string_length--;
                 }
 
-                return_desc =
-                    acpi_ut_create_string_object((acpi_size) string_length);
+                return_desc = acpi_ut_create_string_object((acpi_size)
+                                                           string_length);
                 if (!return_desc) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 66554bc6f9a..110711afada 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -78,7 +78,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
             (target_node->type == ACPI_TYPE_LOCAL_METHOD_ALIAS)) {
                 /*
                  * Dereference an existing alias so that we don't create a chain
-                 * of aliases. With this code, we guarantee that an alias is
+                 * of aliases.  With this code, we guarantee that an alias is
                  * always exactly one level of indirection away from the
                  * actual aliased name.
                  */
@@ -90,7 +90,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         /*
          * For objects that can never change (i.e., the NS node will
          * permanently point to the same object), we can simply attach
-         * the object to the new NS node. For other objects (such as
+         * the object to the new NS node.  For other objects (such as
          * Integers, buffers, etc.), we have to point the Alias node
          * to the original Node.
          */
@@ -139,7 +139,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
 
                 /*
                  * The new alias assumes the type of the target, and it points
-                 * to the same object. The reference count of the object has an
+                 * to the same object.  The reference count of the object has an
                  * additional reference to prevent deletion out from under either the
                  * target node or the alias Node
                  */
@@ -243,7 +243,8 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
 
         /* Init object and attach to NS node */
 
-        obj_desc->mutex.sync_level = (u8)walk_state->operands[1]->integer.value;
+        obj_desc->mutex.sync_level =
+            (u8) walk_state->operands[1]->integer.value;
         obj_desc->mutex.node =
             (struct acpi_namespace_node *)walk_state->operands[0];
 
@@ -266,7 +267,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
  *
  * PARAMETERS:  aml_start           - Pointer to the region declaration AML
  *              aml_length          - Max length of the declaration AML
- *              space_id            - Address space ID for the region
+ *              region_space        - space_iD for the region
  *              walk_state          - Current state
  *
  * RETURN:      Status
@@ -278,7 +279,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
 acpi_status
 acpi_ex_create_region(u8 * aml_start,
                       u32 aml_length,
-                      u8 space_id, struct acpi_walk_state *walk_state)
+                      u8 region_space, struct acpi_walk_state *walk_state)
 {
         acpi_status status;
         union acpi_operand_object *obj_desc;
@@ -303,19 +304,16 @@ acpi_ex_create_region(u8 * aml_start,
          * Space ID must be one of the predefined IDs, or in the user-defined
          * range
          */
-        if (!acpi_is_valid_space_id(space_id)) {
-                /*
-                 * Print an error message, but continue. We don't want to abort
-                 * a table load for this exception. Instead, if the region is
-                 * actually used at runtime, abort the executing method.
-                 */
-                ACPI_ERROR((AE_INFO,
-                            "Invalid/unknown Address Space ID: 0x%2.2X",
-                            space_id));
+        if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
+            (region_space < ACPI_USER_REGION_BEGIN) &&
+            (region_space != ACPI_ADR_SPACE_DATA_TABLE)) {
+                ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X",
+                            region_space));
+                return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (0x%X)\n",
-                          acpi_ut_get_region_name(space_id), space_id));
+                          acpi_ut_get_region_name(region_space), region_space));
 
         /* Create the region descriptor */
 
@@ -332,16 +330,10 @@ acpi_ex_create_region(u8 * aml_start,
         region_obj2 = obj_desc->common.next_object;
         region_obj2->extra.aml_start = aml_start;
         region_obj2->extra.aml_length = aml_length;
-        if (walk_state->scope_info) {
-                region_obj2->extra.scope_node =
-                    walk_state->scope_info->scope.node;
-        } else {
-                region_obj2->extra.scope_node = node;
-        }
 
         /* Init the region from the operands */
 
-        obj_desc->region.space_id = space_id;
+        obj_desc->region.space_id = region_space;
         obj_desc->region.address = 0;
         obj_desc->region.length = 0;
         obj_desc->region.node = node;
@@ -368,7 +360,7 @@ acpi_ex_create_region(u8 * aml_start,
  *
  * DESCRIPTION: Create a new processor object and populate the fields
  *
- *              Processor (Name[0], cpu_ID[1], pblock_addr[2], pblock_length[3])
+ *              Processor (Name[0], cpu_iD[1], pblock_addr[2], pblock_length[3])
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index d7c9f51608a..c7a2f1edd28 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,8 @@ ACPI_MODULE_NAME("exdebug")
  * FUNCTION:    acpi_ex_do_debug_object
  *
  * PARAMETERS:  source_desc         - Object to be output to "Debug Object"
- *              level               - Indentation level (used for packages)
- *              index               - Current package element, zero if not pkg
+ *              Level               - Indentation level (used for packages)
+ *              Index               - Current package element, zero if not pkg
  *
  * RETURN:      None
  *
@@ -145,10 +145,10 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
         case ACPI_TYPE_BUFFER:
 
                 acpi_os_printf("[0x%.2X]\n", (u32)source_desc->buffer.length);
-                acpi_ut_dump_buffer(source_desc->buffer.pointer,
-                                    (source_desc->buffer.length < 256) ?
-                                    source_desc->buffer.length : 256,
-                                    DB_BYTE_DISPLAY, 0);
+                acpi_ut_dump_buffer2(source_desc->buffer.pointer,
+                                     (source_desc->buffer.length < 256) ?
+                                     source_desc->buffer.length : 256,
+                                     DB_BYTE_DISPLAY);
                 break;
 
         case ACPI_TYPE_STRING:
@@ -190,7 +190,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 
                         acpi_os_printf("Table Index 0x%X\n",
                                        source_desc->reference.value);
-                        return_VOID;
+                        return;
 
                 default:
                         break;
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 858b43a7dcf..61b8c0e8b74 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,9 +109,9 @@ static struct acpi_exdump_info acpi_ex_dump_package[5] = {
 static struct acpi_exdump_info acpi_ex_dump_device[4] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_device), NULL},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.handler), "Handler"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.notify_list[0]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.system_notify),
          "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.notify_list[1]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.device_notify),
          "Device Notify"}
 };
 
@@ -158,9 +158,9 @@ static struct acpi_exdump_info acpi_ex_dump_power[5] = {
          "System Level"},
         {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(power_resource.resource_order),
          "Resource Order"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.notify_list[0]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.system_notify),
          "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.notify_list[1]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.device_notify),
          "Device Notify"}
 };
 
@@ -169,18 +169,18 @@ static struct acpi_exdump_info acpi_ex_dump_processor[7] = {
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.length), "Length"},
         {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.notify_list[0]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify),
          "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.notify_list[1]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.device_notify),
          "Device Notify"},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.handler), "Handler"}
 };
 
 static struct acpi_exdump_info acpi_ex_dump_thermal[4] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_thermal), NULL},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.notify_list[0]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.system_notify),
          "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.notify_list[1]),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.device_notify),
          "Device Notify"},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.handler), "Handler"}
 };
@@ -192,13 +192,10 @@ static struct acpi_exdump_info acpi_ex_dump_buffer_field[3] = {
          "Buffer Object"}
 };
 
-static struct acpi_exdump_info acpi_ex_dump_region_field[5] = {
+static struct acpi_exdump_info acpi_ex_dump_region_field[3] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region_field), NULL},
         {ACPI_EXD_FIELD, 0, NULL},
-        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(field.access_length), "AccessLength"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.resource_buffer),
-         "ResourceBuffer"}
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"}
 };
 
 static struct acpi_exdump_info acpi_ex_dump_bank_field[5] = {
@@ -241,15 +238,10 @@ static struct acpi_exdump_info acpi_ex_dump_address_handler[6] = {
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.context), "Context"}
 };
 
-static struct acpi_exdump_info acpi_ex_dump_notify[7] = {
+static struct acpi_exdump_info acpi_ex_dump_notify[3] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_notify), NULL},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.node), "Node"},
-        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(notify.handler_type), "Handler Type"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.handler), "Handler"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.context), "Context"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.next[0]),
-         "Next System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.next[1]), "Next Device Notify"}
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.context), "Context"}
 };
 
 /* Miscellaneous tables */
@@ -323,7 +315,7 @@ static struct acpi_exdump_info *acpi_ex_dump_info[] = {
  * FUNCTION:    acpi_ex_dump_object
  *
  * PARAMETERS:  obj_desc            - Descriptor to dump
- *              info                - Info table corresponding to this object
+ *              Info                - Info table corresponding to this object
  *                                    type
  *
  * RETURN:      None
@@ -449,7 +441,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_dump_operand
  *
  * PARAMETERS:  *obj_desc       - Pointer to entry to be dumped
- *              depth           - Current nesting depth
+ *              Depth           - Current nesting depth
  *
  * RETURN:      None
  *
@@ -464,8 +456,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         ACPI_FUNCTION_NAME(ex_dump_operand)
 
-            if (!
-                ((ACPI_LV_EXEC & acpi_dbg_level)
+            if (!((ACPI_LV_EXEC & acpi_dbg_level)
                   && (_COMPONENT & acpi_dbg_layer))) {
                 return;
         }
@@ -732,7 +723,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
  *
  * FUNCTION:    acpi_ex_dump_operands
  *
- * PARAMETERS:  operands            - A list of Operand objects
+ * PARAMETERS:  Operands            - A list of Operand objects
  *              opcode_name         - AML opcode name
  *              num_operands        - Operand count for this opcode
  *
@@ -775,10 +766,10 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
  *
  * FUNCTION:    acpi_ex_out* functions
  *
- * PARAMETERS:  title               - Descriptive text
- *              value               - Value to be displayed
+ * PARAMETERS:  Title               - Descriptive text
+ *              Value               - Value to be displayed
  *
- * DESCRIPTION: Object dump output formatting functions. These functions
+ * DESCRIPTION: Object dump output formatting functions.  These functions
  *              reduce the number of format strings required and keeps them
  *              all in one place for easy modification.
  *
@@ -798,8 +789,8 @@ static void acpi_ex_out_pointer(char *title, void *value)
  *
  * FUNCTION:    acpi_ex_dump_namespace_node
  *
- * PARAMETERS:  node                - Descriptor to dump
- *              flags               - Force display if TRUE
+ * PARAMETERS:  Node                - Descriptor to dump
+ *              Flags               - Force display if TRUE
  *
  * DESCRIPTION: Dumps the members of the given.Node
  *
@@ -811,8 +802,7 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
         ACPI_FUNCTION_ENTRY();
 
         if (!flags) {
-                if (!
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
                       && (_COMPONENT & acpi_dbg_layer))) {
                         return;
                 }
@@ -832,7 +822,7 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
  *
  * FUNCTION:    acpi_ex_dump_reference_obj
  *
- * PARAMETERS:  object              - Descriptor to dump
+ * PARAMETERS:  Object              - Descriptor to dump
  *
  * DESCRIPTION: Dumps a reference object
  *
@@ -889,8 +879,8 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
  * FUNCTION:    acpi_ex_dump_package_obj
  *
  * PARAMETERS:  obj_desc            - Descriptor to dump
- *              level               - Indentation Level
- *              index               - Package index for this object
+ *              Level               - Indentation Level
+ *              Index               - Package index for this object
  *
  * DESCRIPTION: Dumps the elements of the package
  *
@@ -933,7 +923,9 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
         case ACPI_TYPE_STRING:
 
                 acpi_os_printf("[String] Value: ");
-                acpi_ut_print_string(obj_desc->string.pointer, ACPI_UINT8_MAX);
+                for (i = 0; i < obj_desc->string.length; i++) {
+                        acpi_os_printf("%c", obj_desc->string.pointer[i]);
+                }
                 acpi_os_printf("\n");
                 break;
 
@@ -942,11 +934,10 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
                 acpi_os_printf("[Buffer] Length %.2X = ",
                                obj_desc->buffer.length);
                 if (obj_desc->buffer.length) {
-                        acpi_ut_debug_dump_buffer(ACPI_CAST_PTR
-                                                  (u8,
-                                                   obj_desc->buffer.pointer),
-                                                  obj_desc->buffer.length,
-                                                  DB_DWORD_DISPLAY, _COMPONENT);
+                        acpi_ut_dump_buffer(ACPI_CAST_PTR
+                                            (u8, obj_desc->buffer.pointer),
+                                            obj_desc->buffer.length,
+                                            DB_DWORD_DISPLAY, _COMPONENT);
                 } else {
                         acpi_os_printf("\n");
                 }
@@ -983,7 +974,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_dump_object_descriptor
  *
  * PARAMETERS:  obj_desc            - Descriptor to dump
- *              flags               - Force display if TRUE
+ *              Flags               - Force display if TRUE
  *
  * DESCRIPTION: Dumps the members of the object descriptor given.
  *
@@ -999,8 +990,7 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
         }
 
         if (!flags) {
-                if (!
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
                       && (_COMPONENT & acpi_dbg_layer))) {
                         return_VOID;
                 }
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index ebc55fbf3ff..0bde2230c02 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,7 @@ ACPI_MODULE_NAME("exfield")
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Read from a named field. Returns either an Integer or a
+ * DESCRIPTION: Read from a named field.  Returns either an Integer or a
  *              Buffer, depending on the size of the field.
  *
  ******************************************************************************/
@@ -100,25 +100,18 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
                    (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS
                     || obj_desc->field.region_obj->region.space_id ==
-                    ACPI_ADR_SPACE_GSBUS
-                    || obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_IPMI)) {
                 /*
-                 * This is an SMBus, GSBus or IPMI read. We must create a buffer to hold
+                 * This is an SMBus or IPMI read. We must create a buffer to hold
                  * the data and then directly access the region handler.
                  *
-                 * Note: SMBus and GSBus protocol value is passed in upper 16-bits of Function
+                 * Note: Smbus protocol value is passed in upper 16-bits of Function
                  */
                 if (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS) {
                         length = ACPI_SMBUS_BUFFER_SIZE;
                         function =
                             ACPI_READ | (obj_desc->field.attribute << 16);
-                } else if (obj_desc->field.region_obj->region.space_id ==
-                           ACPI_ADR_SPACE_GSBUS) {
-                        length = ACPI_GSBUS_BUFFER_SIZE;
-                        function =
-                            ACPI_READ | (obj_desc->field.attribute << 16);
                 } else {        /* IPMI */
 
                         length = ACPI_IPMI_BUFFER_SIZE;
@@ -149,7 +142,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
          * Allocate a buffer for the contents of the field.
          *
          * If the field is larger than the current integer width, create
-         * a BUFFER to hold it. Otherwise, use an INTEGER. This allows
+         * a BUFFER to hold it.  Otherwise, use an INTEGER.  This allows
          * the use of arithmetic operators on the returned value if the
          * field size is equal or smaller than an Integer.
          *
@@ -255,23 +248,21 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                    (obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_SMBUS
                     || obj_desc->field.region_obj->region.space_id ==
-                    ACPI_ADR_SPACE_GSBUS
-                    || obj_desc->field.region_obj->region.space_id ==
                     ACPI_ADR_SPACE_IPMI)) {
                 /*
-                 * This is an SMBus, GSBus or IPMI write. We will bypass the entire field
+                 * This is an SMBus or IPMI write. We will bypass the entire field
                  * mechanism and handoff the buffer directly to the handler. For
                  * these address spaces, the buffer is bi-directional; on a write,
                  * return data is returned in the same buffer.
                  *
                  * Source must be a buffer of sufficient size:
-                 * ACPI_SMBUS_BUFFER_SIZE, ACPI_GSBUS_BUFFER_SIZE, or ACPI_IPMI_BUFFER_SIZE.
+                 * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE.
                  *
-                 * Note: SMBus and GSBus protocol type is passed in upper 16-bits of Function
+                 * Note: SMBus protocol type is passed in upper 16-bits of Function
                  */
                 if (source_desc->common.type != ACPI_TYPE_BUFFER) {
                         ACPI_ERROR((AE_INFO,
-                                    "SMBus/IPMI/GenericSerialBus write requires Buffer, found type %s",
+                                    "SMBus or IPMI write requires Buffer, found type %s",
                                     acpi_ut_get_object_type_name(source_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
@@ -282,11 +273,6 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                         length = ACPI_SMBUS_BUFFER_SIZE;
                         function =
                             ACPI_WRITE | (obj_desc->field.attribute << 16);
-                } else if (obj_desc->field.region_obj->region.space_id ==
-                           ACPI_ADR_SPACE_GSBUS) {
-                        length = ACPI_GSBUS_BUFFER_SIZE;
-                        function =
-                            ACPI_WRITE | (obj_desc->field.attribute << 16);
                 } else {        /* IPMI */
 
                         length = ACPI_IPMI_BUFFER_SIZE;
@@ -295,7 +281,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 
                 if (source_desc->buffer.length < length) {
                         ACPI_ERROR((AE_INFO,
-                                    "SMBus/IPMI/GenericSerialBus write requires Buffer of length %u, found length %u",
+                                    "SMBus or IPMI write requires Buffer of length %u, found length %u",
                                     length, source_desc->buffer.length));
 
                         return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index aa2ccfb7cb6..f915a7f3f92 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,8 @@ ACPI_MODULE_NAME("exfldio")
 /* Local prototypes */
 static acpi_status
 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
-                       u32 field_datum_byte_offset, u64 *value, u32 read_write);
+                       u32 field_datum_byte_offset,
+                       u64 *value, u32 read_write);
 
 static u8
 acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value);
@@ -85,7 +86,6 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 {
         acpi_status status = AE_OK;
         union acpi_operand_object *rgn_desc;
-        u8 space_id;
 
         ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);
 
@@ -101,17 +101,6 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
-        space_id = rgn_desc->region.space_id;
-
-        /* Validate the Space ID */
-
-        if (!acpi_is_valid_space_id(space_id)) {
-                ACPI_ERROR((AE_INFO,
-                            "Invalid/unknown Address Space ID: 0x%2.2X",
-                            space_id));
-                return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
-        }
-
         /*
          * If the Region Address and Length have not been previously evaluated,
          * evaluate them now and save the results.
@@ -130,12 +119,11 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         }
 
         /*
-         * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear
+         * Exit now for SMBus or IPMI address space, it has a non-linear
          * address space and the request cannot be directly validated
          */
-        if (space_id == ACPI_ADR_SPACE_SMBUS ||
-            space_id == ACPI_ADR_SPACE_GSBUS ||
-            space_id == ACPI_ADR_SPACE_IPMI) {
+        if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS ||
+            rgn_desc->region.space_id == ACPI_ADR_SPACE_IPMI) {
 
                 /* SMBus or IPMI has a non-linear address space */
 
@@ -154,7 +142,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 #endif
 
         /*
-         * Validate the request. The entire request from the byte offset for a
+         * Validate the request.  The entire request from the byte offset for a
          * length of one field datum (access width) must fit within the region.
          * (Region length is specified in bytes)
          */
@@ -182,7 +170,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                     obj_desc->common_field.access_byte_width) {
                         /*
                          * This is the case where the access_type (acc_word, etc.) is wider
-                         * than the region itself. For example, a region of length one
+                         * than the region itself.  For example, a region of length one
                          * byte, and a field with Dword access specified.
                          */
                         ACPI_ERROR((AE_INFO,
@@ -221,9 +209,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
  * PARAMETERS:  obj_desc                - Field to be read
  *              field_datum_byte_offset - Byte offset of this datum within the
  *                                        parent field
- *              value                   - Where to store value (must at least
+ *              Value                   - Where to store value (must at least
  *                                        64 bits)
- *              function                - Read or Write flag plus other region-
+ *              Function                - Read or Write flag plus other region-
  *                                        dependent flags
  *
  * RETURN:      Status
@@ -283,12 +271,11 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 
         /* Invoke the appropriate address_space/op_region handler */
 
-        status = acpi_ev_address_space_dispatch(rgn_desc, obj_desc,
-                                                function, region_offset,
-                                                ACPI_MUL_8(obj_desc->
-                                                           common_field.
-                                                           access_byte_width),
-                                                value);
+        status =
+            acpi_ev_address_space_dispatch(rgn_desc, function, region_offset,
+                                           ACPI_MUL_8(obj_desc->common_field.
+                                                      access_byte_width),
+                                           value);
 
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
@@ -314,13 +301,13 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_register_overflow
  *
  * PARAMETERS:  obj_desc                - Register(Field) to be written
- *              value                   - Value to be stored
+ *              Value                   - Value to be stored
  *
  * RETURN:      TRUE if value overflows the field, FALSE otherwise
  *
  * DESCRIPTION: Check if a value is out of range of the field being written.
  *              Used to check if the values written to Index and Bank registers
- *              are out of range. Normally, the value is simply truncated
+ *              are out of range.  Normally, the value is simply truncated
  *              to fit the field, but this case is most likely a serious
  *              coding error in the ASL.
  *
@@ -329,7 +316,6 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 static u8
 acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 {
-        ACPI_FUNCTION_NAME(ex_register_overflow);
 
         if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
                 /*
@@ -344,11 +330,6 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
                  * The Value is larger than the maximum value that can fit into
                  * the register.
                  */
-                ACPI_ERROR((AE_INFO,
-                            "Index value 0x%8.8X%8.8X overflows field width 0x%X",
-                            ACPI_FORMAT_UINT64(value),
-                            obj_desc->common_field.bit_length));
-
                 return (TRUE);
         }
 
@@ -364,12 +345,12 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
  * PARAMETERS:  obj_desc                - Field to be read
  *              field_datum_byte_offset - Byte offset of this datum within the
  *                                        parent field
- *              value                   - Where to store value (must be 64 bits)
+ *              Value                   - Where to store value (must be 64 bits)
  *              read_write              - Read or Write flag
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Read or Write a single datum of a field. The field_type is
+ * DESCRIPTION: Read or Write a single datum of a field.  The field_type is
  *              demultiplexed here to handle the different types of fields
  *              (buffer_field, region_field, index_field, bank_field)
  *
@@ -573,7 +554,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_write_with_update_rule
  *
  * PARAMETERS:  obj_desc                - Field to be written
- *              mask                    - bitmask within field datum
+ *              Mask                    - bitmask within field datum
  *              field_value             - Value to write
  *              field_datum_byte_offset - Offset of datum within field
  *
@@ -677,7 +658,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_extract_from_field
  *
  * PARAMETERS:  obj_desc            - Field to be read
- *              buffer              - Where to store the field data
+ *              Buffer              - Where to store the field data
  *              buffer_length       - Length of Buffer
  *
  * RETURN:      Status
@@ -822,7 +803,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
  * FUNCTION:    acpi_ex_insert_into_field
  *
  * PARAMETERS:  obj_desc            - Field to be written
- *              buffer              - Data to be written
+ *              Buffer              - Data to be written
  *              buffer_length       - Length of Buffer
  *
  * RETURN:      Status
@@ -859,7 +840,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
         /*
          * We must have a buffer that is at least as long as the field
-         * we are writing to. This is because individual fields are
+         * we are writing to.  This is because individual fields are
          * indivisible and partial writes are not supported -- as per
          * the ACPI specification.
          */
@@ -874,7 +855,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
                 /*
                  * Copy the original data to the new buffer, starting
-                 * at Byte zero. All unused (upper) bytes of the
+                 * at Byte zero.  All unused (upper) bytes of the
                  * buffer will be 0.
                  */
                 ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length);
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 84058705ed1..703d88ed0b3 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -143,8 +144,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_concat_template
  *
- * PARAMETERS:  operand0            - First source object
- *              operand1            - Second source object
+ * PARAMETERS:  Operand0            - First source object
+ *              Operand1            - Second source object
  *              actual_return_desc  - Where to place the return object
  *              walk_state          - Current walk state
  *
@@ -228,8 +229,8 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
  *
  * FUNCTION:    acpi_ex_do_concatenate
  *
- * PARAMETERS:  operand0            - First source object
- *              operand1            - Second source object
+ * PARAMETERS:  Operand0            - First source object
+ *              Operand1            - Second source object
  *              actual_return_desc  - Where to place the return object
  *              walk_state          - Current walk state
  *
@@ -253,7 +254,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
         ACPI_FUNCTION_TRACE(ex_do_concatenate);
 
         /*
-         * Convert the second operand if necessary. The first operand
+         * Convert the second operand if necessary.  The first operand
          * determines the type of the second operand, (See the Data Types
          * section of the ACPI specification.)  Both object types are
          * guaranteed to be either Integer/String/Buffer by the operand
@@ -396,9 +397,9 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
  *
  * FUNCTION:    acpi_ex_do_math_op
  *
- * PARAMETERS:  opcode              - AML opcode
- *              integer0            - Integer operand #0
- *              integer1            - Integer operand #1
+ * PARAMETERS:  Opcode              - AML opcode
+ *              Integer0            - Integer operand #0
+ *              Integer1            - Integer operand #1
  *
  * RETURN:      Integer result of the operation
  *
@@ -478,9 +479,9 @@ u64 acpi_ex_do_math_op(u16 opcode, u64 integer0, u64 integer1)
  *
  * FUNCTION:    acpi_ex_do_logical_numeric_op
  *
- * PARAMETERS:  opcode              - AML opcode
- *              integer0            - Integer operand #0
- *              integer1            - Integer operand #1
+ * PARAMETERS:  Opcode              - AML opcode
+ *              Integer0            - Integer operand #0
+ *              Integer1            - Integer operand #1
  *              logical_result      - TRUE/FALSE result of the operation
  *
  * RETURN:      Status
@@ -533,9 +534,9 @@ acpi_ex_do_logical_numeric_op(u16 opcode,
  *
  * FUNCTION:    acpi_ex_do_logical_op
  *
- * PARAMETERS:  opcode              - AML opcode
- *              operand0            - operand #0
- *              operand1            - operand #1
+ * PARAMETERS:  Opcode              - AML opcode
+ *              Operand0            - operand #0
+ *              Operand1            - operand #1
  *              logical_result      - TRUE/FALSE result of the operation
  *
  * RETURN:      Status
@@ -572,7 +573,7 @@ acpi_ex_do_logical_op(u16 opcode,
         ACPI_FUNCTION_TRACE(ex_do_logical_op);
 
         /*
-         * Convert the second operand if necessary. The first operand
+         * Convert the second operand if necessary.  The first operand
          * determines the type of the second operand, (See the Data Types
          * section of the ACPI 3.0+ specification.)  Both object types are
          * guaranteed to be either Integer/String/Buffer by the operand
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index d1f449d93dc..be1c56ead65 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exmutex - ASL Mutex Acquire/Release functions
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -101,7 +102,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
  * FUNCTION:    acpi_ex_link_mutex
  *
  * PARAMETERS:  obj_desc            - The mutex to be linked
- *              thread              - Current executing thread object
+ *              Thread              - Current executing thread object
  *
  * RETURN:      None
  *
@@ -137,7 +138,7 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_acquire_mutex_object
  *
- * PARAMETERS:  timeout             - Timeout in milliseconds
+ * PARAMETERS:  Timeout             - Timeout in milliseconds
  *              obj_desc            - Mutex object
  *              thread_id           - Current thread state
  *
@@ -304,7 +305,7 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc)
         ACPI_FUNCTION_TRACE(ex_release_mutex_object);
 
         if (obj_desc->mutex.acquisition_depth == 0) {
-                return_ACPI_STATUS(AE_NOT_ACQUIRED);
+                return (AE_NOT_ACQUIRED);
         }
 
         /* Match multiple Acquires with multiple Releases */
@@ -442,7 +443,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_release_all_mutexes
  *
- * PARAMETERS:  thread              - Current executing thread object
+ * PARAMETERS:  Thread              - Current executing thread object
  *
  * RETURN:      Status
  *
@@ -461,7 +462,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
         union acpi_operand_object *next = thread->acquired_mutex_list;
         union acpi_operand_object *obj_desc;
 
-        ACPI_FUNCTION_NAME(ex_release_all_mutexes);
+        ACPI_FUNCTION_ENTRY();
 
         /* Traverse the list of owned mutexes, releasing each one */
 
@@ -473,10 +474,6 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
                 obj_desc->mutex.next = NULL;
                 obj_desc->mutex.acquisition_depth = 0;
 
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Force-releasing held mutex: %p\n",
-                                  obj_desc));
-
                 /* Release the mutex, special case for Global Lock */
 
                 if (obj_desc == acpi_gbl_global_lock_mutex) {
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index 2ff578a16ad..49ec049c157 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +53,8 @@ ACPI_MODULE_NAME("exnames")
 /* Local prototypes */
 static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs);
 
-static acpi_status acpi_ex_name_segment(u8 **in_aml_address, char *name_string);
+static acpi_status
+acpi_ex_name_segment(u8 ** in_aml_address, char *name_string);
 
 /*******************************************************************************
  *
@@ -62,7 +64,7 @@ static acpi_status acpi_ex_name_segment(u8 **in_aml_address, char *name_string);
  *                                    (-1)==root,  0==none
  *              num_name_segs       - count of 4-character name segments
  *
- * RETURN:      A pointer to the allocated string segment. This segment must
+ * RETURN:      A pointer to the allocated string segment.  This segment must
  *              be deleted by the caller.
  *
  * DESCRIPTION: Allocate a buffer for a name string. Ensure allocated name
@@ -176,8 +178,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;
-             (index < ACPI_NAME_SIZE)
+        for (index = 0; (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/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index bbf01e9bf05..236ead14b7f 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exoparg1 - AML execution - opcodes with 1 argument
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -605,7 +606,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 }
 
                 /*
-                 * Set result to ONES (TRUE) if Value == 0. Note:
+                 * Set result to ONES (TRUE) if Value == 0.  Note:
                  * return_desc->Integer.Value is initially == 0 (FALSE) from above.
                  */
                 if (!operand[0]->integer.value) {
@@ -617,7 +618,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
         case AML_INCREMENT_OP:  /* Increment (Operand)  */
 
                 /*
-                 * Create a new integer. Can't just get the base integer and
+                 * Create a new integer.  Can't just get the base integer and
                  * increment it because it may be an Arg or Field.
                  */
                 return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
@@ -685,7 +686,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 /*
                  * Note: The operand is not resolved at this point because we want to
-                 * get the associated object, not its value. For example, we don't
+                 * get the associated object, not its value.  For example, we don't
                  * want to resolve a field_unit to its value, we want the actual
                  * field_unit object.
                  */
@@ -726,7 +727,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 /*
                  * The type of the base object must be integer, buffer, string, or
-                 * package. All others are not supported.
+                 * package.  All others are not supported.
                  *
                  * NOTE: Integer is not specifically supported by the ACPI spec,
                  * but is supported implicitly via implicit operand conversion.
@@ -964,7 +965,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 case ACPI_TYPE_PACKAGE:
 
                                         /*
-                                         * Return the referenced element of the package. We must
+                                         * Return the referenced element of the package.  We must
                                          * add another reference to the referenced object, however.
                                          */
                                         return_desc =
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index ee5634a074c..2571b4a310f 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                 /*
                  * Dispatch the notify to the appropriate handler
                  * NOTE: the request is queued for execution after this method
-                 * completes. The notify handlers are NOT invoked synchronously
+                 * completes.  The notify handlers are NOT invoked synchronously
                  * from this thread -- because handlers may in turn run other
                  * control methods.
                  */
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 2c89b4651f0..1b48d9d28c9 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exoparg3 - AML execution - opcodes with 3 arguments
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -157,7 +158,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
         case AML_MID_OP:        /* Mid (Source[0], Index[1], Length[2], Result[3]) */
 
                 /*
-                 * Create the return object. The Source operand is guaranteed to be
+                 * Create the return object.  The Source operand is guaranteed to be
                  * either a String or a Buffer, so just use its type.
                  */
                 return_desc = acpi_ut_create_internal_object((operand[0])->
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 3e08695c3b3..f4a2787e8e9 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exoparg6 - AML execution - opcodes with 6 arguments
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -197,7 +198,7 @@ acpi_ex_do_match(u32 match_op,
                 return (FALSE);
         }
 
-        return (logical_result);
+        return logical_result;
 }
 
 /*******************************************************************************
@@ -268,7 +269,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                  * and the next should be examined.
                  *
                  * Upon finding a match, the loop will terminate via "break" at
-                 * the bottom. If it terminates "normally", match_value will be
+                 * the bottom.  If it terminates "normally", match_value will be
                  * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no
                  * match was found.
                  */
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index ba9db4de7c8..cc95e200040 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +47,6 @@
 #include "acinterp.h"
 #include "amlcode.h"
 #include "acnamesp.h"
-#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exprep")
@@ -77,8 +77,8 @@ acpi_ex_generate_access(u32 field_bit_offset,
  *              any_acc keyword.
  *
  * NOTE: Need to have the region_length in order to check for boundary
- *       conditions (end-of-region). However, the region_length is a deferred
- *       operation. Therefore, to complete this implementation, the generation
+ *       conditions (end-of-region).  However, the region_length is a deferred
+ *       operation.  Therefore, to complete this implementation, the generation
  *       of this access width must be deferred until the region length has
  *       been evaluated.
  *
@@ -307,7 +307,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize the areas of the field object that are common
- *              to the various types of fields. Note: This is very "sensitive"
+ *              to the various types of fields.  Note: This is very "sensitive"
  *              code because we are solving the general case for field
  *              alignment.
  *
@@ -335,13 +335,13 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
         obj_desc->common_field.bit_length = field_bit_length;
 
         /*
-         * Decode the access type so we can compute offsets. The access type gives
+         * Decode the access type so we can compute offsets.  The access type gives
          * two pieces of information - the width of each field access and the
          * necessary byte_alignment (address granularity) of the access.
          *
          * For any_acc, the access_bit_width is the largest width that is both
          * necessary and possible in an attempt to access the whole field in one
-         * I/O operation. However, for any_acc, the byte_alignment is always one
+         * I/O operation.  However, for any_acc, the byte_alignment is always one
          * byte.
          *
          * For all Buffer Fields, the byte_alignment is always one byte.
@@ -362,7 +362,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
 
         /*
          * base_byte_offset is the address of the start of the field within the
-         * region. It is the byte address of the first *datum* (field-width data
+         * region.  It is the byte address of the first *datum* (field-width data
          * unit) of the field. (i.e., the first datum that contains at least the
          * first *bit* of the field.)
          *
@@ -390,12 +390,12 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
  *
  * FUNCTION:    acpi_ex_prep_field_value
  *
- * PARAMETERS:  info    - Contains all field creation info
+ * PARAMETERS:  Info    - Contains all field creation info
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Construct an object of type union acpi_operand_object with a
- *              subtype of def_field and connect it to the parent Node.
+ * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
+ *              connect it to the parent Node.
  *
  ******************************************************************************/
 
@@ -455,30 +455,6 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 obj_desc->field.region_obj =
                     acpi_ns_get_attached_object(info->region_node);
 
-                /* Fields specific to generic_serial_bus fields */
-
-                obj_desc->field.access_length = info->access_length;
-
-                if (info->connection_node) {
-                        second_desc = info->connection_node->object;
-                        if (!(second_desc->common.flags & AOPOBJ_DATA_VALID)) {
-                                status =
-                                    acpi_ds_get_buffer_arguments(second_desc);
-                                if (ACPI_FAILURE(status)) {
-                                        acpi_ut_delete_object_desc(obj_desc);
-                                        return_ACPI_STATUS(status);
-                                }
-                        }
-
-                        obj_desc->field.resource_buffer =
-                            second_desc->buffer.pointer;
-                        obj_desc->field.resource_length =
-                            (u16)second_desc->buffer.length;
-                } else if (info->resource_buffer) {
-                        obj_desc->field.resource_buffer = info->resource_buffer;
-                        obj_desc->field.resource_length = info->resource_length;
-                }
-
                 /* Allow full data read from EC address space */
 
                 if ((obj_desc->field.region_obj->region.space_id ==
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 1db2c0bfde0..f0d5e14f1f2 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exregion - ACPI default op_region (address space) handlers
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,10 +53,10 @@ ACPI_MODULE_NAME("exregion")
  *
  * FUNCTION:    acpi_ex_system_memory_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
@@ -201,7 +202,7 @@ acpi_ex_system_memory_space_handler(u32 function,
          * Perform the memory read or write
          *
          * Note: For machines that do not support non-aligned transfers, the target
-         * address was checked for alignment above. We do not attempt to break the
+         * address was checked for alignment above.  We do not attempt to break the
          * transfer up into smaller (byte-size) chunks because the AML specifically
          * asked for a transfer width that the hardware may require.
          */
@@ -269,10 +270,10 @@ acpi_ex_system_memory_space_handler(u32 function,
  *
  * FUNCTION:    acpi_ex_system_io_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
@@ -328,10 +329,10 @@ acpi_ex_system_io_space_handler(u32 function,
  *
  * FUNCTION:    acpi_ex_pci_config_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
@@ -364,7 +365,7 @@ acpi_ex_pci_config_space_handler(u32 function,
          *  pci_function is the PCI device function number
          *  pci_register is the Config space register range 0-255 bytes
          *
-         *  value - input value for write, output address for read
+         *  Value - input value for write, output address for read
          *
          */
         pci_id = (struct acpi_pci_id *)region_context;
@@ -401,10 +402,10 @@ acpi_ex_pci_config_space_handler(u32 function,
  *
  * FUNCTION:    acpi_ex_cmos_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
@@ -433,10 +434,10 @@ acpi_ex_cmos_space_handler(u32 function,
  *
  * FUNCTION:    acpi_ex_pci_bar_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
@@ -465,10 +466,10 @@ acpi_ex_pci_bar_space_handler(u32 function,
  *
  * FUNCTION:    acpi_ex_data_table_space_handler
  *
- * PARAMETERS:  function            - Read or Write operation
- *              address             - Where in the space to read or write
+ * PARAMETERS:  Function            - Read or Write operation
+ *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, or 32)
- *              value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value
  *              handler_context     - Pointer to Handler's context
  *              region_context      - Pointer to context specific to the
  *                                    accessed region
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 6239956786e..55997e46948 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exresnte - AML Interpreter object resolution
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,8 +58,8 @@ ACPI_MODULE_NAME("exresnte")
  * PARAMETERS:  object_ptr      - Pointer to a location that contains
  *                                a pointer to a NS node, and will receive a
  *                                pointer to the resolved object.
- *              walk_state      - Current state. Valid only if executing AML
- *                                code. NULL if simply resolving an object
+ *              walk_state      - Current state.  Valid only if executing AML
+ *                                code.  NULL if simply resolving an object
  *
  * RETURN:      Status
  *
@@ -66,7 +67,7 @@ ACPI_MODULE_NAME("exresnte")
  *
  * Note: for some of the data types, the pointer attached to the Node
  * can be either a pointer to an actual internal object or a pointer into the
- * AML stream itself. These types are currently:
+ * AML stream itself.  These types are currently:
  *
  *      ACPI_TYPE_INTEGER
  *      ACPI_TYPE_STRING
@@ -88,7 +89,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         ACPI_FUNCTION_TRACE(ex_resolve_node_to_value);
 
         /*
-         * The stack pointer points to a struct acpi_namespace_node (Node). Get the
+         * The stack pointer points to a struct acpi_namespace_node (Node).  Get the
          * object that is attached to the Node.
          */
         node = *object_ptr;
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index cc176b245e2..db502cd7d93 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exresolv - AML Interpreter object resolution
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
         stack_desc = *stack_ptr;
 
-        /* This is an object of type union acpi_operand_object */
+        /* This is a union acpi_operand_object    */
 
         switch (stack_desc->common.type) {
         case ACPI_TYPE_LOCAL_REFERENCE:
@@ -320,13 +321,13 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
  * FUNCTION:    acpi_ex_resolve_multiple
  *
  * PARAMETERS:  walk_state          - Current state (contains AML opcode)
- *              operand             - Starting point for resolution
+ *              Operand             - Starting point for resolution
  *              return_type         - Where the object type is returned
  *              return_desc         - Where the resolved object is returned
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Return the base object and type. Traverse a reference list if
+ * DESCRIPTION: Return the base object and type.  Traverse a reference list if
  *              necessary to get to the base object.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index b9ebff2f6a0..e3bb00ccdff 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exresop - AML Interpreter operand/object resolution
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,7 +87,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         if (type_needed == ACPI_TYPE_LOCAL_REFERENCE) {
                 /*
                  * Allow the AML "Constant" opcodes (Zero, One, etc.) to be reference
-                 * objects and thus allow them to be targets. (As per the ACPI
+                 * objects and thus allow them to be targets.  (As per the ACPI
                  * specification, a store to a constant is a noop.)
                  */
                 if ((this_type == ACPI_TYPE_INTEGER) &&
@@ -112,7 +113,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
  *
  * FUNCTION:    acpi_ex_resolve_operands
  *
- * PARAMETERS:  opcode              - Opcode being interpreted
+ * PARAMETERS:  Opcode              - Opcode being interpreted
  *              stack_ptr           - Pointer to the operand stack to be
  *                                    resolved
  *              walk_state          - Current state
@@ -306,7 +307,7 @@ acpi_ex_resolve_operands(u16 opcode,
                 case ARGI_DEVICE_REF:
                 case ARGI_TARGETREF:    /* Allows implicit conversion rules before store */
                 case ARGI_FIXED_TARGET: /* No implicit conversion before store to target */
-                case ARGI_SIMPLE_TARGET:        /* Name, Local, or arg - no implicit conversion  */
+                case ARGI_SIMPLE_TARGET:        /* Name, Local, or Arg - no implicit conversion  */
 
                         /*
                          * Need an operand of type ACPI_TYPE_LOCAL_REFERENCE
@@ -336,8 +337,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         if ((opcode == AML_STORE_OP) &&
                             ((*stack_ptr)->common.type ==
                              ACPI_TYPE_LOCAL_REFERENCE)
-                            && ((*stack_ptr)->reference.class ==
-                                ACPI_REFCLASS_INDEX)) {
+                            && ((*stack_ptr)->reference.class == ACPI_REFCLASS_INDEX)) {
                                 goto next_operand;
                         }
                         break;
@@ -410,7 +410,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         /*
                          * Need an operand of type ACPI_TYPE_INTEGER,
                          * But we can implicitly convert from a STRING or BUFFER
-                         * aka - "Implicit Source Operand Conversion"
+                         * Aka - "Implicit Source Operand Conversion"
                          */
                         status =
                             acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
@@ -437,7 +437,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         /*
                          * Need an operand of type ACPI_TYPE_BUFFER,
                          * But we can implicitly convert from a STRING or INTEGER
-                         * aka - "Implicit Source Operand Conversion"
+                         * Aka - "Implicit Source Operand Conversion"
                          */
                         status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
                         if (ACPI_FAILURE(status)) {
@@ -463,7 +463,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         /*
                          * Need an operand of type ACPI_TYPE_STRING,
                          * But we can implicitly convert from a BUFFER or INTEGER
-                         * aka - "Implicit Source Operand Conversion"
+                         * Aka - "Implicit Source Operand Conversion"
                          */
                         status = acpi_ex_convert_to_string(obj_desc, stack_ptr,
                                                            ACPI_IMPLICIT_CONVERT_HEX);
@@ -638,7 +638,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 if (acpi_gbl_enable_interpreter_slack) {
                                         /*
                                          * Enable original behavior of Store(), allowing any and all
-                                         * objects as the source operand. The ACPI spec does not
+                                         * objects as the source operand.  The ACPI spec does not
                                          * allow this, however.
                                          */
                                         break;
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 90431f12f83..c0c8842dd34 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,8 +62,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *val_desc,
  * FUNCTION:    acpi_ex_store
  *
  * PARAMETERS:  *source_desc        - Value to be stored
- *              *dest_desc          - Where to store it. Must be an NS node
- *                                    or union acpi_operand_object of type
+ *              *dest_desc          - Where to store it.  Must be an NS node
+ *                                    or a union acpi_operand_object of type
  *                                    Reference;
  *              walk_state          - Current walk state
  *
@@ -361,7 +361,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
  * FUNCTION:    acpi_ex_store_object_to_node
  *
  * PARAMETERS:  source_desc             - Value to be stored
- *              node                    - Named object to receive the value
+ *              Node                    - Named object to receive the value
  *              walk_state              - Current walk state
  *              implicit_conversion     - Perform implicit conversion (yes/no)
  *
@@ -374,7 +374,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
  *              with the input value.
  *
  *              When storing into an object the data is converted to the
- *              target object type then stored in the object. This means
+ *              target object type then stored in the object.  This means
  *              that the target object type (for an initialized target) will
  *              not be changed by a store operation.
  *
@@ -491,7 +491,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
                                   acpi_ut_get_object_type_name(source_desc),
                                   source_desc, node));
 
-                /* No conversions for all other types. Just attach the source object */
+                /* No conversions for all other types.  Just attach the source object */
 
                 status = acpi_ns_attach_object(node, source_desc,
                                                source_desc->common.type);
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index 87153bbc4b4..a979017d56b 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exstoren - AML Interpreter object store support,
@@ -6,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +61,7 @@ ACPI_MODULE_NAME("exstoren")
  *
  * RETURN:      Status, resolved object in source_desc_ptr.
  *
- * DESCRIPTION: Resolve an object. If the object is a reference, dereference
+ * DESCRIPTION: Resolve an object.  If the object is a reference, dereference
  *              it and return the actual object in the source_desc_ptr.
  *
  ******************************************************************************/
@@ -92,7 +93,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
 
                 /*
                  * Stores into a Field/Region or into a Integer/Buffer/String
-                 * are all essentially the same. This case handles the
+                 * are all essentially the same.  This case handles the
                  * "interchangeable" types Integer, String, and Buffer.
                  */
                 if (source_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
@@ -166,7 +167,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: "Store" an object to another object. This may include
+ * DESCRIPTION: "Store" an object to another object.  This may include
  *              converting the source type to the target type (implicit
  *              conversion), and a copy of the value of the source to
  *              the target.
@@ -177,14 +178,14 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
  *              with the input value.
  *
  *              When storing into an object the data is converted to the
- *              target object type then stored in the object. This means
+ *              target object type then stored in the object.  This means
  *              that the target object type (for an initialized target) will
  *              not be changed by a store operation.
  *
  *              This module allows destination types of Number, String,
  *              Buffer, and Package.
  *
- *              Assumes parameters are already validated. NOTE: source_desc
+ *              Assumes parameters are already validated.  NOTE: source_desc
  *              resolution (from a reference object) must be performed by
  *              the caller if necessary.
  *
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index b5f339cb130..dc665cc554d 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exstorob - AML Interpreter object store support, store to object
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,16 +108,16 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
 #ifdef ACPI_OBSOLETE_BEHAVIOR
                 /*
                  * NOTE: ACPI versions up to 3.0 specified that the buffer must be
-                 * truncated if the string is smaller than the buffer. However, "other"
+                 * truncated if the string is smaller than the buffer.  However, "other"
                  * implementations of ACPI never did this and thus became the defacto
-                 * standard. ACPI 3.0A changes this behavior such that the buffer
+                 * standard. ACPI 3.0_a changes this behavior such that the buffer
                  * is no longer truncated.
                  */
 
                 /*
                  * OBSOLETE BEHAVIOR:
                  * If the original source was a string, we must truncate the buffer,
-                 * according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer
+                 * according to the ACPI spec.  Integer-to-Buffer and Buffer-to-Buffer
                  * copy must not truncate the original buffer.
                  */
                 if (original_src_type == ACPI_TYPE_STRING) {
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index c8a0ad5c1f5..df66e7b686b 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exsystem - Interface to OS services
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,13 +53,13 @@ ACPI_MODULE_NAME("exsystem")
  *
  * FUNCTION:    acpi_ex_system_wait_semaphore
  *
- * PARAMETERS:  semaphore       - Semaphore to wait on
- *              timeout         - Max time to wait
+ * PARAMETERS:  Semaphore       - Semaphore to wait on
+ *              Timeout         - Max time to wait
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Implements a semaphore wait with a check to see if the
- *              semaphore is available immediately. If it is not, the
+ *              semaphore is available immediately.  If it is not, the
  *              interpreter is released before waiting.
  *
  ******************************************************************************/
@@ -97,13 +98,13 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
  *
  * FUNCTION:    acpi_ex_system_wait_mutex
  *
- * PARAMETERS:  mutex           - Mutex to wait on
- *              timeout         - Max time to wait
+ * PARAMETERS:  Mutex           - Mutex to wait on
+ *              Timeout         - Max time to wait
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Implements a mutex wait with a check to see if the
- *              mutex is available immediately. If it is not, the
+ *              mutex is available immediately.  If it is not, the
  *              interpreter is released before waiting.
  *
  ******************************************************************************/
@@ -151,7 +152,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
  * DESCRIPTION: Suspend running thread for specified amount of time.
  *              Note: ACPI specification requires that Stall() does not
  *              relinquish the processor, and delays longer than 100 usec
- *              should use Sleep() instead. We allow stalls up to 255 usec
+ *              should use Sleep() instead.  We allow stalls up to 255 usec
  *              for compatibility with other interpreters and existing BIOSs.
  *
  ******************************************************************************/
@@ -253,7 +254,7 @@ acpi_status acpi_ex_system_signal_event(union acpi_operand_object * obj_desc)
  * RETURN:      Status
  *
  * DESCRIPTION: Provides an access point to perform synchronization operations
- *              within the AML. This operation is a request to wait for an
+ *              within the AML.  This operation is a request to wait for an
  *              event.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 264d22d8018..8ad93146dd3 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: exutils - interpreter/scanner utilities
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,12 +45,12 @@
 /*
  * DEFINE_AML_GLOBALS is tested in amlcode.h
  * to determine whether certain global names should be "defined" or only
- * "declared" in the current compilation. This enhances maintainability
+ * "declared" in the current compilation.  This enhances maintainability
  * by enabling a single header file to embody all knowledge of the names
  * in question.
  *
  * Exactly one module of any executable should #define DEFINE_GLOBALS
- * before #including the header files which use this convention. The
+ * before #including the header files which use this convention.  The
  * names in question will be defined and initialized in that module,
  * and declared as extern in all other modules which #include those
  * header files.
@@ -108,7 +109,7 @@ void acpi_ex_enter_interpreter(void)
  *
  * DESCRIPTION: Reacquire the interpreter execution region from within the
  *              interpreter code. Failure to enter the interpreter region is a
- *              fatal system error. Used in conjunction with
+ *              fatal system error. Used in  conjunction with
  *              relinquish_interpreter
  *
  ******************************************************************************/
@@ -316,8 +317,8 @@ void acpi_ex_release_global_lock(u32 field_flags)
  *
  * FUNCTION:    acpi_ex_digits_needed
  *
- * PARAMETERS:  value           - Value to be represented
- *              base            - Base of representation
+ * PARAMETERS:  Value           - Value to be represented
+ *              Base            - Base of representation
  *
  * RETURN:      The number of digits.
  *
@@ -407,7 +408,7 @@ void acpi_ex_eisa_id_to_string(char *out_string, u64 compressed_id)
  * PARAMETERS:  out_string      - Where to put the converted string. At least
  *                                21 bytes are needed to hold the largest
  *                                possible 64-bit integer.
- *              value           - Value to be converted
+ *              Value           - Value to be converted
  *
  * RETURN:      None, string
  *
@@ -434,29 +435,4 @@ void acpi_ex_integer_to_string(char *out_string, u64 value)
         }
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_is_valid_space_id
- *
- * PARAMETERS:  space_id            - ID to be validated
- *
- * RETURN:      TRUE if valid/supported ID.
- *
- * DESCRIPTION: Validate an operation region space_ID.
- *
- ******************************************************************************/
-
-u8 acpi_is_valid_space_id(u8 space_id)
-{
-
-        if ((space_id >= ACPI_NUM_PREDEFINED_REGIONS) &&
-            (space_id < ACPI_USER_REGION_BEGIN) &&
-            (space_id != ACPI_ADR_SPACE_DATA_TABLE) &&
-            (space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                return (FALSE);
-        }
-
-        return (TRUE);
-}
-
 #endif
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 90a9aea1cee..fc380d3d45a 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,12 +48,11 @@
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwacpi")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /******************************************************************************
  *
  * FUNCTION:    acpi_hw_set_mode
  *
- * PARAMETERS:  mode            - SYS_MODE_ACPI or SYS_MODE_LEGACY
+ * PARAMETERS:  Mode            - SYS_MODE_ACPI or SYS_MODE_LEGACY
  *
  * RETURN:      Status
  *
@@ -135,7 +135,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
  *
  * RETURN:      SYS_MODE_ACPI or SYS_MODE_LEGACY
  *
- * DESCRIPTION: Return current operating state of system. Determined by
+ * DESCRIPTION: Return current operating state of system.  Determined by
  *              querying the SCI_EN bit.
  *
  ******************************************************************************/
@@ -166,5 +166,3 @@ u32 acpi_hw_get_mode(void)
                 return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c
deleted file mode 100644
index 94996f9ae3a..00000000000
--- a/drivers/acpi/acpica/hwesleep.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/******************************************************************************
- *
- * Name: hwesleep.c - ACPI Hardware Sleep/Wake Support functions for the
- *                    extended FADT-V5 sleep registers.
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-
-#define _COMPONENT          ACPI_HARDWARE
-ACPI_MODULE_NAME("hwesleep")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_execute_sleep_method
- *
- * PARAMETERS:  method_pathname     - Pathname of method to execute
- *              integer_argument    - Argument to pass to the method
- *
- * RETURN:      None
- *
- * DESCRIPTION: Execute a sleep/wake related method with one integer argument
- *              and no return value.
- *
- ******************************************************************************/
-void acpi_hw_execute_sleep_method(char *method_pathname, u32 integer_argument)
-{
-        struct acpi_object_list arg_list;
-        union acpi_object arg;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(hw_execute_sleep_method);
-
-        /* One argument, integer_argument; No return value expected */
-
-        arg_list.count = 1;
-        arg_list.pointer = &arg;
-        arg.type = ACPI_TYPE_INTEGER;
-        arg.integer.value = (u64)integer_argument;
-
-        status = acpi_evaluate_object(NULL, method_pathname, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_EXCEPTION((AE_INFO, status, "While executing method %s",
-                                method_pathname));
-        }
-
-        return_VOID;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_extended_sleep
- *
- * PARAMETERS:  sleep_state         - Which sleep state to enter
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Enter a system sleep state via the extended FADT sleep
- *              registers (V5 FADT).
- *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
- *
- ******************************************************************************/
-
-acpi_status acpi_hw_extended_sleep(u8 sleep_state)
-{
-        acpi_status status;
-        u8 sleep_type_value;
-        u64 sleep_status;
-
-        ACPI_FUNCTION_TRACE(hw_extended_sleep);
-
-        /* Extended sleep registers must be valid */
-
-        if (!acpi_gbl_FADT.sleep_control.address ||
-            !acpi_gbl_FADT.sleep_status.address) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-
-        /* Clear wake status (WAK_STS) */
-
-        status =
-            acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        acpi_gbl_system_awake_and_running = FALSE;
-
-        /* Flush caches, as per ACPI specification */
-
-        ACPI_FLUSH_CPU_CACHE();
-
-        /*
-         * Set the SLP_TYP and SLP_EN bits.
-         *
-         * Note: We only use the first value returned by the \_Sx method
-         * (acpi_gbl_sleep_type_a) - As per ACPI specification.
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                          "Entering sleep state [S%u]\n", sleep_state));
-
-        sleep_type_value =
-            ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &
-             ACPI_X_SLEEP_TYPE_MASK);
-
-        status = acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),
-                            &acpi_gbl_FADT.sleep_control);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Wait for transition back to Working State */
-
-        do {
-                status = acpi_read(&sleep_status, &acpi_gbl_FADT.sleep_status);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-
-        } while (!(((u8)sleep_status) & ACPI_X_WAKE_STATUS));
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_extended_wake_prep
- *
- * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Perform first part of OS-independent ACPI cleanup after
- *              a sleep. Called with interrupts ENABLED.
- *
- ******************************************************************************/
-
-acpi_status acpi_hw_extended_wake_prep(u8 sleep_state)
-{
-        acpi_status status;
-        u8 sleep_type_value;
-
-        ACPI_FUNCTION_TRACE(hw_extended_wake_prep);
-
-        status = acpi_get_sleep_type_data(ACPI_STATE_S0,
-                                          &acpi_gbl_sleep_type_a,
-                                          &acpi_gbl_sleep_type_b);
-        if (ACPI_SUCCESS(status)) {
-                sleep_type_value =
-                    ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &
-                     ACPI_X_SLEEP_TYPE_MASK);
-
-                (void)acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),
-                                 &acpi_gbl_FADT.sleep_control);
-        }
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_extended_wake
- *
- * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *              flags               - Reserved, set to zero
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
- *              Called with interrupts ENABLED.
- *
- ******************************************************************************/
-
-acpi_status acpi_hw_extended_wake(u8 sleep_state)
-{
-        ACPI_FUNCTION_TRACE(hw_extended_wake);
-
-        /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
-
-        acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;
-
-        /* Execute the wake methods */
-
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING);
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state);
-
-        /*
-         * Some BIOS code assumes that WAK_STS will be cleared on resume
-         * and use it to determine whether the system is rebooting or
-         * resuming. Clear WAK_STS for compatibility.
-         */
-        (void)acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
-        acpi_gbl_system_awake_and_running = TRUE;
-
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);
-        return_ACPI_STATUS(AE_OK);
-}
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 64560045052..f610d88a66b 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: hwgpe - Low level GPE enable/disable/clear functions
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +48,7 @@
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwgpe")
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
+
 /* Local prototypes */
 static acpi_status
 acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
@@ -59,6 +60,7 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  * FUNCTION:    acpi_hw_get_gpe_register_bit
  *
  * PARAMETERS:  gpe_event_info      - Info block for the GPE
+ *              gpe_register_info   - Info block for the GPE register
  *
  * RETURN:      Register mask with a one in the GPE bit position
  *
@@ -67,10 +69,11 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  *
  ******************************************************************************/
 
-u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info)
+u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
+                             struct acpi_gpe_register_info *gpe_register_info)
 {
         return (u32)1 << (gpe_event_info->gpe_number -
-                 gpe_event_info->register_info->base_gpe_number);
+                                gpe_register_info->base_gpe_number);
 }
 
 /******************************************************************************
@@ -112,7 +115,8 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
 
         /* Set or clear just the bit that corresponds to this GPE */
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
+        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
+                                                gpe_register_info);
         switch (action) {
         case ACPI_GPE_CONDITIONAL_ENABLE:
 
@@ -174,7 +178,8 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
          * Write a one to the appropriate bit in the status register to
          * clear this GPE.
          */
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
+        register_bit =
+            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
 
         status = acpi_hw_write(register_bit,
                                &gpe_register_info->status_address);
@@ -217,7 +222,8 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
 
         /* Get the register bitmask for this GPE */
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
+        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
+                                                gpe_register_info);
 
         /* GPE currently enabled? (enabled for runtime?) */
 
@@ -338,8 +344,7 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 acpi_status
 acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                                 struct acpi_gpe_block_info * gpe_block,
-                                 void *context)
+                                 struct acpi_gpe_block_info *gpe_block, void *context)
 {
         u32 i;
         acpi_status status;
@@ -474,5 +479,3 @@ acpi_status acpi_hw_enable_all_wakeup_gpes(void)
         status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block, NULL);
         return_ACPI_STATUS(status);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index 65bc3453a29..050fd227951 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -259,7 +259,7 @@ acpi_hw_process_pci_list(struct acpi_pci_id *pci_id,
                 status = acpi_hw_get_pci_device_info(pci_id, info->device,
                                                      &bus_number, &is_bridge);
                 if (ACPI_FAILURE(status)) {
-                        return (status);
+                        return_ACPI_STATUS(status);
                 }
 
                 info = info->next;
@@ -271,7 +271,7 @@ acpi_hw_process_pci_list(struct acpi_pci_id *pci_id,
                           pci_id->segment, pci_id->bus, pci_id->device,
                           pci_id->function, status, bus_number, is_bridge));
 
-        return (AE_OK);
+        return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index f4e57503576..55accb7018b 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -1,3 +1,4 @@
+
 /*******************************************************************************
  *
  * Module Name: hwregs - Read/write access functions for the various ACPI
@@ -6,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +51,6 @@
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwregs")
 
-#if (!ACPI_REDUCED_HARDWARE)
 /* Local Prototypes */
 static acpi_status
 acpi_hw_read_multiple(u32 *value,
@@ -62,15 +62,13 @@ acpi_hw_write_multiple(u32 value,
                        struct acpi_generic_address *register_a,
                        struct acpi_generic_address *register_b);
 
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_hw_validate_register
  *
- * PARAMETERS:  reg                 - GAS register structure
+ * PARAMETERS:  Reg                 - GAS register structure
  *              max_bit_width       - Max bit_width supported (32 or 64)
- *              address             - Pointer to where the gas->address
+ *              Address             - Pointer to where the gas->address
  *                                    is returned
  *
  * RETURN:      Status
@@ -101,7 +99,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
                 return (AE_BAD_ADDRESS);
         }
 
-        /* Validate the space_ID */
+        /* Validate the space_iD */
 
         if ((reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
             (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
@@ -136,8 +134,8 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
  *
  * FUNCTION:    acpi_hw_read
  *
- * PARAMETERS:  value               - Where the value is returned
- *              reg                 - GAS register structure
+ * PARAMETERS:  Value               - Where the value is returned
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
@@ -147,7 +145,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
  *
  * LIMITATIONS: <These limitations also apply to acpi_hw_write>
  *      bit_width must be exactly 8, 16, or 32.
- *      space_ID must be system_memory or system_IO.
+ *      space_iD must be system_memory or system_iO.
  *      bit_offset and access_width are currently ignored, as there has
  *          not been a need to implement these.
  *
@@ -156,7 +154,6 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
 acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
 {
         u64 address;
-        u64 value64;
         acpi_status status;
 
         ACPI_FUNCTION_NAME(hw_read);
@@ -178,9 +175,7 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_read_memory((acpi_physical_address)
-                                             address, &value64, reg->bit_width);
-
-                *value = (u32)value64;
+                                             address, value, reg->bit_width);
         } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_read_port((acpi_io_address)
@@ -199,8 +194,8 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
  *
  * FUNCTION:    acpi_hw_write
  *
- * PARAMETERS:  value               - Value to be written
- *              reg                 - GAS register structure
+ * PARAMETERS:  Value               - Value to be written
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
@@ -230,8 +225,7 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_write_memory((acpi_physical_address)
-                                              address, (u64)value,
-                                              reg->bit_width);
+                                              address, value, reg->bit_width);
         } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_write_port((acpi_io_address)
@@ -246,7 +240,6 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
         return (status);
 }
 
-#if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_hw_clear_acpi_status
@@ -276,23 +269,22 @@ acpi_status acpi_hw_clear_acpi_status(void)
 
         status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
                                         ACPI_BITMASK_ALL_FIXED_STATUS);
-
-        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
-
-        if (ACPI_FAILURE(status))
-                goto exit;
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
 
         /* Clear the GPE Bits in all GPE registers in all GPE blocks */
 
         status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block, NULL);
 
-exit:
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
         return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_hw_get_bit_register_info
+ * FUNCTION:    acpi_hw_get_register_bit_mask
  *
  * PARAMETERS:  register_id         - Index of ACPI Register to access
  *
@@ -438,7 +430,7 @@ acpi_hw_register_read(u32 register_id, u32 * return_value)
  * FUNCTION:    acpi_hw_register_write
  *
  * PARAMETERS:  register_id         - ACPI Register ID
- *              value               - The value to write
+ *              Value               - The value to write
  *
  * RETURN:      Status
  *
@@ -570,7 +562,7 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
  *
  * FUNCTION:    acpi_hw_read_multiple
  *
- * PARAMETERS:  value               - Where the register value is returned
+ * PARAMETERS:  Value               - Where the register value is returned
  *              register_a           - First ACPI register (required)
  *              register_b           - Second ACPI register (optional)
  *
@@ -623,7 +615,7 @@ acpi_hw_read_multiple(u32 *value,
  *
  * FUNCTION:    acpi_hw_write_multiple
  *
- * PARAMETERS:  value               - The value to write
+ * PARAMETERS:  Value               - The value to write
  *              register_a           - First ACPI register (required)
  *              register_b           - Second ACPI register (optional)
  *
@@ -665,5 +657,3 @@ acpi_hw_write_multiple(u32 value,
 
         return (status);
 }
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 3fddde056a5..2ac28bbe882 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -1,12 +1,12 @@
+
 /******************************************************************************
  *
- * Name: hwsleep.c - ACPI Hardware Sleep/Wake Support functions for the
- *                   original/legacy sleep/PM registers.
+ * Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,36 +43,212 @@
  */
 
 #include <acpi/acpi.h>
-#include <linux/acpi.h>
 #include "accommon.h"
-#include <linux/module.h>
+#include "actables.h"
+#include <linux/tboot.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /*******************************************************************************
  *
- * FUNCTION:    acpi_hw_legacy_sleep
+ * FUNCTION:    acpi_set_firmware_waking_vector
+ *
+ * PARAMETERS:  physical_address    - 32-bit physical address of ACPI real mode
+ *                                    entry point.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
+ *
+ ******************************************************************************/
+acpi_status
+acpi_set_firmware_waking_vector(u32 physical_address)
+{
+        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
+
+
+        /*
+         * According to the ACPI specification 2.0c and later, the 64-bit
+         * waking vector should be cleared and the 32-bit waking vector should
+         * be used, unless we want the wake-up code to be called by the BIOS in
+         * Protected Mode.  Some systems (for example HP dv5-1004nr) are known
+         * to fail to resume if the 64-bit vector is used.
+         */
+
+        /* Set the 32-bit vector */
+
+        acpi_gbl_FACS->firmware_waking_vector = physical_address;
+
+        /* Clear the 64-bit vector if it exists */
+
+        if ((acpi_gbl_FACS->length > 32) && (acpi_gbl_FACS->version >= 1)) {
+                acpi_gbl_FACS->xfirmware_waking_vector = 0;
+        }
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
+
+#if ACPI_MACHINE_WIDTH == 64
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_set_firmware_waking_vector64
+ *
+ * PARAMETERS:  physical_address    - 64-bit physical address of ACPI protected
+ *                                    mode entry point.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
+ *              it exists in the table. This function is intended for use with
+ *              64-bit host operating systems.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_set_firmware_waking_vector64(u64 physical_address)
+{
+        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
+
+
+        /* Determine if the 64-bit vector actually exists */
+
+        if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Clear 32-bit vector, set the 64-bit X_ vector */
+
+        acpi_gbl_FACS->firmware_waking_vector = 0;
+        acpi_gbl_FACS->xfirmware_waking_vector = physical_address;
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
+#endif
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enter_sleep_state_prep
  *
  * PARAMETERS:  sleep_state         - Which sleep state to enter
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enter a system sleep state via the legacy FADT PM registers
+ * DESCRIPTION: Prepare to enter a system sleep state (see ACPI 2.0 spec p 231)
+ *              This function must execute with interrupts enabled.
+ *              We break sleeping into 2 stages so that OSPM can handle
+ *              various OS-specific tasks between the two steps.
+ *
+ ******************************************************************************/
+acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
+{
+        acpi_status status;
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
+
+        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_prep);
+
+        /* _PSW methods could be run here to enable wake-on keyboard, LAN, etc. */
+
+        status = acpi_get_sleep_type_data(sleep_state,
+                                          &acpi_gbl_sleep_type_a,
+                                          &acpi_gbl_sleep_type_b);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Setup parameter object */
+
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = sleep_state;
+
+        /* Run the _PTS method */
+
+        status = acpi_evaluate_object(NULL, METHOD_NAME__PTS, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Setup the argument to _SST */
+
+        switch (sleep_state) {
+        case ACPI_STATE_S0:
+                arg.integer.value = ACPI_SST_WORKING;
+                break;
+
+        case ACPI_STATE_S1:
+        case ACPI_STATE_S2:
+        case ACPI_STATE_S3:
+                arg.integer.value = ACPI_SST_SLEEPING;
+                break;
+
+        case ACPI_STATE_S4:
+                arg.integer.value = ACPI_SST_SLEEP_CONTEXT;
+                break;
+
+        default:
+                arg.integer.value = ACPI_SST_INDICATOR_OFF;     /* Default is off */
+                break;
+        }
+
+        /*
+         * Set the system indicators to show the desired sleep state.
+         * _SST is an optional method (return no error if not found)
+         */
+        status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While executing method _SST"));
+        }
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
+
+static unsigned int gts, bfs;
+module_param(gts, uint, 0644);
+module_param(bfs, uint, 0644);
+MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
+MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enter_sleep_state
+ *
+ * PARAMETERS:  sleep_state         - Which sleep state to enter
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Enter a system sleep state (see ACPI 2.0 spec p 231)
  *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
  *
  ******************************************************************************/
-acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
+acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 {
-        struct acpi_bit_register_info *sleep_type_reg_info;
-        struct acpi_bit_register_info *sleep_enable_reg_info;
         u32 pm1a_control;
         u32 pm1b_control;
+        struct acpi_bit_register_info *sleep_type_reg_info;
+        struct acpi_bit_register_info *sleep_enable_reg_info;
         u32 in_value;
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE(hw_legacy_sleep);
+        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
+
+        if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
+            (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
+                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=0x%X B=0x%X",
+                            acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
+                return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
+        }
 
         sleep_type_reg_info =
             acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE);
@@ -109,6 +285,20 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
+        if (gts) {
+                /* Execute the _GTS method */
+
+                arg_list.count = 1;
+                arg_list.pointer = &arg;
+                arg.type = ACPI_TYPE_INTEGER;
+                arg.integer.value = sleep_state;
+
+                status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
+                if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
         /* Get current value of PM1A control */
 
         status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
@@ -153,12 +343,8 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
 
         ACPI_FLUSH_CPU_CACHE();
 
-        status = acpi_os_prepare_sleep(sleep_state, pm1a_control,
-                                       pm1b_control);
-        if (ACPI_SKIP(status))
-                return_ACPI_STATUS(AE_OK);
-        if (ACPI_FAILURE(status))
-                return_ACPI_STATUS(status);
+        tboot_sleep(sleep_state, pm1a_control, pm1b_control);
+
         /* Write #2: Write both SLP_TYP + SLP_EN */
 
         status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control);
@@ -188,43 +374,114 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
                 }
         }
 
-        /* Wait for transition back to Working State */
+        /* Wait until we enter sleep state */
 
         do {
+                status = acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS,
+                                                    &in_value);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+
+                /* Spin until we wake */
+
+        } while (!in_value);
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enter_sleep_state_s4bios
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Perform a S4 bios request.
+ *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
+ *
+ ******************************************************************************/
+acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
+{
+        u32 in_value;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
+
+        /* Clear the wake status bit (PM1) */
+
+        status =
+            acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, ACPI_CLEAR_STATUS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_clear_acpi_status();
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * 1) Disable/Clear all GPEs
+         * 2) Enable all wakeup GPEs
+         */
+        status = acpi_hw_disable_all_gpes();
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        acpi_gbl_system_awake_and_running = FALSE;
+
+        status = acpi_hw_enable_all_wakeup_gpes();
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        ACPI_FLUSH_CPU_CACHE();
+
+        status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
+                                    (u32) acpi_gbl_FADT.S4bios_request, 8);
+
+        do {
+                acpi_os_stall(1000);
                 status =
                     acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
-
         } while (!in_value);
 
         return_ACPI_STATUS(AE_OK);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
+
 /*******************************************************************************
  *
- * FUNCTION:    acpi_hw_legacy_wake_prep
+ * FUNCTION:    acpi_leave_sleep_state_prep
  *
- * PARAMETERS:  sleep_state         - Which sleep state we just exited
+ * PARAMETERS:  sleep_state         - Which sleep state we are exiting
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
  *              sleep.
- *              Called with interrupts ENABLED.
+ *              Called with interrupts DISABLED.
  *
  ******************************************************************************/
-
-acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state)
+acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
 {
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
         acpi_status status;
         struct acpi_bit_register_info *sleep_type_reg_info;
         struct acpi_bit_register_info *sleep_enable_reg_info;
         u32 pm1a_control;
         u32 pm1b_control;
 
-        ACPI_FUNCTION_TRACE(hw_legacy_wake_prep);
+        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
 
         /*
          * Set SLP_TYPE and SLP_EN to state S0.
@@ -267,12 +524,25 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state)
                 }
         }
 
+        if (bfs) {
+                /* Execute the _BFS method */
+
+                arg_list.count = 1;
+                arg_list.pointer = &arg;
+                arg.type = ACPI_TYPE_INTEGER;
+                arg.integer.value = sleep_state;
+
+                status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
+                if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                        ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
+                }
+        }
         return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_hw_legacy_wake
+ * FUNCTION:    acpi_leave_sleep_state
  *
  * PARAMETERS:  sleep_state         - Which sleep state we just exited
  *
@@ -282,17 +552,31 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state)
  *              Called with interrupts ENABLED.
  *
  ******************************************************************************/
-
-acpi_status acpi_hw_legacy_wake(u8 sleep_state)
+acpi_status acpi_leave_sleep_state(u8 sleep_state)
 {
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE(hw_legacy_wake);
+        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
 
         /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
 
         acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING);
+
+        /* Setup parameter object */
+
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+
+        /* Ignore any errors from these methods */
+
+        arg.integer.value = ACPI_SST_WAKING;
+        status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
+        }
 
         /*
          * GPEs must be enabled before _WAK is called as GPEs
@@ -306,40 +590,46 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state)
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
-
         status = acpi_hw_enable_all_runtime_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * Now we can execute _WAK, etc. Some machines require that the GPEs
-         * are enabled before the wake methods are executed.
-         */
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state);
+        arg.integer.value = sleep_state;
+        status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
+        }
+        /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
 
         /*
-         * Some BIOS code assumes that WAK_STS will be cleared on resume
-         * and use it to determine whether the system is rebooting or
-         * resuming. Clear WAK_STS for compatibility.
+         * Some BIOSes assume that WAK_STS will be cleared on resume and use
+         * it to determine whether the system is rebooting or resuming. Clear
+         * it for compatibility.
          */
         acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);
+
         acpi_gbl_system_awake_and_running = TRUE;
 
         /* Enable power button */
 
         (void)
             acpi_write_bit_register(acpi_gbl_fixed_event_info
-                                    [ACPI_EVENT_POWER_BUTTON].
-                                    enable_register_id, ACPI_ENABLE_EVENT);
+                              [ACPI_EVENT_POWER_BUTTON].
+                              enable_register_id, ACPI_ENABLE_EVENT);
 
         (void)
             acpi_write_bit_register(acpi_gbl_fixed_event_info
-                                    [ACPI_EVENT_POWER_BUTTON].
-                                    status_register_id, ACPI_CLEAR_STATUS);
+                              [ACPI_EVENT_POWER_BUTTON].
+                              status_register_id, ACPI_CLEAR_STATUS);
+
+        arg.integer.value = ACPI_SST_WORKING;
+        status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
+        }
 
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);
         return_ACPI_STATUS(status);
 }
 
-#endif                          /* !ACPI_REDUCED_HARDWARE */
+ACPI_EXPORT_SYMBOL(acpi_leave_sleep_state)
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index bfdce22f379..9c8eb71a12f 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Name: hwtimer.c - ACPI Power Management Timer Interface
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,19 +42,17 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwtimer")
 
-#if (!ACPI_REDUCED_HARDWARE)    /* Entire module */
 /******************************************************************************
  *
  * FUNCTION:    acpi_get_timer_resolution
  *
- * PARAMETERS:  resolution          - Where the resolution is returned
+ * PARAMETERS:  Resolution          - Where the resolution is returned
  *
  * RETURN:      Status and timer resolution
  *
@@ -83,7 +82,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution)
  *
  * FUNCTION:    acpi_get_timer
  *
- * PARAMETERS:  ticks               - Where the timer value is returned
+ * PARAMETERS:  Ticks               - Where the timer value is returned
  *
  * RETURN:      Status and current timer value (ticks)
  *
@@ -100,7 +99,8 @@ acpi_status acpi_get_timer(u32 * ticks)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        status = acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
+        status =
+            acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
 
         return_ACPI_STATUS(status);
 }
@@ -127,7 +127,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer)
  *              a versatile and accurate timer.
  *
  *              Note that this function accommodates only a single timer
- *              rollover. Thus for 24-bit timers, this function should only
+ *              rollover.  Thus for 24-bit timers, this function should only
  *              be used for calculating durations less than ~4.6 seconds
  *              (~20 minutes for 32-bit timers) -- calculations below:
  *
@@ -186,4 +186,3 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_timer_duration)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index b6aae58299d..5f160587465 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: hwvalid - I/O request validation
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +58,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width);
  *
  * The table is used to implement the Microsoft port access rules that
  * first appeared in Windows XP. Some ports are always illegal, and some
- * ports are only illegal if the BIOS calls _OSI with a win_XP string or
+ * ports are only illegal if the BIOS calls _OSI with a win_xP string or
  * later (meaning that the BIOS itelf is post-XP.)
  *
  * This provides ACPICA with the desired port protections and
@@ -65,7 +66,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width);
  *
  * Description of port entries:
  *  DMA:   DMA controller
- *  PIC0:  Programmable Interrupt Controller (8259A)
+ *  PIC0:  Programmable Interrupt Controller (8259_a)
  *  PIT1:  System Timer 1
  *  PIT2:  System Timer 2 failsafe
  *  RTC:   Real-time clock
@@ -133,8 +134,6 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
         /* Supported widths are 8/16/32 */
 
         if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) {
-                ACPI_ERROR((AE_INFO,
-                            "Bad BitWidth parameter: %8.8X", bit_width));
                 return AE_BAD_PARAMETER;
         }
 
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 05a154c3c9a..f75f81ad15c 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -1,3 +1,4 @@
+
 /******************************************************************************
  *
  * Module Name: hwxface - Public ACPICA hardware interfaces
@@ -5,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -103,8 +103,8 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
  *
  * FUNCTION:    acpi_read
  *
- * PARAMETERS:  value               - Where the value is returned
- *              reg                 - GAS register structure
+ * PARAMETERS:  Value               - Where the value is returned
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
@@ -112,7 +112,7 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
  *
  * LIMITATIONS: <These limitations also apply to acpi_write>
  *      bit_width must be exactly 8, 16, 32, or 64.
- *      space_ID must be system_memory or system_IO.
+ *      space_iD must be system_memory or system_iO.
  *      bit_offset and access_width are currently ignored, as there has
  *          not been a need to implement these.
  *
@@ -137,6 +137,11 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
                 return (status);
         }
 
+        width = reg->bit_width;
+        if (width == 64) {
+                width = 32;     /* Break into two 32-bit transfers */
+        }
+
         /* Initialize entire 64-bit return value to zero */
 
         *return_value = 0;
@@ -148,17 +153,24 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_read_memory((acpi_physical_address)
-                                             address, return_value,
-                                             reg->bit_width);
+                                             address, &value, width);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
-        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+                *return_value = value;
+
+                if (reg->bit_width == 64) {
+
+                        /* Read the top 32 bits */
 
-                width = reg->bit_width;
-                if (width == 64) {
-                        width = 32;     /* Break into two 32-bit transfers */
+                        status = acpi_os_read_memory((acpi_physical_address)
+                                                     (address + 4), &value, 32);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+                        *return_value |= ((u64)value << 32);
                 }
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_read_port((acpi_io_address)
                                            address, &value, width);
@@ -195,8 +207,8 @@ ACPI_EXPORT_SYMBOL(acpi_read)
  *
  * FUNCTION:    acpi_write
  *
- * PARAMETERS:  value               - Value to be written
- *              reg                 - GAS register structure
+ * PARAMETERS:  Value               - Value to be written
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
@@ -218,22 +230,32 @@ acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
                 return (status);
         }
 
+        width = reg->bit_width;
+        if (width == 64) {
+                width = 32;     /* Break into two 32-bit transfers */
+        }
+
         /*
          * Two address spaces supported: Memory or IO. PCI_Config is
          * not supported here because the GAS structure is insufficient
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_write_memory((acpi_physical_address)
-                                              address, value, reg->bit_width);
+                                              address, ACPI_LODWORD(value),
+                                              width);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
-        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
-                width = reg->bit_width;
-                if (width == 64) {
-                        width = 32;     /* Break into two 32-bit transfers */
+                if (reg->bit_width == 64) {
+                        status = acpi_os_write_memory((acpi_physical_address)
+                                                      (address + 4),
+                                                      ACPI_HIDWORD(value), 32);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
                 }
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_write_port((acpi_io_address)
                                             address, ACPI_LODWORD(value),
@@ -263,7 +285,6 @@ acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
 
 ACPI_EXPORT_SYMBOL(acpi_write)
 
-#if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_read_bit_register
@@ -334,7 +355,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register)
  *
  * PARAMETERS:  register_id     - ID of ACPI Bit Register to access
  *              Value           - Value to write to the register, in bit
- *                                position zero. The bit is automatically
+ *                                position zero. The bit is automaticallly
  *                                shifted to the correct position.
  *
  * RETURN:      Status
@@ -431,7 +452,7 @@ unlock_and_exit:
 }
 
 ACPI_EXPORT_SYMBOL(acpi_write_bit_register)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_sleep_type_data
@@ -440,7 +461,7 @@ ACPI_EXPORT_SYMBOL(acpi_write_bit_register)
  *              *sleep_type_a        - Where SLP_TYPa is returned
  *              *sleep_type_b        - Where SLP_TYPb is returned
  *
- * RETURN:      status - ACPI status
+ * RETURN:      Status - ACPI status
  *
  * DESCRIPTION: Obtain the SLP_TYPa and SLP_TYPb values for the requested sleep
  *              state.
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
deleted file mode 100644
index ae443fe2ebf..00000000000
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/******************************************************************************
- *
- * Name: hwxfsleep.c - ACPI Hardware Sleep/Wake External Interfaces
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include <linux/module.h>
-
-#define _COMPONENT          ACPI_HARDWARE
-ACPI_MODULE_NAME("hwxfsleep")
-
-/* Local prototypes */
-static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
-
-/*
- * Dispatch table used to efficiently branch to the various sleep
- * functions.
- */
-#define ACPI_SLEEP_FUNCTION_ID         0
-#define ACPI_WAKE_PREP_FUNCTION_ID     1
-#define ACPI_WAKE_FUNCTION_ID          2
-
-/* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
-
-static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
-        {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
-         acpi_hw_extended_sleep},
-        {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
-         acpi_hw_extended_wake_prep},
-        {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
-};
-
-/*
- * These functions are removed for the ACPI_REDUCED_HARDWARE case:
- *      acpi_set_firmware_waking_vector
- *      acpi_set_firmware_waking_vector64
- *      acpi_enter_sleep_state_s4bios
- */
-
-#if (!ACPI_REDUCED_HARDWARE)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_set_firmware_waking_vector
- *
- * PARAMETERS:  physical_address    - 32-bit physical address of ACPI real mode
- *                                    entry point.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
- *
- ******************************************************************************/
-
-acpi_status acpi_set_firmware_waking_vector(u32 physical_address)
-{
-        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
-
-
-        /*
-         * According to the ACPI specification 2.0c and later, the 64-bit
-         * waking vector should be cleared and the 32-bit waking vector should
-         * be used, unless we want the wake-up code to be called by the BIOS in
-         * Protected Mode.  Some systems (for example HP dv5-1004nr) are known
-         * to fail to resume if the 64-bit vector is used.
-         */
-
-        /* Set the 32-bit vector */
-
-        acpi_gbl_FACS->firmware_waking_vector = physical_address;
-
-        /* Clear the 64-bit vector if it exists */
-
-        if ((acpi_gbl_FACS->length > 32) && (acpi_gbl_FACS->version >= 1)) {
-                acpi_gbl_FACS->xfirmware_waking_vector = 0;
-        }
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
-
-#if ACPI_MACHINE_WIDTH == 64
-/*******************************************************************************
- *
- * FUNCTION:    acpi_set_firmware_waking_vector64
- *
- * PARAMETERS:  physical_address    - 64-bit physical address of ACPI protected
- *                                    mode entry point.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
- *              it exists in the table. This function is intended for use with
- *              64-bit host operating systems.
- *
- ******************************************************************************/
-acpi_status acpi_set_firmware_waking_vector64(u64 physical_address)
-{
-        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
-
-
-        /* Determine if the 64-bit vector actually exists */
-
-        if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-
-        /* Clear 32-bit vector, set the 64-bit X_ vector */
-
-        acpi_gbl_FACS->firmware_waking_vector = 0;
-        acpi_gbl_FACS->xfirmware_waking_vector = physical_address;
-        return_ACPI_STATUS(AE_OK);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
-#endif
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enter_sleep_state_s4bios
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Perform a S4 bios request.
- *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
- *
- ******************************************************************************/
-acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
-{
-        u32 in_value;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
-
-        /* Clear the wake status bit (PM1) */
-
-        status =
-            acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, ACPI_CLEAR_STATUS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_hw_clear_acpi_status();
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * 1) Disable/Clear all GPEs
-         * 2) Enable all wakeup GPEs
-         */
-        status = acpi_hw_disable_all_gpes();
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        acpi_gbl_system_awake_and_running = FALSE;
-
-        status = acpi_hw_enable_all_wakeup_gpes();
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        ACPI_FLUSH_CPU_CACHE();
-
-        status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
-                                    (u32)acpi_gbl_FADT.s4_bios_request, 8);
-
-        do {
-                acpi_os_stall(1000);
-                status =
-                    acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        } while (!in_value);
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-/*******************************************************************************
- *
- * FUNCTION:    acpi_hw_sleep_dispatch
- *
- * PARAMETERS:  sleep_state         - Which sleep state to enter/exit
- *              function_id         - Sleep, wake_prep, or Wake
- *
- * RETURN:      Status from the invoked sleep handling function.
- *
- * DESCRIPTION: Dispatch a sleep/wake request to the appropriate handling
- *              function.
- *
- ******************************************************************************/
-static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
-{
-        acpi_status status;
-        struct acpi_sleep_functions *sleep_functions =
-            &acpi_sleep_dispatch[function_id];
-
-#if (!ACPI_REDUCED_HARDWARE)
-
-        /*
-         * If the Hardware Reduced flag is set (from the FADT), we must
-         * use the extended sleep registers
-         */
-        if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
-                status = sleep_functions->extended_function(sleep_state);
-        } else {
-                /* Legacy sleep */
-
-                status = sleep_functions->legacy_function(sleep_state);
-        }
-
-        return (status);
-
-#else
-        /*
-         * For the case where reduced-hardware-only code is being generated,
-         * we know that only the extended sleep registers are available
-         */
-        status = sleep_functions->extended_function(sleep_state);
-        return (status);
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enter_sleep_state_prep
- *
- * PARAMETERS:  sleep_state         - Which sleep state to enter
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Prepare to enter a system sleep state.
- *              This function must execute with interrupts enabled.
- *              We break sleeping into 2 stages so that OSPM can handle
- *              various OS-specific tasks between the two steps.
- *
- ******************************************************************************/
-
-acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
-{
-        acpi_status status;
-        struct acpi_object_list arg_list;
-        union acpi_object arg;
-        u32 sst_value;
-
-        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_prep);
-
-        status = acpi_get_sleep_type_data(sleep_state,
-                                          &acpi_gbl_sleep_type_a,
-                                          &acpi_gbl_sleep_type_b);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Execute the _PTS method (Prepare To Sleep) */
-
-        arg_list.count = 1;
-        arg_list.pointer = &arg;
-        arg.type = ACPI_TYPE_INTEGER;
-        arg.integer.value = sleep_state;
-
-        status =
-            acpi_evaluate_object(NULL, METHOD_PATHNAME__PTS, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Setup the argument to the _SST method (System STatus) */
-
-        switch (sleep_state) {
-        case ACPI_STATE_S0:
-                sst_value = ACPI_SST_WORKING;
-                break;
-
-        case ACPI_STATE_S1:
-        case ACPI_STATE_S2:
-        case ACPI_STATE_S3:
-                sst_value = ACPI_SST_SLEEPING;
-                break;
-
-        case ACPI_STATE_S4:
-                sst_value = ACPI_SST_SLEEP_CONTEXT;
-                break;
-
-        default:
-                sst_value = ACPI_SST_INDICATOR_OFF;     /* Default is off */
-                break;
-        }
-
-        /*
-         * Set the system indicators to show the desired sleep state.
-         * _SST is an optional method (return no error if not found)
-         */
-        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, sst_value);
-        return_ACPI_STATUS(AE_OK);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enter_sleep_state
- *
- * PARAMETERS:  sleep_state         - Which sleep state to enter
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Enter a system sleep state (see ACPI 2.0 spec p 231)
- *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
- *
- ******************************************************************************/
-acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
-
-        if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
-            (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
-                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=0x%X B=0x%X",
-                            acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
-                return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
-        }
-
-        status = acpi_hw_sleep_dispatch(sleep_state, ACPI_SLEEP_FUNCTION_ID);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_leave_sleep_state_prep
- *
- * PARAMETERS:  sleep_state         - Which sleep state we are exiting
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
- *              sleep.
- *              Called with interrupts DISABLED.
- *
- ******************************************************************************/
-acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
-
-        status =
-            acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_PREP_FUNCTION_ID);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_leave_sleep_state_prep)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_leave_sleep_state
- *
- * PARAMETERS:  sleep_state         - Which sleep state we are exiting
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
- *              Called with interrupts ENABLED.
- *
- ******************************************************************************/
-acpi_status acpi_leave_sleep_state(u8 sleep_state)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
-
-        status = acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_FUNCTION_ID);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_leave_sleep_state)
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index d70eaf39dfd..d93172fd15a 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,11 +110,11 @@ acpi_status acpi_ns_root_initialize(void)
                 status = acpi_ns_lookup(NULL, init_val->name, init_val->type,
                                         ACPI_IMODE_LOAD_PASS2,
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
-                if (ACPI_FAILURE(status)) {
+
+                if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not create predefined name %s",
                                         init_val->name));
-                        continue;
                 }
 
                 /*
@@ -157,7 +157,7 @@ acpi_status acpi_ns_root_initialize(void)
 
 #if defined (ACPI_ASL_COMPILER)
 
-                                /* Save the parameter count for the iASL compiler */
+                                /* Save the parameter count for the i_aSL compiler */
 
                                 new_node->value = obj_desc->method.param_count;
 #else
@@ -179,7 +179,8 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 /* Build an object around the static string */
 
-                                obj_desc->string.length = (u32)ACPI_STRLEN(val);
+                                obj_desc->string.length =
+                                    (u32) ACPI_STRLEN(val);
                                 obj_desc->string.pointer = val;
                                 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
                                 break;
@@ -257,11 +258,11 @@ acpi_status acpi_ns_root_initialize(void)
  * FUNCTION:    acpi_ns_lookup
  *
  * PARAMETERS:  scope_info      - Current scope info block
- *              pathname        - Search pathname, in internal format
+ *              Pathname        - Search pathname, in internal format
  *                                (as represented in the AML stream)
- *              type            - Type associated with name
+ *              Type            - Type associated with name
  *              interpreter_mode - IMODE_LOAD_PASS2 => add name if not found
- *              flags           - Flags describing the search restrictions
+ *              Flags           - Flags describing the search restrictions
  *              walk_state      - Current state of the walk
  *              return_node     - Where the Node is placed (if found
  *                                or created successfully)
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 15143c44f5e..1d0ef15d158 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("nsalloc")
  *
  * FUNCTION:    acpi_ns_create_node
  *
- * PARAMETERS:  name            - Name of the new node (4 char ACPI name)
+ * PARAMETERS:  Name            - Name of the new node (4 char ACPI name)
  *
  * RETURN:      New namespace node (Null on failure)
  *
@@ -92,7 +92,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
  *
  * FUNCTION:    acpi_ns_delete_node
  *
- * PARAMETERS:  node            - Node to be deleted
+ * PARAMETERS:  Node            - Node to be deleted
  *
  * RETURN:      None
  *
@@ -143,7 +143,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
  *
  * FUNCTION:    acpi_ns_remove_node
  *
- * PARAMETERS:  node            - Node to be removed/deleted
+ * PARAMETERS:  Node            - Node to be removed/deleted
  *
  * RETURN:      None
  *
@@ -196,8 +196,8 @@ void acpi_ns_remove_node(struct acpi_namespace_node *node)
  *
  * PARAMETERS:  walk_state      - Current state of the walk
  *              parent_node     - The parent of the new Node
- *              node            - The new Node to install
- *              type            - ACPI object type of the new Node
+ *              Node            - The new Node to install
+ *              Type            - ACPI object type of the new Node
  *
  * RETURN:      None
  *
@@ -332,7 +332,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Delete a subtree of the namespace. This includes all objects
+ * DESCRIPTION: Delete a subtree of the namespace.  This includes all objects
  *              stored within the subtree.
  *
  ******************************************************************************/
@@ -418,7 +418,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
  * RETURN:      Status
  *
  * DESCRIPTION: Delete entries within the namespace that are owned by a
- *              specific ID. Used to delete entire ACPI tables. All
+ *              specific ID.  Used to delete entire ACPI tables.  All
  *              reference counts are updated.
  *
  * MUTEX:       Locks namespace during deletion walk.
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 924b3c71473..b683cc2ff9d 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
  * FUNCTION:    acpi_ns_print_pathname
  *
  * PARAMETERS:  num_segments        - Number of ACPI name segments
- *              pathname            - The compressed (internal) path
+ *              Pathname            - The compressed (internal) path
  *
  * RETURN:      None
  *
@@ -107,10 +107,10 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)
  *
  * FUNCTION:    acpi_ns_dump_pathname
  *
- * PARAMETERS:  handle              - Object
- *              msg                 - Prefix message
- *              level               - Desired debug level
- *              component           - Caller's component ID
+ * PARAMETERS:  Handle              - Object
+ *              Msg                 - Prefix message
+ *              Level               - Desired debug level
+ *              Component           - Caller's component ID
  *
  * RETURN:      None
  *
@@ -143,8 +143,8 @@ acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component)
  * FUNCTION:    acpi_ns_dump_one_object
  *
  * PARAMETERS:  obj_handle          - Node to be dumped
- *              level               - Nesting level of the handle
- *              context             - Passed into walk_namespace
+ *              Level               - Nesting level of the handle
+ *              Context             - Passed into walk_namespace
  *              return_value        - Not used
  *
  * RETURN:      Status
@@ -209,6 +209,14 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                                       "Invalid ACPI Object Type 0x%08X", type));
                 }
 
+                if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
+                        this_node->name.integer =
+                            acpi_ut_repair_name(this_node->name.ascii);
+
+                        ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
+                                      this_node->name.integer));
+                }
+
                 acpi_os_printf("%4.4s", acpi_ut_get_node_name(this_node));
         }
 
@@ -234,20 +242,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
 
                 if (!obj_desc) {
 
-                        /* No attached object. Some types should always have an object */
-
-                        switch (type) {
-                        case ACPI_TYPE_INTEGER:
-                        case ACPI_TYPE_PACKAGE:
-                        case ACPI_TYPE_BUFFER:
-                        case ACPI_TYPE_STRING:
-                        case ACPI_TYPE_METHOD:
-                                acpi_os_printf("<No attached object>");
-                                break;
-
-                        default:
-                                break;
-                        }
+                        /* No attached object, we are done */
 
                         acpi_os_printf("\n");
                         return (AE_OK);
@@ -256,7 +251,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 switch (type) {
                 case ACPI_TYPE_PROCESSOR:
 
-                        acpi_os_printf("ID %02X Len %02X Addr %p\n",
+                        acpi_os_printf("ID %X Len %.4X Addr %p\n",
                                        obj_desc->processor.proc_id,
                                        obj_desc->processor.length,
                                        ACPI_CAST_PTR(void,
@@ -607,7 +602,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
  *
  * FUNCTION:    acpi_ns_dump_objects
  *
- * PARAMETERS:  type                - Object type to be dumped
+ * PARAMETERS:  Type                - Object type to be dumped
  *              display_type        - 0 or ACPI_DISPLAY_SUMMARY
  *              max_depth           - Maximum depth of dump. Use ACPI_UINT32_MAX
  *                                    for an effectively unlimited depth.
@@ -663,7 +658,7 @@ acpi_ns_dump_objects(acpi_object_type type,
  *
  * FUNCTION:    acpi_ns_dump_entry
  *
- * PARAMETERS:  handle              - Node to be dumped
+ * PARAMETERS:  Handle              - Node to be dumped
  *              debug_level         - Output level
  *
  * RETURN:      None
@@ -692,7 +687,7 @@ void acpi_ns_dump_entry(acpi_handle handle, u32 debug_level)
  *
  * PARAMETERS:  search_base         - Root of subtree to be dumped, or
  *                                    NS_ALL to dump the entire namespace
- *              max_depth           - Maximum depth of dump. Use INT_MAX
+ *              max_depth           - Maximum depth of dump.  Use INT_MAX
  *                                    for an effectively unlimited depth.
  *
  * RETURN:      None
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 944d4c8d943..2ed294b7a4d 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,9 +55,9 @@ ACPI_MODULE_NAME("nsdumpdv")
  *
  * FUNCTION:    acpi_ns_dump_one_device
  *
- * PARAMETERS:  handle              - Node to be dumped
- *              level               - Nesting level of the handle
- *              context             - Passed into walk_namespace
+ * PARAMETERS:  Handle              - Node to be dumped
+ *              Level               - Nesting level of the handle
+ *              Context             - Passed into walk_namespace
  *              return_value        - Not used
  *
  * RETURN:      Status
@@ -121,7 +121,7 @@ void acpi_ns_dump_root_devices(void)
                 return;
         }
 
-        status = acpi_get_handle(NULL, METHOD_NAME__SB_, &sys_bus_handle);
+        status = acpi_get_handle(NULL, ACPI_NS_SYSTEM_BUS, &sys_bus_handle);
         if (ACPI_FAILURE(status)) {
                 return;
         }
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 69074be498e..c1bd02b1a05 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,11 +59,11 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
  *
  * FUNCTION:    acpi_ns_evaluate
  *
- * PARAMETERS:  info            - Evaluation info block, contains:
+ * PARAMETERS:  Info            - Evaluation info block, contains:
  *                  prefix_node     - Prefix or Method/Object Node to execute
- *                  pathname        - Name of method to execute, If NULL, the
+ *                  Pathname        - Name of method to execute, If NULL, the
  *                                    Node is the object to execute
- *                  parameters      - List of parameters to pass to the method,
+ *                  Parameters      - List of parameters to pass to the method,
  *                                    terminated by NULL. Params itself may be
  *                                    NULL if no parameters are being passed.
  *                  return_object   - Where to put method's return value (if
@@ -71,7 +71,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
  *                  parameter_type  - Type of Parameter list
  *                  return_object   - Where to put method's return value (if
  *                                    any). If NULL, no value is returned.
- *                  flags           - ACPI_IGNORE_RETURN_VALUE to delete return
+ *                  Flags           - ACPI_IGNORE_RETURN_VALUE to delete return
  *
  * RETURN:      Status
  *
@@ -351,7 +351,7 @@ void acpi_ns_exec_module_code_list(void)
  * FUNCTION:    acpi_ns_exec_module_code
  *
  * PARAMETERS:  method_obj          - Object container for the module-level code
- *              info                - Info block for method evaluation
+ *              Info                - Info block for method evaluation
  *
  * RETURN:      None. Exceptions during method execution are ignored, since
  *              we cannot abort a table load.
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 4328e2adfeb..fd7c6380e29 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -96,8 +96,8 @@ acpi_status acpi_ns_initialize_objects(void)
         /* Walk entire namespace from the supplied root */
 
         status = acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, acpi_ns_init_one_object,
-                                     NULL, &info, NULL);
+                                     ACPI_UINT32_MAX, acpi_ns_init_one_object, NULL,
+                                     &info, NULL);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
         }
@@ -224,8 +224,8 @@ acpi_status acpi_ns_initialize_devices(void)
  * FUNCTION:    acpi_ns_init_one_object
  *
  * PARAMETERS:  obj_handle      - Node
- *              level           - Current nesting level
- *              context         - Points to a init info struct
+ *              Level           - Current nesting level
+ *              Context         - Points to a init info struct
  *              return_value    - Not used
  *
  * RETURN:      Status
@@ -530,7 +530,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                          * we will not run _INI, but we continue to examine the children
                          * of this device.
                          *
-                         * From the ACPI spec, description of _STA: (note - no mention
+                         * From the ACPI spec, description of _STA: (Note - no mention
                          * of whether to run _INI or not on the device in question)
                          *
                          * "_STA may return bit 0 clear (not present) with bit 3 set
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 911f99127b9..5f7dc691c18 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
  * FUNCTION:    acpi_ns_load_table
  *
  * PARAMETERS:  table_index     - Index for table to be loaded
- *              node            - Owning NS node
+ *              Node            - Owning NS node
  *
  * RETURN:      Status
  *
@@ -80,8 +80,8 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 
         /*
          * Parse the table and load the namespace with all named
-         * objects found within. Control methods are NOT parsed
-         * at this time. In fact, the control methods cannot be
+         * objects found within.  Control methods are NOT parsed
+         * at this time.  In fact, the control methods cannot be
          * parsed until the entire namespace is loaded, because
          * if a control method makes a forward reference (call)
          * to another control method, we can't continue parsing
@@ -122,7 +122,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
         }
 
         /*
-         * Now we can parse the control methods. We always parse
+         * Now we can parse the control methods.  We always parse
          * them here for a sanity check, and if configured for
          * just-in-time parsing, we delete the control method
          * parse trees.
@@ -166,7 +166,7 @@ acpi_status acpi_ns_load_namespace(void)
         }
 
         /*
-         * Load the namespace. The DSDT is required,
+         * Load the namespace.  The DSDT is required,
          * but the SSDT and PSDT tables are optional.
          */
         status = acpi_ns_load_table_by_type(ACPI_TABLE_ID_DSDT);
@@ -278,12 +278,12 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
  *
  *  FUNCTION:       acpi_ns_unload_name_space
  *
- *  PARAMETERS:     handle          - Root of namespace subtree to be deleted
+ *  PARAMETERS:     Handle          - Root of namespace subtree to be deleted
  *
  *  RETURN:         Status
  *
  *  DESCRIPTION:    Shrinks the namespace, typically in response to an undocking
- *                  event. Deletes an entire subtree starting from (and
+ *                  event.  Deletes an entire subtree starting from (and
  *                  including) the given handle.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 55a175eadcc..d5fa520c3de 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("nsnames")
  *
  * FUNCTION:    acpi_ns_build_external_path
  *
- * PARAMETERS:  node            - NS node whose pathname is needed
- *              size            - Size of the pathname
+ * PARAMETERS:  Node            - NS node whose pathname is needed
+ *              Size            - Size of the pathname
  *              *name_buffer    - Where to return the pathname
  *
  * RETURN:      Status
@@ -120,7 +120,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_ns_get_external_pathname
  *
- * PARAMETERS:  node            - Namespace node whose pathname is needed
+ * PARAMETERS:  Node            - Namespace node whose pathname is needed
  *
  * RETURN:      Pointer to storage containing the fully qualified name of
  *              the node, In external format (name segments separated by path
@@ -168,7 +168,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
  *
  * FUNCTION:    acpi_ns_get_pathname_length
  *
- * PARAMETERS:  node        - Namespace node
+ * PARAMETERS:  Node        - Namespace node
  *
  * RETURN:      Length of path, including prefix
  *
@@ -195,7 +195,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
                         ACPI_ERROR((AE_INFO,
                                     "Invalid Namespace Node (%p) while traversing namespace",
                                     next_node));
-                        return (0);
+                        return 0;
                 }
                 size += ACPI_PATH_SEGMENT_LENGTH;
                 next_node = next_node->parent;
@@ -214,7 +214,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
  *
  * PARAMETERS:  target_handle           - Handle of named object whose name is
  *                                        to be found
- *              buffer                  - Where the pathname is returned
+ *              Buffer                  - Where the pathname is returned
  *
  * RETURN:      Status, Buffer is filled with pathname if status is AE_OK
  *
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index e69f7fa2579..3bb8bf105ea 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,15 +53,15 @@ ACPI_MODULE_NAME("nsobject")
  *
  * FUNCTION:    acpi_ns_attach_object
  *
- * PARAMETERS:  node                - Parent Node
- *              object              - Object to be attached
- *              type                - Type of object, or ACPI_TYPE_ANY if not
+ * PARAMETERS:  Node                - Parent Node
+ *              Object              - Object to be attached
+ *              Type                - Type of object, or ACPI_TYPE_ANY if not
  *                                    known
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Record the given object as the value associated with the
- *              name whose acpi_handle is passed. If Object is NULL
+ *              name whose acpi_handle is passed.  If Object is NULL
  *              and Type is ACPI_TYPE_ANY, set the name as having no value.
  *              Note: Future may require that the Node->Flags field be passed
  *              as a parameter.
@@ -133,7 +133,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
                  ((struct acpi_namespace_node *)object)->object) {
                 /*
                  * Value passed is a name handle and that name has a
-                 * non-null value. Use that name's value and type.
+                 * non-null value.  Use that name's value and type.
                  */
                 obj_desc = ((struct acpi_namespace_node *)object)->object;
                 object_type = ((struct acpi_namespace_node *)object)->type;
@@ -191,7 +191,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_ns_detach_object
  *
- * PARAMETERS:  node           - A Namespace node whose object will be detached
+ * PARAMETERS:  Node           - A Namespace node whose object will be detached
  *
  * RETURN:      None.
  *
@@ -250,7 +250,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
  *
  * FUNCTION:    acpi_ns_get_attached_object
  *
- * PARAMETERS:  node             - Namespace node
+ * PARAMETERS:  Node             - Namespace node
  *
  * RETURN:      Current value of the object field from the Node whose
  *              handle is passed
@@ -285,7 +285,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
  *
  * FUNCTION:    acpi_ns_get_secondary_object
  *
- * PARAMETERS:  node             - Namespace node
+ * PARAMETERS:  Node             - Namespace node
  *
  * RETURN:      Current value of the object field from the Node whose
  *              handle is passed.
@@ -315,13 +315,13 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
  *
  * FUNCTION:    acpi_ns_attach_data
  *
- * PARAMETERS:  node            - Namespace node
- *              handler         - Handler to be associated with the data
- *              data            - Data to be attached
+ * PARAMETERS:  Node            - Namespace node
+ *              Handler         - Handler to be associated with the data
+ *              Data            - Data to be attached
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Low-level attach data. Create and attach a Data object.
+ * DESCRIPTION: Low-level attach data.  Create and attach a Data object.
  *
  ******************************************************************************/
 
@@ -372,12 +372,12 @@ acpi_ns_attach_data(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_ns_detach_data
  *
- * PARAMETERS:  node            - Namespace node
- *              handler         - Handler associated with the data
+ * PARAMETERS:  Node            - Namespace node
+ *              Handler         - Handler associated with the data
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Low-level detach data. Delete the data node, but the caller
+ * DESCRIPTION: Low-level detach data.  Delete the data node, but the caller
  *              is responsible for the actual data.
  *
  ******************************************************************************/
@@ -416,9 +416,9 @@ acpi_ns_detach_data(struct acpi_namespace_node * node,
  *
  * FUNCTION:    acpi_ns_get_attached_data
  *
- * PARAMETERS:  node            - Namespace node
- *              handler         - Handler associated with the data
- *              data            - Where the data is returned
+ * PARAMETERS:  Node            - Namespace node
+ *              Handler         - Handler associated with the data
+ *              Data            - Where the data is returned
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 233f756d5cf..b3234fa795b 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -168,11 +168,11 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         /*
          * AML Parse, pass 1
          *
-         * In this pass, we load most of the namespace. Control methods
-         * are not parsed until later. A parse tree is not created. Instead,
-         * each Parser Op subtree is deleted when it is finished. This saves
+         * In this pass, we load most of the namespace.  Control methods
+         * are not parsed until later.  A parse tree is not created.  Instead,
+         * each Parser Op subtree is deleted when it is finished.  This saves
          * a great deal of memory, and allows a small cache of parse objects
-         * to service the entire parse. The second pass of the parse then
+         * to service the entire parse.  The second pass of the parse then
          * performs another complete parse of the AML.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 2419f417ea3..c845c8089f3 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,7 +116,7 @@ static const char *acpi_rtype_names[] = {
  *
  * FUNCTION:    acpi_ns_check_predefined_names
  *
- * PARAMETERS:  node            - Namespace node for the method/object
+ * PARAMETERS:  Node            - Namespace node for the method/object
  *              user_param_count - Number of parameters actually passed
  *              return_status   - Status from the object evaluation
  *              return_object_ptr - Pointer to the object returned from the
@@ -275,10 +275,10 @@ cleanup:
  *
  * FUNCTION:    acpi_ns_check_parameter_count
  *
- * PARAMETERS:  pathname        - Full pathname to the node (for error msgs)
- *              node            - Namespace node for the method/object
+ * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ *              Node            - Namespace node for the method/object
  *              user_param_count - Number of args passed in by the caller
- *              predefined      - Pointer to entry in predefined name table
+ *              Predefined      - Pointer to entry in predefined name table
  *
  * RETURN:      None
  *
@@ -364,7 +364,7 @@ acpi_ns_check_parameter_count(char *pathname,
  *
  * FUNCTION:    acpi_ns_check_for_predefined_name
  *
- * PARAMETERS:  node            - Namespace node for the method/object
+ * PARAMETERS:  Node            - Namespace node for the method/object
  *
  * RETURN:      Pointer to entry in predefined table. NULL indicates not found.
  *
@@ -410,7 +410,7 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
  *
  * FUNCTION:    acpi_ns_check_package
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
  *
@@ -620,7 +620,6 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_FIXED:
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_COUNT:
-        case ACPI_PTYPE2_FIX_VAR:
 
                 /*
                  * These types all return a single Package that consists of a
@@ -638,8 +637,8 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                         /* Create the new outer package and populate it */
 
                         status =
-                            acpi_ns_wrap_with_package(data, return_object,
-                                                      return_object_ptr);
+                            acpi_ns_repair_package_list(data,
+                                                        return_object_ptr);
                         if (ACPI_FAILURE(status)) {
                                 return (status);
                         }
@@ -685,11 +684,11 @@ package_too_small:
  *
  * FUNCTION:    acpi_ns_check_package_list
  *
- * PARAMETERS:  data            - Pointer to validation data structure
- *              package         - Pointer to package-specific info for method
- *              elements        - Element list of parent package. All elements
+ * PARAMETERS:  Data            - Pointer to validation data structure
+ *              Package         - Pointer to package-specific info for method
+ *              Elements        - Element list of parent package. All elements
  *                                of this list should be of type Package.
- *              count           - Count of subpackages
+ *              Count           - Count of subpackages
  *
  * RETURN:      Status
  *
@@ -760,34 +759,6 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         }
                         break;
 
-                case ACPI_PTYPE2_FIX_VAR:
-                        /*
-                         * Each subpackage has a fixed number of elements and an
-                         * optional element
-                         */
-                        expected_count =
-                            package->ret_info.count1 + package->ret_info.count2;
-                        if (sub_package->package.count < expected_count) {
-                                goto package_too_small;
-                        }
-
-                        status =
-                            acpi_ns_check_package_elements(data, sub_elements,
-                                                           package->ret_info.
-                                                           object_type1,
-                                                           package->ret_info.
-                                                           count1,
-                                                           package->ret_info.
-                                                           object_type2,
-                                                           sub_package->package.
-                                                           count -
-                                                           package->ret_info.
-                                                           count1, 0);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
-                        break;
-
                 case ACPI_PTYPE2_FIXED:
 
                         /* Each sub-package has a fixed length */
@@ -911,12 +882,12 @@ package_too_small:
  *
  * FUNCTION:    acpi_ns_check_package_elements
  *
- * PARAMETERS:  data            - Pointer to validation data structure
- *              elements        - Pointer to the package elements array
- *              type1           - Object type for first group
- *              count1          - Count for first group
- *              type2           - Object type for second group
- *              count2          - Count for second group
+ * PARAMETERS:  Data            - Pointer to validation data structure
+ *              Elements        - Pointer to the package elements array
+ *              Type1           - Object type for first group
+ *              Count1          - Count for first group
+ *              Type2           - Object type for second group
+ *              Count2          - Count for second group
  *              start_index     - Start of the first group of elements
  *
  * RETURN:      Status
@@ -968,7 +939,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_object_type
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
  *              expected_btypes - Bitmap of expected return type(s)
@@ -1102,7 +1073,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_reference
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  Data            - Pointer to validation data structure
  *              return_object   - Object returned from the evaluation of a
  *                                method or object
  *
@@ -1140,7 +1111,7 @@ acpi_ns_check_reference(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_get_expected_types
  *
- * PARAMETERS:  buffer          - Pointer to where the string is returned
+ * PARAMETERS:  Buffer          - Pointer to where the string is returned
  *              expected_btypes - Bitmap of expected return type(s)
  *
  * RETURN:      Buffer is populated with type names.
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 8c5f292860f..ac7b854b0bd 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,10 +71,11 @@ ACPI_MODULE_NAME("nsrepair")
  * Buffer  -> String
  * Buffer  -> Package of Integers
  * Package -> Package of one Package
- * An incorrect standalone object is wrapped with required outer package
  *
  * Additional possible repairs:
+ *
  * Required package elements that are NULL replaced by Integer/String/Buffer
+ * Incorrect standalone package wrapped with required outer package
  *
  ******************************************************************************/
 /* Local prototypes */
@@ -90,11 +91,15 @@ static acpi_status
 acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
                           union acpi_operand_object **return_object);
 
+static acpi_status
+acpi_ns_convert_to_package(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_repair_object
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              expected_btypes     - Object types expected
  *              package_index       - Index of object within parent package (if
  *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -146,24 +151,9 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
                 }
         }
         if (expected_btypes & ACPI_RTYPE_PACKAGE) {
-                /*
-                 * A package is expected. We will wrap the existing object with a
-                 * new package object. It is often the case that if a variable-length
-                 * package is required, but there is only a single object needed, the
-                 * BIOS will return that object instead of wrapping it with a Package
-                 * object. Note: after the wrapping, the package will be validated
-                 * for correct contents (expected object type or types).
-                 */
-                status =
-                    acpi_ns_wrap_with_package(data, return_object, &new_object);
+                status = acpi_ns_convert_to_package(return_object, &new_object);
                 if (ACPI_SUCCESS(status)) {
-                        /*
-                         * The original object just had its reference count
-                         * incremented for being inserted into the new package.
-                         */
-                        *return_object_ptr = new_object;        /* New Package object */
-                        data->flags |= ACPI_OBJECT_REPAIRED;
-                        return (AE_OK);
+                        goto object_repaired;
                 }
         }
 
@@ -175,27 +165,22 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
 
         /* Object was successfully repaired */
 
+        /*
+         * If the original object is a package element, we need to:
+         * 1. Set the reference count of the new object to match the
+         *    reference count of the old object.
+         * 2. Decrement the reference count of the original object.
+         */
         if (package_index != ACPI_NOT_PACKAGE_ELEMENT) {
-                /*
-                 * The original object is a package element. We need to
-                 * decrement the reference count of the original object,
-                 * for removing it from the package.
-                 *
-                 * However, if the original object was just wrapped with a
-                 * package object as part of the repair, we don't need to
-                 * change the reference count.
-                 */
-                if (!(data->flags & ACPI_OBJECT_WRAPPED)) {
-                        new_object->common.reference_count =
-                            return_object->common.reference_count;
+                new_object->common.reference_count =
+                    return_object->common.reference_count;
 
-                        if (return_object->common.reference_count > 1) {
-                                return_object->common.reference_count--;
-                        }
+                if (return_object->common.reference_count > 1) {
+                        return_object->common.reference_count--;
                 }
 
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
-                                  "%s: Converted %s to expected %s at Package index %u\n",
+                                  "%s: Converted %s to expected %s at index %u\n",
                                   data->pathname,
                                   acpi_ut_get_object_type_name(return_object),
                                   acpi_ut_get_object_type_name(new_object),
@@ -468,9 +453,68 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ns_convert_to_package
+ *
+ * PARAMETERS:  original_object     - Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful.
+ *
+ * DESCRIPTION: Attempt to convert a Buffer object to a Package. Each byte of
+ *              the buffer is converted to a single integer package element.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ns_convert_to_package(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        union acpi_operand_object **elements;
+        u32 length;
+        u8 *buffer;
+
+        switch (original_object->common.type) {
+        case ACPI_TYPE_BUFFER:
+
+                /* Buffer-to-Package conversion */
+
+                length = original_object->buffer.length;
+                new_object = acpi_ut_create_package_object(length);
+                if (!new_object) {
+                        return (AE_NO_MEMORY);
+                }
+
+                /* Convert each buffer byte to an integer package element */
+
+                elements = new_object->package.elements;
+                buffer = original_object->buffer.pointer;
+
+                while (length--) {
+                        *elements =
+                            acpi_ut_create_integer_object((u64) *buffer);
+                        if (!*elements) {
+                                acpi_ut_remove_reference(new_object);
+                                return (AE_NO_MEMORY);
+                        }
+                        elements++;
+                        buffer++;
+                }
+                break;
+
+        default:
+                return (AE_AML_OPERAND_TYPE);
+        }
+
+        *return_object = new_object;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ns_repair_null_element
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              expected_btypes     - Object types expected
  *              package_index       - Index of object within parent package (if
  *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -509,17 +553,17 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
          */
         if (expected_btypes & ACPI_RTYPE_INTEGER) {
 
-                /* Need an integer - create a zero-value integer */
+                /* Need an Integer - create a zero-value integer */
 
                 new_object = acpi_ut_create_integer_object((u64)0);
         } else if (expected_btypes & ACPI_RTYPE_STRING) {
 
-                /* Need a string - create a NULL string */
+                /* Need a String - create a NULL string */
 
                 new_object = acpi_ut_create_string_object(0);
         } else if (expected_btypes & ACPI_RTYPE_BUFFER) {
 
-                /* Need a buffer - create a zero-length buffer */
+                /* Need a Buffer - create a zero-length buffer */
 
                 new_object = acpi_ut_create_buffer_object(0);
         } else {
@@ -552,7 +596,7 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_remove_null_elements
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              package_type        - An acpi_return_package_types value
  *              obj_desc            - A Package object
  *
@@ -590,7 +634,6 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_FIXED:
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_REV_FIXED:
-        case ACPI_PTYPE2_FIX_VAR:
                 break;
 
         default:
@@ -633,56 +676,55 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_wrap_with_package
+ * FUNCTION:    acpi_ns_repair_package_list
  *
- * PARAMETERS:  data                - Pointer to validation data structure
- *              original_object     - Pointer to the object to repair.
- *              obj_desc_ptr        - The new package object is returned here
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              obj_desc_ptr        - Pointer to the object to repair. The new
+ *                                    package object is returned here,
+ *                                    overwriting the old object.
  *
  * RETURN:      Status, new object in *obj_desc_ptr
  *
- * DESCRIPTION: Repair a common problem with objects that are defined to
- *              return a variable-length Package of sub-objects. If there is
- *              only one sub-object, some BIOS code mistakenly simply declares
- *              the single object instead of a Package with one sub-object.
- *              This function attempts to repair this error by wrapping a
- *              Package object around the original object, creating the
- *              correct and expected Package with one sub-object.
+ * DESCRIPTION: Repair a common problem with objects that are defined to return
+ *              a variable-length Package of Packages. If the variable-length
+ *              is one, some BIOS code mistakenly simply declares a single
+ *              Package instead of a Package with one sub-Package. This
+ *              function attempts to repair this error by wrapping a Package
+ *              object around the original Package, creating the correct
+ *              Package with one sub-Package.
  *
  *              Names that can be repaired in this manner include:
- *              _ALR, _CSD, _HPX, _MLS, _PLD, _PRT, _PSS, _TRT, _TSS,
- *              _BCL, _DOD, _FIX, _Sx
+ *              _ALR, _CSD, _HPX, _MLS, _PRT, _PSS, _TRT, TSS
  *
  ******************************************************************************/
 
 acpi_status
-acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
-                          union acpi_operand_object *original_object,
-                          union acpi_operand_object **obj_desc_ptr)
+acpi_ns_repair_package_list(struct acpi_predefined_data *data,
+                            union acpi_operand_object **obj_desc_ptr)
 {
         union acpi_operand_object *pkg_obj_desc;
 
-        ACPI_FUNCTION_NAME(ns_wrap_with_package);
+        ACPI_FUNCTION_NAME(ns_repair_package_list);
 
         /*
          * Create the new outer package and populate it. The new package will
-         * have a single element, the lone sub-object.
+         * have a single element, the lone subpackage.
          */
         pkg_obj_desc = acpi_ut_create_package_object(1);
         if (!pkg_obj_desc) {
                 return (AE_NO_MEMORY);
         }
 
-        pkg_obj_desc->package.elements[0] = original_object;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
-                          "%s: Wrapped %s with expected Package object\n",
-                          data->pathname,
-                          acpi_ut_get_object_type_name(original_object)));
+        pkg_obj_desc->package.elements[0] = *obj_desc_ptr;
 
         /* Return the new object in the object pointer */
 
         *obj_desc_ptr = pkg_obj_desc;
-        data->flags |= ACPI_OBJECT_REPAIRED | ACPI_OBJECT_WRAPPED;
+        data->flags |= ACPI_OBJECT_REPAIRED;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+                          "%s: Repaired incorrectly formed Package\n",
+                          data->pathname));
+
         return (AE_OK);
 }
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 90189251cdf..024c4f263f8 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149,8 +149,8 @@ static const struct acpi_repair_info acpi_ns_repairable_names[] = {
  *
  * FUNCTION:    acpi_ns_complex_repairs
  *
- * PARAMETERS:  data                - Pointer to validation data structure
- *              node                - Namespace node for the method/object
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              Node                - Namespace node for the method/object
  *              validate_status     - Original status of earlier validation
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
@@ -187,7 +187,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_match_repairable_name
  *
- * PARAMETERS:  node                - Namespace node for the method/object
+ * PARAMETERS:  Node                - Namespace node for the method/object
  *
  * RETURN:      Pointer to entry in repair table. NULL indicates not found.
  *
@@ -218,7 +218,7 @@ static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct
  *
  * FUNCTION:    acpi_ns_repair_ALR
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -247,7 +247,7 @@ acpi_ns_repair_ALR(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_FDE
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -335,7 +335,7 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_CID
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -405,7 +405,7 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_HID
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -467,12 +467,11 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
         }
 
         /*
-         * Copy and uppercase the string. From the ACPI 5.0 specification:
+         * Copy and uppercase the string. From the ACPI specification:
          *
          * A valid PNP ID must be of the form "AAA####" where A is an uppercase
          * letter and # is a hex digit. A valid ACPI ID must be of the form
-         * "NNNN####" where N is an uppercase letter or decimal digit, and
-         * # is a hex digit.
+         * "ACPI####" where # is a hex digit.
          */
         for (dest = new_string->string.pointer; *source; dest++, source++) {
                 *dest = (char)ACPI_TOUPPER(*source);
@@ -487,7 +486,7 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_TSS
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -531,7 +530,7 @@ acpi_ns_repair_TSS(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_PSS
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -600,7 +599,7 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_sorted_list
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  Data                - Pointer to validation data structure
  *              return_object       - Pointer to the top-level returned object
  *              expected_count      - Minimum length of each sub-package
  *              sort_index          - Sub-package entry to sort on
@@ -707,9 +706,9 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_sort_list
  *
- * PARAMETERS:  elements            - Package object element list
- *              count               - Element count for above
- *              index               - Sort by which package element
+ * PARAMETERS:  Elements            - Package object element list
+ *              Count               - Element count for above
+ *              Index               - Sort by which package element
  *              sort_direction      - Ascending or Descending sort
  *
  * RETURN:      None
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 1d2d8ffc1bc..28b0d7a62b9 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ acpi_ns_search_parent_tree(u32 target_name,
  *
  * PARAMETERS:  target_name     - Ascii ACPI name to search for
  *              parent_node     - Starting node where search will begin
- *              type            - Object type to match
+ *              Type            - Object type to match
  *              return_node     - Where the matched Named obj is returned
  *
  * RETURN:      Status
@@ -175,8 +175,8 @@ acpi_ns_search_one_scope(u32 target_name,
  * FUNCTION:    acpi_ns_search_parent_tree
  *
  * PARAMETERS:  target_name     - Ascii ACPI name to search for
- *              node            - Starting node where search will begin
- *              type            - Object type to match
+ *              Node            - Starting node where search will begin
+ *              Type            - Object type to match
  *              return_node     - Where the matched Node is returned
  *
  * RETURN:      Status
@@ -264,11 +264,11 @@ acpi_ns_search_parent_tree(u32 target_name,
  *
  * PARAMETERS:  target_name         - Ascii ACPI name to search for (4 chars)
  *              walk_state          - Current state of the walk
- *              node                - Starting node where search will begin
+ *              Node                - Starting node where search will begin
  *              interpreter_mode    - Add names only in ACPI_MODE_LOAD_PASS_x.
  *                                    Otherwise,search only.
- *              type                - Object type to match
- *              flags               - Flags describing the search restrictions
+ *              Type                - Object type to match
+ *              Flags               - Flags describing the search restrictions
  *              return_node         - Where the Node is returned
  *
  * RETURN:      Status
@@ -314,7 +314,22 @@ acpi_ns_search_and_enter(u32 target_name,
          * this problem, and we want to be able to enable ACPI support for them,
          * even though there are a few bad names.
          */
-        acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
+        if (!acpi_ut_valid_acpi_name(target_name)) {
+                target_name =
+                    acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
+
+                /* Report warning only if in strict mode or debug mode */
+
+                if (!acpi_gbl_enable_interpreter_slack) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                      ACPI_CAST_PTR(char, &target_name)));
+                } else {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                          ACPI_CAST_PTR(char, &target_name)));
+                }
+        }
 
         /* Try to find the name in the namespace level specified by the caller */
 
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index b5b4cb72a8a..cb1b104a69a 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,8 +62,8 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
  *
  * FUNCTION:    acpi_ns_print_node_pathname
  *
- * PARAMETERS:  node            - Object
- *              message         - Prefix message
+ * PARAMETERS:  Node            - Object
+ *              Message         - Prefix message
  *
  * DESCRIPTION: Print an object's full namespace pathname
  *              Manages allocation/freeing of a pathname buffer
@@ -101,7 +101,7 @@ acpi_ns_print_node_pathname(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_ns_valid_root_prefix
  *
- * PARAMETERS:  prefix          - Character to be checked
+ * PARAMETERS:  Prefix          - Character to be checked
  *
  * RETURN:      TRUE if a valid prefix
  *
@@ -119,7 +119,7 @@ u8 acpi_ns_valid_root_prefix(char prefix)
  *
  * FUNCTION:    acpi_ns_valid_path_separator
  *
- * PARAMETERS:  sep         - Character to be checked
+ * PARAMETERS:  Sep         - Character to be checked
  *
  * RETURN:      TRUE if a valid path separator
  *
@@ -137,7 +137,7 @@ static u8 acpi_ns_valid_path_separator(char sep)
  *
  * FUNCTION:    acpi_ns_get_type
  *
- * PARAMETERS:  node        - Parent Node to be examined
+ * PARAMETERS:  Node        - Parent Node to be examined
  *
  * RETURN:      Type field from Node whose handle is passed
  *
@@ -161,7 +161,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
  *
  * FUNCTION:    acpi_ns_local
  *
- * PARAMETERS:  type        - A namespace object type
+ * PARAMETERS:  Type        - A namespace object type
  *
  * RETURN:      LOCAL if names must be found locally in objects of the
  *              passed type, 0 if enclosing scopes should be searched
@@ -189,7 +189,7 @@ u32 acpi_ns_local(acpi_object_type type)
  *
  * FUNCTION:    acpi_ns_get_internal_name_length
  *
- * PARAMETERS:  info            - Info struct initialized with the
+ * PARAMETERS:  Info            - Info struct initialized with the
  *                                external name pointer.
  *
  * RETURN:      None
@@ -260,7 +260,7 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
  *
  * FUNCTION:    acpi_ns_build_internal_name
  *
- * PARAMETERS:  info            - Info struct fully initialized
+ * PARAMETERS:  Info            - Info struct fully initialized
  *
  * RETURN:      Status
  *
@@ -341,7 +341,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
 
                 if (!acpi_ns_valid_path_separator(*external_name) &&
                     (*external_name != 0)) {
-                        return_ACPI_STATUS(AE_BAD_PATHNAME);
+                        return_ACPI_STATUS(AE_BAD_PARAMETER);
                 }
 
                 /* Move on the next segment */
@@ -371,7 +371,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
  * FUNCTION:    acpi_ns_internalize_name
  *
  * PARAMETERS:  *external_name          - External representation of name
- *              **Converted name        - Where to return the resulting
+ *              **Converted Name        - Where to return the resulting
  *                                        internal represention of the name
  *
  * RETURN:      Status
@@ -530,7 +530,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
             ((num_segments > 0) ? (num_segments - 1) : 0) + 1;
 
         /*
-         * Check to see if we're still in bounds. If not, there's a problem
+         * Check to see if we're still in bounds.  If not, there's a problem
          * with internal_name (invalid format).
          */
         if (required_length > internal_name_length) {
@@ -557,14 +557,10 @@ acpi_ns_externalize_name(u32 internal_name_length,
                                 (*converted_name)[j++] = '.';
                         }
 
-                        /* Copy and validate the 4-char name segment */
-
-                        ACPI_MOVE_NAME(&(*converted_name)[j],
-                                       &internal_name[names_index]);
-                        acpi_ut_repair_name(&(*converted_name)[j]);
-
-                        j += ACPI_NAME_SIZE;
-                        names_index += ACPI_NAME_SIZE;
+                        (*converted_name)[j++] = internal_name[names_index++];
+                        (*converted_name)[j++] = internal_name[names_index++];
+                        (*converted_name)[j++] = internal_name[names_index++];
+                        (*converted_name)[j++] = internal_name[names_index++];
                 }
         }
 
@@ -579,7 +575,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
  *
  * FUNCTION:    acpi_ns_validate_handle
  *
- * PARAMETERS:  handle          - Handle to be validated and typecast to a
+ * PARAMETERS:  Handle          - Handle to be validated and typecast to a
  *                                namespace node.
  *
  * RETURN:      A pointer to a namespace node
@@ -655,7 +651,7 @@ void acpi_ns_terminate(void)
  *
  * FUNCTION:    acpi_ns_opens_scope
  *
- * PARAMETERS:  type        - A valid namespace type
+ * PARAMETERS:  Type        - A valid namespace type
  *
  * RETURN:      NEWSCOPE if the passed type "opens a name scope" according
  *              to the ACPI specification, else 0
@@ -681,19 +677,19 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
  *
  * FUNCTION:    acpi_ns_get_node
  *
- * PARAMETERS:  *pathname   - Name to be found, in external (ASL) format. The
+ * PARAMETERS:  *Pathname   - Name to be found, in external (ASL) format. The
  *                            \ (backslash) and ^ (carat) prefixes, and the
  *                            . (period) to separate segments are supported.
  *              prefix_node  - Root of subtree to be searched, or NS_ALL for the
- *                            root of the name space. If Name is fully
+ *                            root of the name space.  If Name is fully
  *                            qualified (first s8 is '\'), the passed value
  *                            of Scope will not be accessed.
- *              flags       - Used to indicate whether to perform upsearch or
+ *              Flags       - Used to indicate whether to perform upsearch or
  *                            not.
  *              return_node - Where the Node is returned
  *
  * DESCRIPTION: Look up a name relative to a given scope and return the
- *              corresponding Node. NOTE: Scope can be null.
+ *              corresponding Node.  NOTE: Scope can be null.
  *
  * MUTEX:       Locks namespace
  *
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 0483877f26b..345f0c3c6ad 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,8 +60,8 @@ ACPI_MODULE_NAME("nswalk")
  * RETURN:      struct acpi_namespace_node - Pointer to the NEXT child or NULL if
  *                                    none is found.
  *
- * DESCRIPTION: Return the next peer node within the namespace. If Handle
- *              is valid, Scope is ignored. Otherwise, the first node
+ * DESCRIPTION: Return the next peer node within the namespace.  If Handle
+ *              is valid, Scope is ignored.  Otherwise, the first node
  *              within Scope is returned.
  *
  ******************************************************************************/
@@ -88,7 +88,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
  *
  * FUNCTION:    acpi_ns_get_next_node_typed
  *
- * PARAMETERS:  type                - Type of node to be searched for
+ * PARAMETERS:  Type                - Type of node to be searched for
  *              parent_node         - Parent node whose children we are
  *                                    getting
  *              child_node          - Previous child that was found.
@@ -97,8 +97,8 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
  * RETURN:      struct acpi_namespace_node - Pointer to the NEXT child or NULL if
  *                                    none is found.
  *
- * DESCRIPTION: Return the next peer node within the namespace. If Handle
- *              is valid, Scope is ignored. Otherwise, the first node
+ * DESCRIPTION: Return the next peer node within the namespace.  If Handle
+ *              is valid, Scope is ignored.  Otherwise, the first node
  *              within Scope is returned.
  *
  ******************************************************************************/
@@ -151,16 +151,16 @@ struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type,
  *
  * FUNCTION:    acpi_ns_walk_namespace
  *
- * PARAMETERS:  type                - acpi_object_type to search for
+ * PARAMETERS:  Type                - acpi_object_type to search for
  *              start_node          - Handle in namespace where search begins
  *              max_depth           - Depth to which search is to reach
- *              flags               - Whether to unlock the NS before invoking
+ *              Flags               - Whether to unlock the NS before invoking
  *                                    the callback routine
  *              pre_order_visit     - Called during tree pre-order visit
  *                                    when an object of "Type" is found
  *              post_order_visit    - Called during tree post-order visit
  *                                    when an object of "Type" is found
- *              context             - Passed to user function(s) above
+ *              Context             - Passed to user function(s) above
  *              return_value        - from the user_function if terminated
  *                                    early. Otherwise, returns NULL.
  * RETURNS:     Status
@@ -305,7 +305,7 @@ acpi_ns_walk_namespace(acpi_object_type type,
 
                 /*
                  * Depth first search: Attempt to go down another level in the
-                 * namespace if we are allowed to. Don't go any further if we have
+                 * namespace if we are allowed to.  Don't go any further if we have
                  * reached the caller specified maximum depth or if the user
                  * function has specified that the maximum depth has been reached.
                  */
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index d6a9f77972b..c53f0040e49 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -58,19 +57,19 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
  *
  * FUNCTION:    acpi_evaluate_object_typed
  *
- * PARAMETERS:  handle              - Object handle (optional)
- *              pathname            - Object pathname (optional)
+ * PARAMETERS:  Handle              - Object handle (optional)
+ *              Pathname            - Object pathname (optional)
  *              external_params     - List of parameters to pass to method,
- *                                    terminated by NULL. May be NULL
+ *                                    terminated by NULL.  May be NULL
  *                                    if no parameters are being passed.
  *              return_buffer       - Where to put method's return value (if
- *                                    any). If NULL, no value is returned.
+ *                                    any).  If NULL, no value is returned.
  *              return_type         - Expected type of return object
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Find and evaluate the given object, passing the given
- *              parameters if necessary. One of "Handle" or "Pathname" must
+ *              parameters if necessary.  One of "Handle" or "Pathname" must
  *              be valid (non-null)
  *
  ******************************************************************************/
@@ -152,18 +151,18 @@ ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
  *
  * FUNCTION:    acpi_evaluate_object
  *
- * PARAMETERS:  handle              - Object handle (optional)
- *              pathname            - Object pathname (optional)
+ * PARAMETERS:  Handle              - Object handle (optional)
+ *              Pathname            - Object pathname (optional)
  *              external_params     - List of parameters to pass to method,
- *                                    terminated by NULL. May be NULL
+ *                                    terminated by NULL.  May be NULL
  *                                    if no parameters are being passed.
  *              return_buffer       - Where to put method's return value (if
- *                                    any). If NULL, no value is returned.
+ *                                    any).  If NULL, no value is returned.
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Find and evaluate the given object, passing the given
- *              parameters if necessary. One of "Handle" or "Pathname" must
+ *              parameters if necessary.  One of "Handle" or "Pathname" must
  *              be valid (non-null)
  *
  ******************************************************************************/
@@ -364,7 +363,7 @@ ACPI_EXPORT_SYMBOL(acpi_evaluate_object)
  *
  * FUNCTION:    acpi_ns_resolve_references
  *
- * PARAMETERS:  info                    - Evaluation info block
+ * PARAMETERS:  Info                    - Evaluation info block
  *
  * RETURN:      Info->return_object is replaced with the dereferenced object
  *
@@ -431,14 +430,14 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
  *
  * FUNCTION:    acpi_walk_namespace
  *
- * PARAMETERS:  type                - acpi_object_type to search for
+ * PARAMETERS:  Type                - acpi_object_type to search for
  *              start_object        - Handle in namespace where search begins
  *              max_depth           - Depth to which search is to reach
  *              pre_order_visit     - Called during tree pre-order visit
  *                                    when an object of "Type" is found
  *              post_order_visit    - Called during tree post-order visit
  *                                    when an object of "Type" is found
- *              context             - Passed to user function(s) above
+ *              Context             - Passed to user function(s) above
  *              return_value        - Location where return value of
  *                                    user_function is put if terminated early
  *
@@ -542,15 +541,15 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
         acpi_status status;
         struct acpi_namespace_node *node;
         u32 flags;
-        struct acpi_pnp_device_id *hid;
-        struct acpi_pnp_device_id_list *cid;
+        struct acpica_device_id *hid;
+        struct acpica_device_id_list *cid;
         u32 i;
         u8 found;
         int no_match;
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                return (status);
         }
 
         node = acpi_ns_validate_handle(obj_handle);
@@ -646,7 +645,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  *
  * PARAMETERS:  HID                 - HID to search for. Can be NULL.
  *              user_function       - Called when a matching object is found
- *              context             - Passed to user function
+ *              Context             - Passed to user function
  *              return_value        - Location where return value of
  *                                    user_function is put if terminated early
  *
@@ -656,7 +655,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  * DESCRIPTION: Performs a modified depth-first walk of the namespace tree,
  *              starting (and ending) at the object specified by start_handle.
  *              The user_function is called whenever an object of type
- *              Device is found. If the user function returns
+ *              Device is found.  If the user function returns
  *              a non-zero value, the search is terminated immediately and this
  *              value is returned to the caller.
  *
@@ -716,8 +715,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_devices)
  * FUNCTION:    acpi_attach_data
  *
  * PARAMETERS:  obj_handle          - Namespace node
- *              handler             - Handler for this attachment
- *              data                - Pointer to data to be attached
+ *              Handler             - Handler for this attachment
+ *              Data                - Pointer to data to be attached
  *
  * RETURN:      Status
  *
@@ -764,7 +763,7 @@ ACPI_EXPORT_SYMBOL(acpi_attach_data)
  * FUNCTION:    acpi_detach_data
  *
  * PARAMETERS:  obj_handle          - Namespace node handle
- *              handler             - Handler used in call to acpi_attach_data
+ *              Handler             - Handler used in call to acpi_attach_data
  *
  * RETURN:      Status
  *
@@ -810,8 +809,8 @@ ACPI_EXPORT_SYMBOL(acpi_detach_data)
  * FUNCTION:    acpi_get_data
  *
  * PARAMETERS:  obj_handle          - Namespace node
- *              handler             - Handler used in call to attach_data
- *              data                - Where the data is returned
+ *              Handler             - Handler used in call to attach_data
+ *              Data                - Where the data is returned
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 811c6f13f47..3fd4526f3db 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -53,24 +52,24 @@
 ACPI_MODULE_NAME("nsxfname")
 
 /* Local prototypes */
-static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
-                                    struct acpi_pnp_device_id *source,
+static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
+                                    struct acpica_device_id *source,
                                     char *string_area);
 
 /******************************************************************************
  *
  * FUNCTION:    acpi_get_handle
  *
- * PARAMETERS:  parent          - Object to search under (search scope).
- *              pathname        - Pointer to an asciiz string containing the
+ * PARAMETERS:  Parent          - Object to search under (search scope).
+ *              Pathname        - Pointer to an asciiz string containing the
  *                                name
  *              ret_handle      - Where the return handle is returned
  *
  * RETURN:      Status
  *
  * DESCRIPTION: This routine will search for a caller specified name in the
- *              name space. The caller can restrict the search region by
- *              specifying a non NULL parent. The parent value is itself a
+ *              name space.  The caller can restrict the search region by
+ *              specifying a non NULL parent.  The parent value is itself a
  *              namespace handle.
  *
  ******************************************************************************/
@@ -142,14 +141,14 @@ ACPI_EXPORT_SYMBOL(acpi_get_handle)
  *
  * FUNCTION:    acpi_get_name
  *
- * PARAMETERS:  handle          - Handle to be converted to a pathname
+ * PARAMETERS:  Handle          - Handle to be converted to a pathname
  *              name_type       - Full pathname or single segment
- *              buffer          - Buffer for returned path
+ *              Buffer          - Buffer for returned path
  *
  * RETURN:      Pointer to a string containing the fully qualified Name.
  *
  * DESCRIPTION: This routine returns the fully qualified name associated with
- *              the Handle parameter. This and the acpi_pathname_to_handle are
+ *              the Handle parameter.  This and the acpi_pathname_to_handle are
  *              complementary functions.
  *
  ******************************************************************************/
@@ -202,7 +201,8 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
 
         /* Just copy the ACPI name from the Node and zero terminate it */
 
-        ACPI_MOVE_NAME(buffer->pointer, acpi_ut_get_node_name(node));
+        ACPI_STRNCPY(buffer->pointer, acpi_ut_get_node_name(node),
+                     ACPI_NAME_SIZE);
         ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
         status = AE_OK;
 
@@ -218,21 +218,20 @@ ACPI_EXPORT_SYMBOL(acpi_get_name)
  *
  * FUNCTION:    acpi_ns_copy_device_id
  *
- * PARAMETERS:  dest                - Pointer to the destination PNP_DEVICE_ID
- *              source              - Pointer to the source PNP_DEVICE_ID
+ * PARAMETERS:  Dest                - Pointer to the destination DEVICE_ID
+ *              Source              - Pointer to the source DEVICE_ID
  *              string_area         - Pointer to where to copy the dest string
  *
  * RETURN:      Pointer to the next string area
  *
- * DESCRIPTION: Copy a single PNP_DEVICE_ID, including the string data.
+ * DESCRIPTION: Copy a single DEVICE_ID, including the string data.
  *
  ******************************************************************************/
-static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
-                                    struct acpi_pnp_device_id *source,
+static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
+                                    struct acpica_device_id *source,
                                     char *string_area)
 {
-
-        /* Create the destination PNP_DEVICE_ID */
+        /* Create the destination DEVICE_ID */
 
         dest->string = string_area;
         dest->length = source->length;
@@ -247,7 +246,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
  *
  * FUNCTION:    acpi_get_object_info
  *
- * PARAMETERS:  handle              - Object Handle
+ * PARAMETERS:  Handle              - Object Handle
  *              return_buffer       - Where the info is returned
  *
  * RETURN:      Status
@@ -256,8 +255,8 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
  *              namespace node and possibly by running several standard
  *              control methods (Such as in the case of a device.)
  *
- * For Device and Processor objects, run the Device _HID, _UID, _CID, _SUB,
- * _STA, _ADR, _sx_w, and _sx_d methods.
+ * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA,
+ * _ADR, _sx_w, and _sx_d methods.
  *
  * Note: Allocates the return buffer, must be freed by the caller.
  *
@@ -269,10 +268,9 @@ acpi_get_object_info(acpi_handle handle,
 {
         struct acpi_namespace_node *node;
         struct acpi_device_info *info;
-        struct acpi_pnp_device_id_list *cid_list = NULL;
-        struct acpi_pnp_device_id *hid = NULL;
-        struct acpi_pnp_device_id *uid = NULL;
-        struct acpi_pnp_device_id *sub = NULL;
+        struct acpica_device_id_list *cid_list = NULL;
+        struct acpica_device_id *hid = NULL;
+        struct acpica_device_id *uid = NULL;
         char *next_id_string;
         acpi_object_type type;
         acpi_name name;
@@ -317,7 +315,7 @@ acpi_get_object_info(acpi_handle handle,
         if ((type == ACPI_TYPE_DEVICE) || (type == ACPI_TYPE_PROCESSOR)) {
                 /*
                  * Get extra info for ACPI Device/Processor objects only:
-                 * Run the Device _HID, _UID, _SUB, and _CID methods.
+                 * Run the Device _HID, _UID, and _CID methods.
                  *
                  * Note: none of these methods are required, so they may or may
                  * not be present for this device. The Info->Valid bitfield is used
@@ -340,14 +338,6 @@ acpi_get_object_info(acpi_handle handle,
                         valid |= ACPI_VALID_UID;
                 }
 
-                /* Execute the Device._SUB method */
-
-                status = acpi_ut_execute_SUB(node, &sub);
-                if (ACPI_SUCCESS(status)) {
-                        info_size += sub->length;
-                        valid |= ACPI_VALID_SUB;
-                }
-
                 /* Execute the Device._CID method */
 
                 status = acpi_ut_execute_CID(node, &cid_list);
@@ -357,7 +347,7 @@ acpi_get_object_info(acpi_handle handle,
 
                         info_size +=
                             (cid_list->list_size -
-                             sizeof(struct acpi_pnp_device_id_list));
+                             sizeof(struct acpica_device_id_list));
                         valid |= ACPI_VALID_CID;
                 }
         }
@@ -427,17 +417,16 @@ acpi_get_object_info(acpi_handle handle,
         next_id_string = ACPI_CAST_PTR(char, info->compatible_id_list.ids);
         if (cid_list) {
 
-                /* Point past the CID PNP_DEVICE_ID array */
+                /* Point past the CID DEVICE_ID array */
 
                 next_id_string +=
                     ((acpi_size) cid_list->count *
-                     sizeof(struct acpi_pnp_device_id));
+                     sizeof(struct acpica_device_id));
         }
 
         /*
-         * Copy the HID, UID, SUB, and CIDs to the return buffer.
-         * The variable-length strings are copied to the reserved area
-         * at the end of the buffer.
+         * Copy the HID, UID, and CIDs to the return buffer. The variable-length
+         * strings are copied to the reserved area at the end of the buffer.
          *
          * For HID and CID, check if the ID is a PCI Root Bridge.
          */
@@ -455,11 +444,6 @@ acpi_get_object_info(acpi_handle handle,
                                                         uid, next_id_string);
         }
 
-        if (sub) {
-                next_id_string = acpi_ns_copy_device_id(&info->subsystem_id,
-                                                        sub, next_id_string);
-        }
-
         if (cid_list) {
                 info->compatible_id_list.count = cid_list->count;
                 info->compatible_id_list.list_size = cid_list->list_size;
@@ -496,9 +480,6 @@ acpi_get_object_info(acpi_handle handle,
         if (uid) {
                 ACPI_FREE(uid);
         }
-        if (sub) {
-                ACPI_FREE(sub);
-        }
         if (cid_list) {
                 ACPI_FREE(cid_list);
         }
@@ -511,7 +492,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_object_info)
  *
  * FUNCTION:    acpi_install_method
  *
- * PARAMETERS:  buffer         - An ACPI table containing one control method
+ * PARAMETERS:  Buffer         - An ACPI table containing one control method
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 9d029dac6b6..db7660f8b86 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -98,7 +97,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_id)
  *
  * FUNCTION:    acpi_get_type
  *
- * PARAMETERS:  handle          - Handle of object whose type is desired
+ * PARAMETERS:  Handle          - Handle of object whose type is desired
  *              ret_type        - Where the type will be placed
  *
  * RETURN:      Status
@@ -151,7 +150,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_type)
  *
  * FUNCTION:    acpi_get_parent
  *
- * PARAMETERS:  handle          - Handle of object whose parent is desired
+ * PARAMETERS:  Handle          - Handle of object whose parent is desired
  *              ret_handle      - Where the parent handle will be placed
  *
  * RETURN:      Status
@@ -212,16 +211,16 @@ ACPI_EXPORT_SYMBOL(acpi_get_parent)
  *
  * FUNCTION:    acpi_get_next_object
  *
- * PARAMETERS:  type            - Type of object to be searched for
- *              parent          - Parent object whose children we are getting
+ * PARAMETERS:  Type            - Type of object to be searched for
+ *              Parent          - Parent object whose children we are getting
  *              last_child      - Previous child that was found.
  *                                The NEXT child will be returned
  *              ret_handle      - Where handle to the next object is placed
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Return the next peer object within the namespace. If Handle is
- *              valid, Scope is ignored. Otherwise, the first object within
+ * DESCRIPTION: Return the next peer object within the namespace.  If Handle is
+ *              valid, Scope is ignored.  Otherwise, the first object within
  *              Scope is returned.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index cb79e2d4d74..e1fad0ee013 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,7 +120,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
  * RETURN:      Pointer to end-of-package +1
  *
  * DESCRIPTION: Get next package length and return a pointer past the end of
- *              the package. Consumes the package length field
+ *              the package.  Consumes the package length field
  *
  ******************************************************************************/
 
@@ -147,8 +147,8 @@ u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state)
  * RETURN:      Pointer to the start of the name string (pointer points into
  *              the AML.
  *
- * DESCRIPTION: Get next raw namestring within the AML stream. Handles all name
- *              prefix characters. Set parser state to point past the string.
+ * DESCRIPTION: Get next raw namestring within the AML stream.  Handles all name
+ *              prefix characters.  Set parser state to point past the string.
  *              (Name is consumed from the AML.)
  *
  ******************************************************************************/
@@ -210,7 +210,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
  * FUNCTION:    acpi_ps_get_next_namepath
  *
  * PARAMETERS:  parser_state        - Current parser state object
- *              arg                 - Where the namepath will be stored
+ *              Arg                 - Where the namepath will be stored
  *              arg_count           - If the namepath points to a control method
  *                                    the method's argument is returned here.
  *              possible_method_call - Whether the namepath can possibly be the
@@ -220,7 +220,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
  *
  * DESCRIPTION: Get next name (if method call, return # of required args).
  *              Names are looked up in the internal namespace to determine
- *              if the name represents a control method. If a method
+ *              if the name represents a control method.  If a method
  *              is found, the number of arguments to the method is returned.
  *              This information is critical for parsing to continue correctly.
  *
@@ -379,7 +379,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
  *
  * PARAMETERS:  parser_state        - Current parser state object
  *              arg_type            - The argument type (AML_*_ARG)
- *              arg                 - Where the argument is returned
+ *              Arg                 - Where the argument is returned
  *
  * RETURN:      None
  *
@@ -484,54 +484,34 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
 static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                                                        *parser_state)
 {
-        u32 aml_offset;
+        u32 aml_offset = (u32)
+            ACPI_PTR_DIFF(parser_state->aml,
+                          parser_state->aml_start);
         union acpi_parse_object *field;
-        union acpi_parse_object *arg = NULL;
         u16 opcode;
         u32 name;
-        u8 access_type;
-        u8 access_attribute;
-        u8 access_length;
-        u32 pkg_length;
-        u8 *pkg_end;
-        u32 buffer_length;
 
         ACPI_FUNCTION_TRACE(ps_get_next_field);
 
-        aml_offset =
-            (u32)ACPI_PTR_DIFF(parser_state->aml, parser_state->aml_start);
-
         /* Determine field type */
 
         switch (ACPI_GET8(parser_state->aml)) {
-        case AML_FIELD_OFFSET_OP:
-
-                opcode = AML_INT_RESERVEDFIELD_OP;
-                parser_state->aml++;
-                break;
-
-        case AML_FIELD_ACCESS_OP:
+        default:
 
-                opcode = AML_INT_ACCESSFIELD_OP;
-                parser_state->aml++;
+                opcode = AML_INT_NAMEDFIELD_OP;
                 break;
 
-        case AML_FIELD_CONNECTION_OP:
+        case 0x00:
 
-                opcode = AML_INT_CONNECTION_OP;
+                opcode = AML_INT_RESERVEDFIELD_OP;
                 parser_state->aml++;
                 break;
 
-        case AML_FIELD_EXT_ACCESS_OP:
+        case 0x01:
 
-                opcode = AML_INT_EXTACCESSFIELD_OP;
+                opcode = AML_INT_ACCESSFIELD_OP;
                 parser_state->aml++;
                 break;
-
-        default:
-
-                opcode = AML_INT_NAMEDFIELD_OP;
-                break;
         }
 
         /* Allocate a new field op */
@@ -569,113 +549,16 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                 break;
 
         case AML_INT_ACCESSFIELD_OP:
-        case AML_INT_EXTACCESSFIELD_OP:
 
                 /*
                  * Get access_type and access_attrib and merge into the field Op
-                 * access_type is first operand, access_attribute is second. stuff
-                 * these bytes into the node integer value for convenience.
+                 * access_type is first operand, access_attribute is second
                  */
-
-                /* Get the two bytes (Type/Attribute) */
-
-                access_type = ACPI_GET8(parser_state->aml);
+                field->common.value.integer =
+                    (((u32) ACPI_GET8(parser_state->aml) << 8));
                 parser_state->aml++;
-                access_attribute = ACPI_GET8(parser_state->aml);
+                field->common.value.integer |= ACPI_GET8(parser_state->aml);
                 parser_state->aml++;
-
-                field->common.value.integer = (u8)access_type;
-                field->common.value.integer |= (u16)(access_attribute << 8);
-
-                /* This opcode has a third byte, access_length */
-
-                if (opcode == AML_INT_EXTACCESSFIELD_OP) {
-                        access_length = ACPI_GET8(parser_state->aml);
-                        parser_state->aml++;
-
-                        field->common.value.integer |=
-                            (u32)(access_length << 16);
-                }
-                break;
-
-        case AML_INT_CONNECTION_OP:
-
-                /*
-                 * Argument for Connection operator can be either a Buffer
-                 * (resource descriptor), or a name_string.
-                 */
-                if (ACPI_GET8(parser_state->aml) == AML_BUFFER_OP) {
-                        parser_state->aml++;
-
-                        pkg_end = parser_state->aml;
-                        pkg_length =
-                            acpi_ps_get_next_package_length(parser_state);
-                        pkg_end += pkg_length;
-
-                        if (parser_state->aml < pkg_end) {
-
-                                /* Non-empty list */
-
-                                arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);
-                                if (!arg) {
-                                        acpi_ps_free_op(field);
-                                        return_PTR(NULL);
-                                }
-
-                                /* Get the actual buffer length argument */
-
-                                opcode = ACPI_GET8(parser_state->aml);
-                                parser_state->aml++;
-
-                                switch (opcode) {
-                                case AML_BYTE_OP:       /* AML_BYTEDATA_ARG */
-                                        buffer_length =
-                                            ACPI_GET8(parser_state->aml);
-                                        parser_state->aml += 1;
-                                        break;
-
-                                case AML_WORD_OP:       /* AML_WORDDATA_ARG */
-                                        buffer_length =
-                                            ACPI_GET16(parser_state->aml);
-                                        parser_state->aml += 2;
-                                        break;
-
-                                case AML_DWORD_OP:      /* AML_DWORDATA_ARG */
-                                        buffer_length =
-                                            ACPI_GET32(parser_state->aml);
-                                        parser_state->aml += 4;
-                                        break;
-
-                                default:
-                                        buffer_length = 0;
-                                        break;
-                                }
-
-                                /* Fill in bytelist data */
-
-                                arg->named.value.size = buffer_length;
-                                arg->named.data = parser_state->aml;
-                        }
-
-                        /* Skip to End of byte data */
-
-                        parser_state->aml = pkg_end;
-                } else {
-                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
-                        if (!arg) {
-                                acpi_ps_free_op(field);
-                                return_PTR(NULL);
-                        }
-
-                        /* Get the Namestring argument */
-
-                        arg->common.value.name =
-                            acpi_ps_get_next_namestring(parser_state);
-                }
-
-                /* Link the buffer/namestring to parent (CONNECTION_OP) */
-
-                acpi_ps_append_arg(field, arg);
                 break;
 
         default:
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 5607805aab2..01dd70d1de5 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -133,46 +133,18 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
 
         case AML_CLASS_UNKNOWN:
 
-                /* The opcode is unrecognized. Complain and skip unknown opcodes */
+                /* The opcode is unrecognized. Just skip unknown opcodes */
 
-                if (walk_state->pass_number == 2) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring",
-                                    walk_state->opcode,
-                                    (u32)(walk_state->aml_offset +
-                                          sizeof(struct acpi_table_header))));
+                ACPI_ERROR((AE_INFO,
+                            "Found unknown opcode 0x%X at AML address %p offset 0x%X, ignoring",
+                            walk_state->opcode, walk_state->parser_state.aml,
+                            walk_state->aml_offset));
 
-                        ACPI_DUMP_BUFFER(walk_state->parser_state.aml - 16, 48);
+                ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128);
 
-#ifdef ACPI_ASL_COMPILER
-                        /*
-                         * This is executed for the disassembler only. Output goes
-                         * to the disassembled ASL output file.
-                         */
-                        acpi_os_printf
-                            ("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n",
-                             walk_state->opcode,
-                             (u32)(walk_state->aml_offset +
-                                   sizeof(struct acpi_table_header)));
-
-                        /* Dump the context surrounding the invalid opcode */
-
-                        acpi_ut_dump_buffer(((u8 *)walk_state->parser_state.
-                                             aml - 16), 48, DB_BYTE_DISPLAY,
-                                            walk_state->aml_offset +
-                                            sizeof(struct acpi_table_header) -
-                                            16);
-                        acpi_os_printf(" */\n");
-#endif
-                }
-
-                /* Increment past one-byte or two-byte opcode */
+                /* Assume one-byte bad opcode */
 
                 walk_state->parser_state.aml++;
-                if (walk_state->opcode > 0xFF) {        /* Can only happen if first byte is 0x5B */
-                        walk_state->parser_state.aml++;
-                }
-
                 return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
 
         default:
@@ -195,7 +167,7 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
  * PARAMETERS:  walk_state          - Current state
  *              aml_op_start        - Begin of named Op in AML
  *              unnamed_op          - Early Op (not a named Op)
- *              op                  - Returned Op
+ *              Op                  - Returned Op
  *
  * RETURN:      Status
  *
@@ -351,7 +323,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
 
         if (walk_state->op_info->flags & AML_CREATE) {
                 /*
-                 * Backup to beginning of create_XXXfield declaration
+                 * Backup to beginning of create_xXXfield declaration
                  * body_length is unknown until we parse the body
                  */
                 op->named.data = aml_op_start;
@@ -408,7 +380,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
  *
  * PARAMETERS:  walk_state          - Current state
  *              aml_op_start        - Op start in AML
- *              op                  - Current Op
+ *              Op                  - Current Op
  *
  * RETURN:      Status
  *
@@ -547,18 +519,11 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                                         if ((op_info->class ==
                                              AML_CLASS_EXECUTE) && (!arg)) {
                                                 ACPI_WARNING((AE_INFO,
-                                                              "Unsupported module-level executable opcode "
-                                                              "0x%.2X at table offset 0x%.4X",
-                                                              op->common.
-                                                              aml_opcode,
-                                                              (u32)
-                                                              (ACPI_PTR_DIFF
-                                                               (aml_op_start,
-                                                                walk_state->
-                                                                parser_state.
-                                                                aml_start) +
-                                                               sizeof(struct
-                                                                      acpi_table_header))));
+                                                              "Detected an unsupported executable opcode "
+                                                              "at module-level: [0x%.4X] at table offset 0x%.4X",
+                                                              op->common.aml_opcode,
+                                                              (u32)((aml_op_start - walk_state->parser_state.aml_start)
+                                                                + sizeof(struct acpi_table_header))));
                                         }
                                 }
                                 break;
@@ -714,8 +679,8 @@ acpi_ps_link_module_code(union acpi_parse_object *parent_op,
  * FUNCTION:    acpi_ps_complete_op
  *
  * PARAMETERS:  walk_state          - Current state
- *              op                  - Returned Op
- *              status              - Parse status before complete Op
+ *              Op                  - Returned Op
+ *              Status              - Parse status before complete Op
  *
  * RETURN:      Status
  *
@@ -878,6 +843,8 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                 *op = NULL;
         }
 
+        ACPI_PREEMPTION_POINT();
+
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -886,8 +853,8 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
  * FUNCTION:    acpi_ps_complete_final_op
  *
  * PARAMETERS:  walk_state          - Current state
- *              op                  - Current Op
- *              status              - Current parse status before complete last
+ *              Op                  - Current Op
+ *              Status              - Current parse status before complete last
  *                                    Op
  *
  * RETURN:      Status
@@ -1198,7 +1165,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
 
                 if (walk_state->op_info->flags & AML_CREATE) {
                         /*
-                         * Backup to beginning of create_XXXfield declaration (1 for
+                         * Backup to beginning of create_xXXfield declaration (1 for
                          * Opcode)
                          *
                          * body_length is unknown until we parse the body
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 1793d934aa3..bed08de7528 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,7 @@ static const u8 acpi_gbl_argument_count[] =
  *
  * DESCRIPTION: Opcode table. Each entry contains <opcode, type, name, operands>
  *              The name is a simple ascii string, the operand specifier is an
- *              ascii string with one letter per operand. The letter specifies
+ *              ascii string with one letter per operand.  The letter specifies
  *              the operand type.
  *
  ******************************************************************************/
@@ -183,7 +183,7 @@ static const u8 acpi_gbl_argument_count[] =
  ******************************************************************************/
 
 /*
- * Master Opcode information table. A summary of everything we know about each
+ * Master Opcode information table.  A summary of everything we know about each
  * opcode, all in one place.
  */
 const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
@@ -392,12 +392,10 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  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_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                         AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | 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_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                         AML_CONSTANT),
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | 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_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
@@ -497,8 +495,7 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  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_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD),
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP,
                  ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
                  AML_TYPE_NAMED_NO_OBJ,
@@ -522,13 +519,12 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP,
                  ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
                  AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD),
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                         ACPI_TYPE_LOCAL_BANK_FIELD,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD | AML_DEFER),
+                 ACPI_TYPE_LOCAL_BANK_FIELD, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD |
+                 AML_DEFER),
 
 /* Internal opcodes that map to invalid AML opcodes */
 
@@ -636,23 +632,13 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
                  ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
                  AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE),
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | 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_FLAGS_EXEC_0A_0T_1R),
-
-/* ACPI 5.0 opcodes */
-
-/* 7F */ ACPI_OP("-ConnectField-", ARGP_CONNECTFIELD_OP,
-                         ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS),
-/* 80 */ ACPI_OP("-ExtAccessField-", ARGP_CONNECTFIELD_OP,
-                         ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0)
+                 AML_FLAGS_EXEC_0A_0T_1R)
 
 /*! [End] no source code translation !*/
 };
@@ -671,7 +657,7 @@ static const u8 acpi_gbl_short_op_index[256] = {
 /* 0x20 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x28 */ _UNK, _UNK, _UNK, _UNK, _UNK, 0x63, _PFX, _PFX,
 /* 0x30 */ 0x67, 0x66, 0x68, 0x65, 0x69, 0x64, 0x6A, 0x7D,
-/* 0x38 */ 0x7F, 0x80, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
+/* 0x38 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x40 */ _UNK, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
 /* 0x48 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
 /* 0x50 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,
@@ -700,7 +686,7 @@ static const u8 acpi_gbl_short_op_index[256] = {
 
 /*
  * This table is indexed by the second opcode of the extended opcode
- * pair. It returns an index into the opcode table (acpi_gbl_aml_op_info)
+ * pair.  It returns an index into the opcode table (acpi_gbl_aml_op_info)
  */
 static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
 /*              0     1     2     3     4     5     6     7  */
@@ -729,7 +715,7 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
  *
  * FUNCTION:    acpi_ps_get_opcode_info
  *
- * PARAMETERS:  opcode              - The AML opcode
+ * PARAMETERS:  Opcode              - The AML opcode
  *
  * RETURN:      A pointer to the info about the opcode.
  *
@@ -774,7 +760,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
  *
  * FUNCTION:    acpi_ps_get_opcode_name
  *
- * PARAMETERS:  opcode              - The AML opcode
+ * PARAMETERS:  Opcode              - The AML opcode
  *
  * RETURN:      A pointer to the name of the opcode (ASCII String)
  *              Note: Never returns NULL.
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 2494caf4775..9bb0cbd37b5 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,9 +43,9 @@
 
 /*
  * Parse the AML and build an operation tree as most interpreters,
- * like Perl, do. Parsing is done by hand rather than with a YACC
+ * like Perl, do.  Parsing is done by hand rather than with a YACC
  * generated parser to tightly constrain stack and dynamic memory
- * usage. At the same time, parsing is kept flexible and the code
+ * usage.  At the same time, parsing is kept flexible and the code
  * fairly compact by parsing based on a list of AML opcode
  * templates in aml_op_info[]
  */
@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("psparse")
  *
  * FUNCTION:    acpi_ps_get_opcode_size
  *
- * PARAMETERS:  opcode          - An AML opcode
+ * PARAMETERS:  Opcode          - An AML opcode
  *
  * RETURN:      Size of the opcode, in bytes (1 or 2)
  *
@@ -121,7 +121,7 @@ u16 acpi_ps_peek_opcode(struct acpi_parse_state * parser_state)
  * FUNCTION:    acpi_ps_complete_this_op
  *
  * PARAMETERS:  walk_state      - Current State
- *              op              - Op to complete
+ *              Op              - Op to complete
  *
  * RETURN:      Status
  *
@@ -311,7 +311,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
  * FUNCTION:    acpi_ps_next_parse_state
  *
  * PARAMETERS:  walk_state          - Current state
- *              op                  - Current parse op
+ *              Op                  - Current parse op
  *              callback_status     - Status from previous operation
  *
  * RETURN:      Status
@@ -379,7 +379,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
         case AE_CTRL_FALSE:
                 /*
                  * Either an IF/WHILE Predicate was false or we encountered a BREAK
-                 * opcode. In both cases, we do not execute the rest of the
+                 * opcode.  In both cases, we do not execute the rest of the
                  * package;  We simply close out the parent (finishing the walk of
                  * this branch of the tree) and continue execution at the parent
                  * level.
@@ -459,9 +459,8 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
 
                         /* Executing a control method - additional cleanup */
 
-                        acpi_ds_terminate_control_method(walk_state->
-                                                         method_desc,
-                                                         walk_state);
+                        acpi_ds_terminate_control_method(
+                                walk_state->method_desc, walk_state);
                 }
 
                 acpi_ds_delete_walk_state(walk_state);
@@ -488,7 +487,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
         acpi_gbl_current_walk_list = thread;
 
         /*
-         * Execute the walk loop as long as there is a valid Walk State. This
+         * Execute the walk loop as long as there is a valid Walk State.  This
          * handles nested control method invocations without recursion.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "State=%p\n", walk_state));
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index 608dc20dc17..a5faa1323a0 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,7 +93,7 @@ u8 acpi_ps_has_completed_scope(struct acpi_parse_state * parser_state)
  * FUNCTION:    acpi_ps_init_scope
  *
  * PARAMETERS:  parser_state        - Current parser state object
- *              root                - the Root Node of this new scope
+ *              Root                - the Root Node of this new scope
  *
  * RETURN:      Status
  *
@@ -131,7 +131,7 @@ acpi_ps_init_scope(struct acpi_parse_state * parser_state,
  * FUNCTION:    acpi_ps_push_scope
  *
  * PARAMETERS:  parser_state        - Current parser state object
- *              op                  - Current op to be pushed
+ *              Op                  - Current op to be pushed
  *              remaining_args      - List of args remaining
  *              arg_count           - Fixed or variable number of args
  *
@@ -184,7 +184,7 @@ acpi_ps_push_scope(struct acpi_parse_state *parser_state,
  * FUNCTION:    acpi_ps_pop_scope
  *
  * PARAMETERS:  parser_state        - Current parser state object
- *              op                  - Where the popped op is returned
+ *              Op                  - Where the popped op is returned
  *              arg_list            - Where the popped "next argument" is
  *                                    returned
  *              arg_count           - Count of objects in arg_list
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index fdb2e71f304..f1464c03aa4 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,8 +58,8 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op);
  *
  * FUNCTION:    acpi_ps_get_arg
  *
- * PARAMETERS:  op              - Get an argument for this op
- *              argn            - Nth argument to get
+ * PARAMETERS:  Op              - Get an argument for this op
+ *              Argn            - Nth argument to get
  *
  * RETURN:      The argument (as an Op object). NULL if argument does not exist
  *
@@ -74,12 +74,6 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
 
         ACPI_FUNCTION_ENTRY();
 
-/*
-        if (Op->Common.aml_opcode == AML_INT_CONNECTION_OP)
-        {
-                return (Op->Common.Value.Arg);
-        }
-*/
         /* Get the info structure for this opcode */
 
         op_info = acpi_ps_get_opcode_info(op->common.aml_opcode);
@@ -114,8 +108,8 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
  *
  * FUNCTION:    acpi_ps_append_arg
  *
- * PARAMETERS:  op              - Append an argument to this Op.
- *              arg             - Argument Op to append
+ * PARAMETERS:  Op              - Append an argument to this Op.
+ *              Arg             - Argument Op to append
  *
  * RETURN:      None.
  *
@@ -188,8 +182,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
  *
  * FUNCTION:    acpi_ps_get_depth_next
  *
- * PARAMETERS:  origin          - Root of subtree to search
- *              op              - Last (previous) Op that was found
+ * PARAMETERS:  Origin          - Root of subtree to search
+ *              Op              - Last (previous) Op that was found
  *
  * RETURN:      Next Op found in the search.
  *
@@ -261,7 +255,7 @@ union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,
  *
  * FUNCTION:    acpi_ps_get_child
  *
- * PARAMETERS:  op              - Get the child of this Op
+ * PARAMETERS:  Op              - Get the child of this Op
  *
  * RETURN:      Child Op, Null if none is found.
  *
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 4137dcb352d..7eda7850342 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,8 +77,8 @@ union acpi_parse_object *acpi_ps_create_scope_op(void)
  *
  * FUNCTION:    acpi_ps_init_op
  *
- * PARAMETERS:  op              - A newly allocated Op object
- *              opcode          - Opcode to store in the Op
+ * PARAMETERS:  Op              - A newly allocated Op object
+ *              Opcode          - Opcode to store in the Op
  *
  * RETURN:      None
  *
@@ -103,12 +103,12 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
  *
  * FUNCTION:    acpi_ps_alloc_op
  *
- * PARAMETERS:  opcode          - Opcode that will be stored in the new Op
+ * PARAMETERS:  Opcode          - Opcode that will be stored in the new Op
  *
  * RETURN:      Pointer to the new Op, null on failure
  *
  * DESCRIPTION: Allocate an acpi_op, choose op type (and thus size) based on
- *              opcode. A cache of opcodes is available for the pure
+ *              opcode.  A cache of opcodes is available for the pure
  *              GENERIC_OP, since this is by far the most commonly used.
  *
  ******************************************************************************/
@@ -160,11 +160,11 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
  *
  * FUNCTION:    acpi_ps_free_op
  *
- * PARAMETERS:  op              - Op to be freed
+ * PARAMETERS:  Op              - Op to be freed
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Free an Op object. Either put it on the GENERIC_OP cache list
+ * DESCRIPTION: Free an Op object.  Either put it on the GENERIC_OP cache list
  *              or actually free it.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c
index ab96cf47896..3312d6368bf 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 963e1622579..8086805d449 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action);
  * PARAMETERS:  method_name     - Valid ACPI name string
  *              debug_level     - Optional level mask. 0 to use default
  *              debug_layer     - Optional layer mask. 0 to use default
- *              flags           - bit 1: one shot(1) or persistent(0)
+ *              Flags           - bit 1: one shot(1) or persistent(0)
  *
  * RETURN:      Status
  *
@@ -105,7 +105,7 @@ acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags)
  *
  * FUNCTION:    acpi_ps_start_trace
  *
- * PARAMETERS:  info        - Method info struct
+ * PARAMETERS:  Info        - Method info struct
  *
  * RETURN:      None
  *
@@ -150,7 +150,7 @@ static void acpi_ps_start_trace(struct acpi_evaluate_info *info)
  *
  * FUNCTION:    acpi_ps_stop_trace
  *
- * PARAMETERS:  info        - Method info struct
+ * PARAMETERS:  Info        - Method info struct
  *
  * RETURN:      None
  *
@@ -193,10 +193,10 @@ static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)
  *
  * FUNCTION:    acpi_ps_execute_method
  *
- * PARAMETERS:  info            - Method info block, contains:
- *                  node            - Method Node to execute
+ * PARAMETERS:  Info            - Method info block, contains:
+ *                  Node            - Method Node to execute
  *                  obj_desc        - Method object
- *                  parameters      - List of parameters to pass to the method,
+ *                  Parameters      - List of parameters to pass to the method,
  *                                    terminated by NULL. Params itself may be
  *                                    NULL if no parameters are being passed.
  *                  return_object   - Where to put method's return value (if
@@ -361,9 +361,9 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
  *
  * FUNCTION:    acpi_ps_update_parameter_list
  *
- * PARAMETERS:  info            - See struct acpi_evaluate_info
+ * PARAMETERS:  Info            - See struct acpi_evaluate_info
  *                                (Used: parameter_type and Parameters)
- *              action          - Add or Remove reference
+ *              Action          - Add or Remove reference
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 856ff075b6a..9e66f907842 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -182,8 +182,8 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_address64[5] = {
 
         /* Revision ID */
 
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.ext_address64.revision_ID),
-         AML_OFFSET(ext_address64.revision_ID),
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.ext_address64.revision_iD),
+         AML_OFFSET(ext_address64.revision_iD),
          1},
         /*
          * These fields are contiguous in both the source and destination:
@@ -215,7 +215,7 @@ static struct acpi_rsconvert_info acpi_rs_convert_general_flags[6] = {
          AML_OFFSET(address.resource_type),
          1},
 
-        /* General flags - Consume, Decode, min_fixed, max_fixed */
+        /* General Flags - Consume, Decode, min_fixed, max_fixed */
 
         {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.producer_consumer),
          AML_OFFSET(address.flags),
@@ -293,8 +293,8 @@ static struct acpi_rsconvert_info acpi_rs_convert_io_flags[4] = {
  *
  * FUNCTION:    acpi_rs_get_address_common
  *
- * PARAMETERS:  resource            - Pointer to the internal resource struct
- *              aml                 - Pointer to the AML resource descriptor
+ * PARAMETERS:  Resource            - Pointer to the internal resource struct
+ *              Aml                 - Pointer to the AML resource descriptor
  *
  * RETURN:      TRUE if the resource_type field is OK, FALSE otherwise
  *
@@ -343,8 +343,8 @@ acpi_rs_get_address_common(struct acpi_resource *resource,
  *
  * FUNCTION:    acpi_rs_set_address_common
  *
- * PARAMETERS:  aml                 - Pointer to the AML resource descriptor
- *              resource            - Pointer to the internal resource struct
+ * PARAMETERS:  Aml                 - Pointer to the AML resource descriptor
+ *              Resource            - Pointer to the internal resource struct
  *
  * RETURN:      None
  *
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 147feb6aa2a..3a8a89ec2ca 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,7 @@ acpi_rs_stream_option_length(u32 resource_length,
  *
  * FUNCTION:    acpi_rs_get_aml_length
  *
- * PARAMETERS:  resource            - Pointer to the resource linked list
+ * PARAMETERS:  Resource            - Pointer to the resource linked list
  *              size_needed         - Where the required size is returned
  *
  * RETURN:      Status
@@ -313,38 +313,6 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                                                           resource_source));
                         break;
 
-                case ACPI_RESOURCE_TYPE_GPIO:
-
-                        total_size =
-                            (acpi_rs_length) (total_size +
-                                              (resource->data.gpio.
-                                               pin_table_length * 2) +
-                                              resource->data.gpio.
-                                              resource_source.string_length +
-                                              resource->data.gpio.
-                                              vendor_length);
-
-                        break;
-
-                case ACPI_RESOURCE_TYPE_SERIAL_BUS:
-
-                        total_size =
-                            acpi_gbl_aml_resource_serial_bus_sizes[resource->
-                                                                   data.
-                                                                   common_serial_bus.
-                                                                   type];
-
-                        total_size = (acpi_rs_length) (total_size +
-                                                       resource->data.
-                                                       i2c_serial_bus.
-                                                       resource_source.
-                                                       string_length +
-                                                       resource->data.
-                                                       i2c_serial_bus.
-                                                       vendor_length);
-
-                        break;
-
                 default:
                         break;
                 }
@@ -394,11 +362,10 @@ acpi_rs_get_list_length(u8 * aml_buffer,
         u32 extra_struct_bytes;
         u8 resource_index;
         u8 minimum_aml_resource_length;
-        union aml_resource *aml_resource;
 
         ACPI_FUNCTION_TRACE(rs_get_list_length);
 
-        *size_needed = ACPI_RS_SIZE_MIN;        /* Minimum size is one end_tag */
+        *size_needed = 0;
         end_aml = aml_buffer + aml_buffer_length;
 
         /* Walk the list of AML resource descriptors */
@@ -409,15 +376,9 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 
                 status = acpi_ut_validate_resource(aml_buffer, &resource_index);
                 if (ACPI_FAILURE(status)) {
-                        /*
-                         * Exit on failure. Cannot continue because the descriptor length
-                         * may be bogus also.
-                         */
                         return_ACPI_STATUS(status);
                 }
 
-                aml_resource = (void *)aml_buffer;
-
                 /* Get the resource length and base (minimum) AML size */
 
                 resource_length = acpi_ut_get_resource_length(aml_buffer);
@@ -457,21 +418,14 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * Get the number of vendor data bytes
                          */
                         extra_struct_bytes = resource_length;
-
-                        /*
-                         * There is already one byte included in the minimum
-                         * descriptor size. If there are extra struct bytes,
-                         * subtract one from the count.
-                         */
-                        if (extra_struct_bytes) {
-                                extra_struct_bytes--;
-                        }
                         break;
 
                 case ACPI_RESOURCE_NAME_END_TAG:
                         /*
-                         * End Tag: This is the normal exit
+                         * End Tag:
+                         * This is the normal exit, add size of end_tag
                          */
+                        *size_needed += ACPI_RS_SIZE_MIN;
                         return_ACPI_STATUS(AE_OK);
 
                 case ACPI_RESOURCE_NAME_ADDRESS32:
@@ -503,33 +457,6 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                                                          minimum_aml_resource_length);
                         break;
 
-                case ACPI_RESOURCE_NAME_GPIO:
-
-                        /* Vendor data is optional */
-
-                        if (aml_resource->gpio.vendor_length) {
-                                extra_struct_bytes +=
-                                    aml_resource->gpio.vendor_offset -
-                                    aml_resource->gpio.pin_table_offset +
-                                    aml_resource->gpio.vendor_length;
-                        } else {
-                                extra_struct_bytes +=
-                                    aml_resource->large_header.resource_length +
-                                    sizeof(struct aml_resource_large_header) -
-                                    aml_resource->gpio.pin_table_offset;
-                        }
-                        break;
-
-                case ACPI_RESOURCE_NAME_SERIAL_BUS:
-
-                        minimum_aml_resource_length =
-                            acpi_gbl_resource_aml_serial_bus_sizes
-                            [aml_resource->common_serial_bus.type];
-                        extra_struct_bytes +=
-                            aml_resource->common_serial_bus.resource_length -
-                            minimum_aml_resource_length;
-                        break;
-
                 default:
                         break;
                 }
@@ -540,18 +467,9 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                  * Important: Round the size up for the appropriate alignment. This
                  * is a requirement on IA64.
                  */
-                if (acpi_ut_get_resource_type(aml_buffer) ==
-                    ACPI_RESOURCE_NAME_SERIAL_BUS) {
-                        buffer_size =
-                            acpi_gbl_resource_struct_serial_bus_sizes
-                            [aml_resource->common_serial_bus.type] +
-                            extra_struct_bytes;
-                } else {
-                        buffer_size =
-                            acpi_gbl_resource_struct_sizes[resource_index] +
-                            extra_struct_bytes;
-                }
-                buffer_size = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
+                buffer_size = acpi_gbl_resource_struct_sizes[resource_index] +
+                    extra_struct_bytes;
+                buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
 
                 *size_needed += buffer_size;
 
@@ -610,7 +528,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
         /*
          * Calculate the size of the return buffer.
          * The base size is the number of elements * the sizes of the
-         * structures. Additional space for the strings is added below.
+         * structures.  Additional space for the strings is added below.
          * The minus one is to subtract the size of the u8 Source[1]
          * member because it is added below.
          *
@@ -673,7 +591,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/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 311cbc4f05f..4ce6e1147e8 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,70 +51,6 @@ ACPI_MODULE_NAME("rscreate")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_buffer_to_resource
- *
- * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
- *              aml_buffer_length   - Length of the aml_buffer
- *              resource_ptr        - Where the converted resource is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Convert a raw AML buffer to a resource list
- *
- ******************************************************************************/
-acpi_status
-acpi_buffer_to_resource(u8 *aml_buffer,
-                        u16 aml_buffer_length,
-                        struct acpi_resource **resource_ptr)
-{
-        acpi_status status;
-        acpi_size list_size_needed;
-        void *resource;
-        void *current_resource_ptr;
-
-        /*
-         * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag
-         * is not required here.
-         */
-
-        /* Get the required length for the converted resource */
-
-        status = acpi_rs_get_list_length(aml_buffer, aml_buffer_length,
-                                         &list_size_needed);
-        if (status == AE_AML_NO_RESOURCE_END_TAG) {
-                status = AE_OK;
-        }
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Allocate a buffer for the converted resource */
-
-        resource = ACPI_ALLOCATE_ZEROED(list_size_needed);
-        current_resource_ptr = resource;
-        if (!resource) {
-                return (AE_NO_MEMORY);
-        }
-
-        /* Perform the AML-to-Resource conversion */
-
-        status = acpi_ut_walk_aml_resources(aml_buffer, aml_buffer_length,
-                                            acpi_rs_convert_aml_to_resources,
-                                            &current_resource_ptr);
-        if (status == AE_AML_NO_RESOURCE_END_TAG) {
-                status = AE_OK;
-        }
-        if (ACPI_FAILURE(status)) {
-                ACPI_FREE(resource);
-        } else {
-                *resource_ptr = resource;
-        }
-
-        return (status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_rs_create_resource_list
  *
  * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
@@ -130,10 +66,9 @@ acpi_buffer_to_resource(u8 *aml_buffer,
  *              of device resources.
  *
  ******************************************************************************/
-
 acpi_status
 acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
-                             struct acpi_buffer * output_buffer)
+                             struct acpi_buffer *output_buffer)
 {
 
         acpi_status status;
@@ -190,8 +125,8 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
  *
  * FUNCTION:    acpi_rs_create_pci_routing_table
  *
- * PARAMETERS:  package_object          - Pointer to a package containing one
- *                                        of more ACPI_OPERAND_OBJECTs
+ * PARAMETERS:  package_object          - Pointer to a union acpi_operand_object
+ *                                        package
  *              output_buffer           - Pointer to the user's buffer
  *
  * RETURN:      Status  AE_OK if okay, else a valid acpi_status code.
@@ -199,7 +134,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
  *              AE_BUFFER_OVERFLOW and output_buffer->Length will point
  *              to the size buffer needed.
  *
- * DESCRIPTION: Takes the union acpi_operand_object package and creates a
+ * DESCRIPTION: Takes the union acpi_operand_object    package and creates a
  *              linked list of PCI interrupt descriptions
  *
  * NOTE: It is the caller's responsibility to ensure that the start of the
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 4d11b072388..33db7520c74 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,13 +61,11 @@ static void acpi_rs_out_integer64(char *title, u64 value);
 
 static void acpi_rs_out_title(char *title);
 
-static void acpi_rs_dump_byte_list(u16 length, u8 *data);
+static void acpi_rs_dump_byte_list(u16 length, u8 * data);
 
-static void acpi_rs_dump_word_list(u16 length, u16 *data);
+static void acpi_rs_dump_dword_list(u8 length, u32 * data);
 
-static void acpi_rs_dump_dword_list(u8 length, u32 *data);
-
-static void acpi_rs_dump_short_byte_list(u8 length, u8 *data);
+static void acpi_rs_dump_short_byte_list(u8 length, u8 * data);
 
 static void
 acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source);
@@ -311,125 +309,6 @@ struct acpi_rsdump_info acpi_rs_dump_generic_reg[6] = {
         {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(generic_reg.address), "Address", NULL}
 };
 
-struct acpi_rsdump_info acpi_rs_dump_gpio[16] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_gpio), "GPIO", NULL},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.revision_id), "RevisionId", NULL},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.connection_type),
-         "ConnectionType", acpi_gbl_ct_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.producer_consumer),
-         "ProducerConsumer", acpi_gbl_consume_decode},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig",
-         acpi_gbl_ppc_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.sharable), "Sharable",
-         acpi_gbl_shr_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction),
-         "IoRestriction", acpi_gbl_ior_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.triggering), "Triggering",
-         acpi_gbl_he_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.polarity), "Polarity",
-         acpi_gbl_ll_decode},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.drive_strength), "DriveStrength",
-         NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.debounce_timeout),
-         "DebounceTimeout", NULL},
-        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(gpio.resource_source),
-         "ResourceSource", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.pin_table_length),
-         "PinTableLength", NULL},
-        {ACPI_RSD_WORDLIST, ACPI_RSD_OFFSET(gpio.pin_table), "PinTable", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.vendor_length), "VendorLength",
-         NULL},
-        {ACPI_RSD_SHORTLISTX, ACPI_RSD_OFFSET(gpio.vendor_data), "VendorData",
-         NULL},
-};
-
-struct acpi_rsdump_info acpi_rs_dump_fixed_dma[4] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_dma),
-         "FixedDma", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.request_lines),
-         "RequestLines", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.channels), "Channels",
-         NULL},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(fixed_dma.width), "TransferWidth",
-         acpi_gbl_dts_decode},
-};
-
-#define ACPI_RS_DUMP_COMMON_SERIAL_BUS \
-        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.revision_id),    "RevisionId",               NULL}, \
-        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type),           "Type",                     acpi_gbl_sbt_decode}, \
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.producer_consumer), "ProducerConsumer",      acpi_gbl_consume_decode}, \
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.slave_mode),     "SlaveMode",                acpi_gbl_sm_decode}, \
-        {ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type_revision_id), "TypeRevisionId",         NULL}, \
-        {ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.type_data_length), "TypeDataLength",         NULL}, \
-        {ACPI_RSD_SOURCE,   ACPI_RSD_OFFSET (common_serial_bus.resource_source), "ResourceSource",          NULL}, \
-        {ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.vendor_length),  "VendorLength",             NULL}, \
-        {ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (common_serial_bus.vendor_data),   "VendorData",               NULL},
-
-struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[10] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_common_serial_bus),
-         "Common Serial Bus", NULL},
-        ACPI_RS_DUMP_COMMON_SERIAL_BUS
-};
-
-struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_i2c_serial_bus),
-         "I2C Serial Bus", NULL},
-        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
-                                        ACPI_RSD_OFFSET(i2c_serial_bus.
-                                                        access_mode),
-                                        "AccessMode", acpi_gbl_am_decode},
-        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(i2c_serial_bus.connection_speed),
-         "ConnectionSpeed", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(i2c_serial_bus.slave_address),
-         "SlaveAddress", NULL},
-};
-
-struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_spi_serial_bus),
-         "Spi Serial Bus", NULL},
-        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
-                                        ACPI_RSD_OFFSET(spi_serial_bus.
-                                                        wire_mode), "WireMode",
-                                        acpi_gbl_wm_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(spi_serial_bus.device_polarity),
-         "DevicePolarity", acpi_gbl_dp_decode},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.data_bit_length),
-         "DataBitLength", NULL},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_phase),
-         "ClockPhase", acpi_gbl_cph_decode},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_polarity),
-         "ClockPolarity", acpi_gbl_cpo_decode},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(spi_serial_bus.device_selection),
-         "DeviceSelection", NULL},
-        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(spi_serial_bus.connection_speed),
-         "ConnectionSpeed", NULL},
-};
-
-struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[19] = {
-        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_uart_serial_bus),
-         "Uart Serial Bus", NULL},
-        ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_2BITFLAG,
-                                        ACPI_RSD_OFFSET(uart_serial_bus.
-                                                        flow_control),
-                                        "FlowControl", acpi_gbl_fc_decode},
-        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.stop_bits),
-         "StopBits", acpi_gbl_sb_decode},
-        {ACPI_RSD_3BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.data_bits),
-         "DataBits", acpi_gbl_bpb_decode},
-        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.endian), "Endian",
-         acpi_gbl_ed_decode},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.parity), "Parity",
-         acpi_gbl_pt_decode},
-        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.lines_enabled),
-         "LinesEnabled", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.rx_fifo_size),
-         "RxFifoSize", NULL},
-        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.tx_fifo_size),
-         "TxFifoSize", NULL},
-        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(uart_serial_bus.default_baud_rate),
-         "ConnectionSpeed", NULL},
-};
-
 /*
  * Tables used for common address descriptor flag fields
  */
@@ -534,14 +413,7 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         /* Data items, 8/16/32/64 bit */
 
                 case ACPI_RSD_UINT8:
-                        if (table->pointer) {
-                                acpi_rs_out_string(name, ACPI_CAST_PTR(char,
-                                                                       table->
-                                                                       pointer
-                                                                       [*target]));
-                        } else {
-                                acpi_rs_out_integer8(name, ACPI_GET8(target));
-                        }
+                        acpi_rs_out_integer8(name, ACPI_GET8(target));
                         break;
 
                 case ACPI_RSD_UINT16:
@@ -572,13 +444,6 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                                                                        0x03]));
                         break;
 
-                case ACPI_RSD_3BITFLAG:
-                        acpi_rs_out_string(name, ACPI_CAST_PTR(char,
-                                                               table->
-                                                               pointer[*target &
-                                                                       0x07]));
-                        break;
-
                 case ACPI_RSD_SHORTLIST:
                         /*
                          * Short byte list (single line output) for DMA and IRQ resources
@@ -591,20 +456,6 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         }
                         break;
 
-                case ACPI_RSD_SHORTLISTX:
-                        /*
-                         * Short byte list (single line output) for GPIO vendor data
-                         * Note: The list length is obtained from the previous table entry
-                         */
-                        if (previous_target) {
-                                acpi_rs_out_title(name);
-                                acpi_rs_dump_short_byte_list(*previous_target,
-                                                             *
-                                                             (ACPI_CAST_INDIRECT_PTR
-                                                              (u8, target)));
-                        }
-                        break;
-
                 case ACPI_RSD_LONGLIST:
                         /*
                          * Long byte list for Vendor resource data
@@ -629,18 +480,6 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         }
                         break;
 
-                case ACPI_RSD_WORDLIST:
-                        /*
-                         * Word list for GPIO Pin Table
-                         * Note: The list length is obtained from the previous table entry
-                         */
-                        if (previous_target) {
-                                acpi_rs_dump_word_list(*previous_target,
-                                                       *(ACPI_CAST_INDIRECT_PTR
-                                                         (u16, target)));
-                        }
-                        break;
-
                 case ACPI_RSD_ADDRESS:
                         /*
                          * Common flags for all Address resources
@@ -703,7 +542,7 @@ acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source)
  *
  * FUNCTION:    acpi_rs_dump_address_common
  *
- * PARAMETERS:  resource        - Pointer to an internal resource descriptor
+ * PARAMETERS:  Resource        - Pointer to an internal resource descriptor
  *
  * RETURN:      None
  *
@@ -788,20 +627,14 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
 
                 /* Dump the resource descriptor */
 
-                if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
-                        acpi_rs_dump_descriptor(&resource_list->data,
-                                                acpi_gbl_dump_serial_bus_dispatch
-                                                [resource_list->data.
-                                                 common_serial_bus.type]);
-                } else {
-                        acpi_rs_dump_descriptor(&resource_list->data,
-                                                acpi_gbl_dump_resource_dispatch
-                                                [type]);
-                }
+                acpi_rs_dump_descriptor(&resource_list->data,
+                                        acpi_gbl_dump_resource_dispatch[type]);
 
                 /* Point to the next resource structure */
 
-                resource_list = ACPI_NEXT_RESOURCE(resource_list);
+                resource_list =
+                    ACPI_ADD_PTR(struct acpi_resource, resource_list,
+                                 resource_list->length);
 
                 /* Exit when END_TAG descriptor is reached */
 
@@ -850,8 +683,8 @@ void acpi_rs_dump_irq_list(u8 * route_table)
  *
  * FUNCTION:    acpi_rs_out*
  *
- * PARAMETERS:  title       - Name of the resource field
- *              value       - Value of the resource field
+ * PARAMETERS:  Title       - Name of the resource field
+ *              Value       - Value of the resource field
  *
  * RETURN:      None
  *
@@ -898,8 +731,8 @@ static void acpi_rs_out_title(char *title)
  *
  * FUNCTION:    acpi_rs_dump*List
  *
- * PARAMETERS:  length      - Number of elements in the list
- *              data        - Start of the list
+ * PARAMETERS:  Length      - Number of elements in the list
+ *              Data        - Start of the list
  *
  * RETURN:      None
  *
@@ -935,13 +768,4 @@ static void acpi_rs_dump_dword_list(u8 length, u32 * data)
         }
 }
 
-static void acpi_rs_dump_word_list(u16 length, u16 *data)
-{
-        u16 i;
-
-        for (i = 0; i < length; i++) {
-                acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]);
-        }
-}
-
 #endif
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index a9fa5158200..f9ea60872aa 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,10 +76,7 @@ struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[] = {
         acpi_rs_convert_address64,      /* 0x0D, ACPI_RESOURCE_TYPE_ADDRESS64 */
         acpi_rs_convert_ext_address64,  /* 0x0E, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         acpi_rs_convert_ext_irq,        /* 0x0F, ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
-        acpi_rs_convert_generic_reg,    /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
-        acpi_rs_convert_gpio,   /* 0x11, ACPI_RESOURCE_TYPE_GPIO */
-        acpi_rs_convert_fixed_dma,      /* 0x12, ACPI_RESOURCE_TYPE_FIXED_DMA */
-        NULL,                   /* 0x13, ACPI_RESOURCE_TYPE_SERIAL_BUS - Use subtype table below */
+        acpi_rs_convert_generic_reg     /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
 };
 
 /* Dispatch tables for AML-to-resource (Get Resource) conversion functions */
@@ -97,7 +94,7 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {
         acpi_rs_convert_end_dpf,        /* 0x07, ACPI_RESOURCE_NAME_END_DEPENDENT */
         acpi_rs_convert_io,     /* 0x08, ACPI_RESOURCE_NAME_IO */
         acpi_rs_convert_fixed_io,       /* 0x09, ACPI_RESOURCE_NAME_FIXED_IO */
-        acpi_rs_convert_fixed_dma,      /* 0x0A, ACPI_RESOURCE_NAME_FIXED_DMA */
+        NULL,                   /* 0x0A, Reserved */
         NULL,                   /* 0x0B, Reserved */
         NULL,                   /* 0x0C, Reserved */
         NULL,                   /* 0x0D, Reserved */
@@ -117,19 +114,7 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {
         acpi_rs_convert_address16,      /* 0x08, ACPI_RESOURCE_NAME_ADDRESS16 */
         acpi_rs_convert_ext_irq,        /* 0x09, ACPI_RESOURCE_NAME_EXTENDED_IRQ */
         acpi_rs_convert_address64,      /* 0x0A, ACPI_RESOURCE_NAME_ADDRESS64 */
-        acpi_rs_convert_ext_address64,  /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */
-        acpi_rs_convert_gpio,   /* 0x0C, ACPI_RESOURCE_NAME_GPIO */
-        NULL,                   /* 0x0D, Reserved */
-        NULL,                   /* 0x0E, ACPI_RESOURCE_NAME_SERIAL_BUS - Use subtype table below */
-};
-
-/* Subtype table for serial_bus -- I2C, SPI, and UART */
-
-struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = {
-        NULL,
-        acpi_rs_convert_i2c_serial_bus,
-        acpi_rs_convert_spi_serial_bus,
-        acpi_rs_convert_uart_serial_bus,
+        acpi_rs_convert_ext_address64   /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */
 };
 
 #ifdef ACPI_FUTURE_USAGE
@@ -155,16 +140,6 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
         acpi_rs_dump_ext_address64,     /* ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         acpi_rs_dump_ext_irq,   /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
         acpi_rs_dump_generic_reg,       /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
-        acpi_rs_dump_gpio,      /* ACPI_RESOURCE_TYPE_GPIO */
-        acpi_rs_dump_fixed_dma, /* ACPI_RESOURCE_TYPE_FIXED_DMA */
-        NULL,                   /* ACPI_RESOURCE_TYPE_SERIAL_BUS */
-};
-
-struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = {
-        NULL,
-        acpi_rs_dump_i2c_serial_bus,    /* AML_RESOURCE_I2C_BUS_TYPE */
-        acpi_rs_dump_spi_serial_bus,    /* AML_RESOURCE_SPI_BUS_TYPE */
-        acpi_rs_dump_uart_serial_bus,   /* AML_RESOURCE_UART_BUS_TYPE */
 };
 #endif
 
@@ -191,10 +166,7 @@ const u8 acpi_gbl_aml_resource_sizes[] = {
         sizeof(struct aml_resource_address64),  /* ACPI_RESOURCE_TYPE_ADDRESS64 */
         sizeof(struct aml_resource_extended_address64), /*ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
         sizeof(struct aml_resource_extended_irq),       /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
-        sizeof(struct aml_resource_generic_register),   /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
-        sizeof(struct aml_resource_gpio),       /* ACPI_RESOURCE_TYPE_GPIO */
-        sizeof(struct aml_resource_fixed_dma),  /* ACPI_RESOURCE_TYPE_FIXED_DMA */
-        sizeof(struct aml_resource_common_serialbus),   /* ACPI_RESOURCE_TYPE_SERIAL_BUS */
+        sizeof(struct aml_resource_generic_register)    /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
 };
 
 const u8 acpi_gbl_resource_struct_sizes[] = {
@@ -210,7 +182,7 @@ const u8 acpi_gbl_resource_struct_sizes[] = {
         ACPI_RS_SIZE_MIN,
         ACPI_RS_SIZE(struct acpi_resource_io),
         ACPI_RS_SIZE(struct acpi_resource_fixed_io),
-        ACPI_RS_SIZE(struct acpi_resource_fixed_dma),
+        0,
         0,
         0,
         0,
@@ -230,21 +202,5 @@ const u8 acpi_gbl_resource_struct_sizes[] = {
         ACPI_RS_SIZE(struct acpi_resource_address16),
         ACPI_RS_SIZE(struct acpi_resource_extended_irq),
         ACPI_RS_SIZE(struct acpi_resource_address64),
-        ACPI_RS_SIZE(struct acpi_resource_extended_address64),
-        ACPI_RS_SIZE(struct acpi_resource_gpio),
-        ACPI_RS_SIZE(struct acpi_resource_common_serialbus)
-};
-
-const u8 acpi_gbl_aml_resource_serial_bus_sizes[] = {
-        0,
-        sizeof(struct aml_resource_i2c_serialbus),
-        sizeof(struct aml_resource_spi_serialbus),
-        sizeof(struct aml_resource_uart_serialbus),
-};
-
-const u8 acpi_gbl_resource_struct_serial_bus_sizes[] = {
-        0,
-        ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),
-        ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),
-        ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),
+        ACPI_RS_SIZE(struct acpi_resource_extended_address64)
 };
diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c
index f6a081057a2..0c7efef008b 100644
--- a/drivers/acpi/acpica/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index e23a9ec248c..50b8ad21116 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -264,34 +264,3 @@ struct acpi_rsconvert_info acpi_rs_convert_dma[6] = {
          AML_OFFSET(dma.dma_channel_mask),
          ACPI_RS_OFFSET(data.dma.channel_count)}
 };
-
-/*******************************************************************************
- *
- * acpi_rs_convert_fixed_dma
- *
- ******************************************************************************/
-
-struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = {
-        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_DMA,
-         ACPI_RS_SIZE(struct acpi_resource_fixed_dma),
-         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_dma)},
-
-        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_DMA,
-         sizeof(struct aml_resource_fixed_dma),
-         0},
-
-        /*
-         * These fields are contiguous in both the source and destination:
-         * request_lines
-         * Channels
-         */
-
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_dma.request_lines),
-         AML_OFFSET(fixed_dma.request_lines),
-         2},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_dma.width),
-         AML_OFFSET(fixed_dma.width),
-         1},
-
-};
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 8b64db9a3fd..1bfcef736c5 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,8 +70,6 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
         struct acpi_resource **resource_ptr =
             ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);
         struct acpi_resource *resource;
-        union aml_resource *aml_resource;
-        struct acpi_rsconvert_info *conversion_table;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);
@@ -86,37 +84,14 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
                               "Misaligned resource pointer %p", resource));
         }
 
-        /* Get the appropriate conversion info table */
-
-        aml_resource = ACPI_CAST_PTR(union aml_resource, aml);
-        if (acpi_ut_get_resource_type(aml) == ACPI_RESOURCE_NAME_SERIAL_BUS) {
-                if (aml_resource->common_serial_bus.type >
-                    AML_RESOURCE_MAX_SERIALBUSTYPE) {
-                        conversion_table = NULL;
-                } else {
-                        /* This is an I2C, SPI, or UART serial_bus descriptor */
-
-                        conversion_table =
-                            acpi_gbl_convert_resource_serial_bus_dispatch
-                            [aml_resource->common_serial_bus.type];
-                }
-        } else {
-                conversion_table =
-                    acpi_gbl_get_resource_dispatch[resource_index];
-        }
-
-        if (!conversion_table) {
-                ACPI_ERROR((AE_INFO,
-                            "Invalid/unsupported resource descriptor: Type 0x%2.2X",
-                            resource_index));
-                return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-        }
-
         /* Convert the AML byte stream resource to a local resource struct */
 
         status =
-            acpi_rs_convert_aml_to_resource(resource, aml_resource,
-                                            conversion_table);
+            acpi_rs_convert_aml_to_resource(resource,
+                                            ACPI_CAST_PTR(union aml_resource,
+                                                          aml),
+                                            acpi_gbl_get_resource_dispatch
+                                            [resource_index]);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Could not convert AML resource (Type 0x%X)",
@@ -131,7 +106,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
 
         /* Point to the next structure in the output buffer */
 
-        *resource_ptr = ACPI_NEXT_RESOURCE(resource);
+        *resource_ptr = ACPI_ADD_PTR(void, resource, resource->length);
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -139,7 +114,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
  *
  * FUNCTION:    acpi_rs_convert_resources_to_aml
  *
- * PARAMETERS:  resource            - Pointer to the resource linked list
+ * PARAMETERS:  Resource            - Pointer to the resource linked list
  *              aml_size_needed     - Calculated size of the byte stream
  *                                    needed from calling acpi_rs_get_aml_length()
  *                                    The size of the output_buffer is
@@ -160,7 +135,6 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 {
         u8 *aml = output_buffer;
         u8 *end_aml = output_buffer + aml_size_needed;
-        struct acpi_rsconvert_info *conversion_table;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);
@@ -180,34 +154,11 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 /* Perform the conversion */
 
-                if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
-                        if (resource->data.common_serial_bus.type >
-                            AML_RESOURCE_MAX_SERIALBUSTYPE) {
-                                conversion_table = NULL;
-                        } else {
-                                /* This is an I2C, SPI, or UART serial_bus descriptor */
-
-                                conversion_table =
-                                    acpi_gbl_convert_resource_serial_bus_dispatch
-                                    [resource->data.common_serial_bus.type];
-                        }
-                } else {
-                        conversion_table =
-                            acpi_gbl_set_resource_dispatch[resource->type];
-                }
-
-                if (!conversion_table) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Invalid/unsupported resource descriptor: Type 0x%2.2X",
-                                    resource->type));
-                        return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-                }
-
-                status = acpi_rs_convert_resource_to_aml(resource,
-                                                         ACPI_CAST_PTR(union
-                                                                       aml_resource,
-                                                                       aml),
-                                                         conversion_table);
+                status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union
+                                                                                 aml_resource,
+                                                                                 aml),
+                                                         acpi_gbl_set_resource_dispatch
+                                                         [resource->type]);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not convert resource (type 0x%X) to AML",
@@ -241,7 +192,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 /* Point to the next input resource descriptor */
 
-                resource = ACPI_NEXT_RESOURCE(resource);
+                resource =
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
+                                 resource->length);
         }
 
         /* Completed buffer, but did not find an end_tag resource descriptor */
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 4fd611ad02b..7cc6d8625f1 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index c6f291c2bc8..410264b22a2 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,9 +57,9 @@ ACPI_MODULE_NAME("rsmisc")
  *
  * FUNCTION:    acpi_rs_convert_aml_to_resource
  *
- * PARAMETERS:  resource            - Pointer to the resource descriptor
- *              aml                 - Where the AML descriptor is returned
- *              info                - Pointer to appropriate conversion table
+ * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ *              Aml                 - Where the AML descriptor is returned
+ *              Info                - Pointer to appropriate conversion table
  *
  * RETURN:      Status
  *
@@ -83,10 +83,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
         ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
 
-        if (!info) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
         if (((acpi_size) resource) & 0x3) {
 
                 /* Each internal resource struct is expected to be 32-bit aligned */
@@ -105,6 +101,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
          * table length (# of table entries)
          */
         count = INIT_TABLE_LENGTH(info);
+
         while (count) {
                 /*
                  * Source is the external AML byte stream buffer,
@@ -148,14 +145,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                             ((ACPI_GET8(source) >> info->value) & 0x03);
                         break;
 
-                case ACPI_RSC_3BITFLAG:
-                        /*
-                         * Mask and shift the flag bits
-                         */
-                        ACPI_SET8(destination) = (u8)
-                            ((ACPI_GET8(source) >> info->value) & 0x07);
-                        break;
-
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
@@ -174,69 +163,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                             (info->value * (item_count - 1));
                         break;
 
-                case ACPI_RSC_COUNT_GPIO_PIN:
-
-                        target = ACPI_ADD_PTR(void, aml, info->value);
-                        item_count = ACPI_GET16(target) - ACPI_GET16(source);
-
-                        resource->length = resource->length + item_count;
-                        item_count = item_count / 2;
-                        ACPI_SET16(destination) = item_count;
-                        break;
-
-                case ACPI_RSC_COUNT_GPIO_VEN:
-
-                        item_count = ACPI_GET8(source);
-                        ACPI_SET8(destination) = (u8)item_count;
-
-                        resource->length = resource->length +
-                            (info->value * item_count);
-                        break;
-
-                case ACPI_RSC_COUNT_GPIO_RES:
-
-                        /*
-                         * Vendor data is optional (length/offset may both be zero)
-                         * Examine vendor data length field first
-                         */
-                        target = ACPI_ADD_PTR(void, aml, (info->value + 2));
-                        if (ACPI_GET16(target)) {
-
-                                /* Use vendor offset to get resource source length */
-
-                                target = ACPI_ADD_PTR(void, aml, info->value);
-                                item_count =
-                                    ACPI_GET16(target) - ACPI_GET16(source);
-                        } else {
-                                /* No vendor data to worry about */
-
-                                item_count = aml->large_header.resource_length +
-                                    sizeof(struct aml_resource_large_header) -
-                                    ACPI_GET16(source);
-                        }
-
-                        resource->length = resource->length + item_count;
-                        ACPI_SET16(destination) = item_count;
-                        break;
-
-                case ACPI_RSC_COUNT_SERIAL_VEN:
-
-                        item_count = ACPI_GET16(source) - info->value;
-
-                        resource->length = resource->length + item_count;
-                        ACPI_SET16(destination) = item_count;
-                        break;
-
-                case ACPI_RSC_COUNT_SERIAL_RES:
-
-                        item_count = (aml_resource_length +
-                                      sizeof(struct aml_resource_large_header))
-                            - ACPI_GET16(source) - info->value;
-
-                        resource->length = resource->length + item_count;
-                        ACPI_SET16(destination) = item_count;
-                        break;
-
                 case ACPI_RSC_LENGTH:
 
                         resource->length = resource->length + info->value;
@@ -257,72 +183,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                                           info->opcode);
                         break;
 
-                case ACPI_RSC_MOVE_GPIO_PIN:
-
-                        /* Generate and set the PIN data pointer */
-
-                        target = (char *)ACPI_ADD_PTR(void, resource,
-                                                      (resource->length -
-                                                       item_count * 2));
-                        *(u16 **)destination = ACPI_CAST_PTR(u16, target);
-
-                        /* Copy the PIN data */
-
-                        source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));
-                        acpi_rs_move_data(target, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_GPIO_RES:
-
-                        /* Generate and set the resource_source string pointer */
-
-                        target = (char *)ACPI_ADD_PTR(void, resource,
-                                                      (resource->length -
-                                                       item_count));
-                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
-
-                        /* Copy the resource_source string */
-
-                        source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));
-                        acpi_rs_move_data(target, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_SERIAL_VEN:
-
-                        /* Generate and set the Vendor Data pointer */
-
-                        target = (char *)ACPI_ADD_PTR(void, resource,
-                                                      (resource->length -
-                                                       item_count));
-                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
-
-                        /* Copy the Vendor Data */
-
-                        source = ACPI_ADD_PTR(void, aml, info->value);
-                        acpi_rs_move_data(target, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_SERIAL_RES:
-
-                        /* Generate and set the resource_source string pointer */
-
-                        target = (char *)ACPI_ADD_PTR(void, resource,
-                                                      (resource->length -
-                                                       item_count));
-                        *(u8 **)destination = ACPI_CAST_PTR(u8, target);
-
-                        /* Copy the resource_source string */
-
-                        source =
-                            ACPI_ADD_PTR(void, aml,
-                                         (ACPI_GET16(source) + info->value));
-                        acpi_rs_move_data(target, source, item_count,
-                                          info->opcode);
-                        break;
-
                 case ACPI_RSC_SET8:
 
                         ACPI_MEMSET(destination, info->aml_offset, info->value);
@@ -359,18 +219,13 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                          * Optional resource_source (Index and String). This is the more
                          * complicated case used by the Interrupt() macro
                          */
-                        target = ACPI_ADD_PTR(char, resource,
-                                              info->aml_offset +
-                                              (item_count * 4));
+                        target =
+                            ACPI_ADD_PTR(char, resource,
+                                         info->aml_offset + (item_count * 4));
 
                         resource->length +=
                             acpi_rs_get_resource_source(aml_resource_length,
-                                                        (acpi_rs_length)
-                                                        (((item_count -
-                                                           1) * sizeof(u32)) +
-                                                         info->value),
-                                                        destination, aml,
-                                                        target);
+                                                        (acpi_rs_length) (((item_count - 1) * sizeof(u32)) + info->value), destination, aml, target);
                         break;
 
                 case ACPI_RSC_BITMASK:
@@ -406,7 +261,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
                 case ACPI_RSC_EXIT_NE:
                         /*
-                         * control - Exit conversion if not equal
+                         * Control - Exit conversion if not equal
                          */
                         switch (info->resource_offset) {
                         case ACPI_RSC_COMPARE_AML_LENGTH:
@@ -454,9 +309,9 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
  *
  * FUNCTION:    acpi_rs_convert_resource_to_aml
  *
- * PARAMETERS:  resource            - Pointer to the resource descriptor
- *              aml                 - Where the AML descriptor is returned
- *              info                - Pointer to appropriate conversion table
+ * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ *              Aml                 - Where the AML descriptor is returned
+ *              Info                - Pointer to appropriate conversion table
  *
  * RETURN:      Status
  *
@@ -472,7 +327,6 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 {
         void *source = NULL;
         void *destination;
-        char *target;
         acpi_rsdesc_size aml_length = 0;
         u8 count;
         u16 temp16 = 0;
@@ -480,10 +334,6 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 
         ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);
 
-        if (!info) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
         /*
          * First table entry must be ACPI_RSC_INITxxx and must contain the
          * table length (# of table entries)
@@ -533,14 +383,6 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                             ((ACPI_GET8(source) & 0x03) << info->value);
                         break;
 
-                case ACPI_RSC_3BITFLAG:
-                        /*
-                         * Mask and shift the flag bits
-                         */
-                        ACPI_SET8(destination) |= (u8)
-                            ((ACPI_GET8(source) & 0x07) << info->value);
-                        break;
-
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
@@ -558,63 +400,6 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                         acpi_rs_set_resource_length(aml_length, aml);
                         break;
 
-                case ACPI_RSC_COUNT_GPIO_PIN:
-
-                        item_count = ACPI_GET16(source);
-                        ACPI_SET16(destination) = (u16)aml_length;
-
-                        aml_length = (u16)(aml_length + item_count * 2);
-                        target = ACPI_ADD_PTR(void, aml, info->value);
-                        ACPI_SET16(target) = (u16)aml_length;
-                        acpi_rs_set_resource_length(aml_length, aml);
-                        break;
-
-                case ACPI_RSC_COUNT_GPIO_VEN:
-
-                        item_count = ACPI_GET16(source);
-                        ACPI_SET16(destination) = (u16)item_count;
-
-                        aml_length =
-                            (u16)(aml_length + (info->value * item_count));
-                        acpi_rs_set_resource_length(aml_length, aml);
-                        break;
-
-                case ACPI_RSC_COUNT_GPIO_RES:
-
-                        /* Set resource source string length */
-
-                        item_count = ACPI_GET16(source);
-                        ACPI_SET16(destination) = (u16)aml_length;
-
-                        /* Compute offset for the Vendor Data */
-
-                        aml_length = (u16)(aml_length + item_count);
-                        target = ACPI_ADD_PTR(void, aml, info->value);
-
-                        /* Set vendor offset only if there is vendor data */
-
-                        if (resource->data.gpio.vendor_length) {
-                                ACPI_SET16(target) = (u16)aml_length;
-                        }
-
-                        acpi_rs_set_resource_length(aml_length, aml);
-                        break;
-
-                case ACPI_RSC_COUNT_SERIAL_VEN:
-
-                        item_count = ACPI_GET16(source);
-                        ACPI_SET16(destination) = item_count + info->value;
-                        aml_length = (u16)(aml_length + item_count);
-                        acpi_rs_set_resource_length(aml_length, aml);
-                        break;
-
-                case ACPI_RSC_COUNT_SERIAL_RES:
-
-                        item_count = ACPI_GET16(source);
-                        aml_length = (u16)(aml_length + item_count);
-                        acpi_rs_set_resource_length(aml_length, aml);
-                        break;
-
                 case ACPI_RSC_LENGTH:
 
                         acpi_rs_set_resource_length(info->value, aml);
@@ -632,48 +417,6 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                                           info->opcode);
                         break;
 
-                case ACPI_RSC_MOVE_GPIO_PIN:
-
-                        destination = (char *)ACPI_ADD_PTR(void, aml,
-                                                           ACPI_GET16
-                                                           (destination));
-                        source = *(u16 **)source;
-                        acpi_rs_move_data(destination, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_GPIO_RES:
-
-                        /* Used for both resource_source string and vendor_data */
-
-                        destination = (char *)ACPI_ADD_PTR(void, aml,
-                                                           ACPI_GET16
-                                                           (destination));
-                        source = *(u8 **)source;
-                        acpi_rs_move_data(destination, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_SERIAL_VEN:
-
-                        destination = (char *)ACPI_ADD_PTR(void, aml,
-                                                           (aml_length -
-                                                            item_count));
-                        source = *(u8 **)source;
-                        acpi_rs_move_data(destination, source, item_count,
-                                          info->opcode);
-                        break;
-
-                case ACPI_RSC_MOVE_SERIAL_RES:
-
-                        destination = (char *)ACPI_ADD_PTR(void, aml,
-                                                           (aml_length -
-                                                            item_count));
-                        source = *(u8 **)source;
-                        acpi_rs_move_data(destination, source, item_count,
-                                          info->opcode);
-                        break;
-
                 case ACPI_RSC_ADDRESS:
 
                         /* Set the Resource Type, General Flags, and Type-Specific Flags */
@@ -726,7 +469,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 
                 case ACPI_RSC_EXIT_LE:
                         /*
-                         * control - Exit conversion if less than or equal
+                         * Control - Exit conversion if less than or equal
                          */
                         if (item_count <= info->value) {
                                 goto exit;
@@ -735,7 +478,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 
                 case ACPI_RSC_EXIT_NE:
                         /*
-                         * control - Exit conversion if not equal
+                         * Control - Exit conversion if not equal
                          */
                         switch (COMPARE_OPCODE(info)) {
                         case ACPI_RSC_COMPARE_VALUE:
@@ -757,7 +500,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 
                 case ACPI_RSC_EXIT_EQ:
                         /*
-                         * control - Exit conversion if equal
+                         * Control - Exit conversion if equal
                          */
                         if (*ACPI_ADD_PTR(u8, resource,
                                           COMPARE_TARGET(info)) ==
@@ -783,7 +526,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 #if 0
 /* Previous resource validations */
 
-if (aml->ext_address64.revision_ID != AML_RESOURCE_EXTENDED_ADDRESS_REVISION) {
+if (aml->ext_address64.revision_iD != AML_RESOURCE_EXTENDED_ADDRESS_REVISION) {
         return_ACPI_STATUS(AE_SUPPORT);
 }
 
diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c
deleted file mode 100644
index 9aa5e689b44..00000000000
--- a/drivers/acpi/acpica/rsserial.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*******************************************************************************
- *
- * Module Name: rsserial - GPIO/serial_bus resource descriptors
- *
- ******************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include "acresrc.h"
-
-#define _COMPONENT          ACPI_RESOURCES
-ACPI_MODULE_NAME("rsserial")
-
-/*******************************************************************************
- *
- * acpi_rs_convert_gpio
- *
- ******************************************************************************/
-struct acpi_rsconvert_info acpi_rs_convert_gpio[17] = {
-        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_GPIO,
-         ACPI_RS_SIZE(struct acpi_resource_gpio),
-         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_gpio)},
-
-        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_GPIO,
-         sizeof(struct aml_resource_gpio),
-         0},
-
-        /*
-         * These fields are contiguous in both the source and destination:
-         * revision_id
-         * connection_type
-         */
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.revision_id),
-         AML_OFFSET(gpio.revision_id),
-         2},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.producer_consumer),
-         AML_OFFSET(gpio.flags),
-         0},
-
-        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable),
-         AML_OFFSET(gpio.int_flags),
-         3},
-
-        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.io_restriction),
-         AML_OFFSET(gpio.int_flags),
-         0},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.triggering),
-         AML_OFFSET(gpio.int_flags),
-         0},
-
-        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.polarity),
-         AML_OFFSET(gpio.int_flags),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.pin_config),
-         AML_OFFSET(gpio.pin_config),
-         1},
-
-        /*
-         * These fields are contiguous in both the source and destination:
-         * drive_strength
-         * debounce_timeout
-         */
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.gpio.drive_strength),
-         AML_OFFSET(gpio.drive_strength),
-         2},
-
-        /* Pin Table */
-
-        {ACPI_RSC_COUNT_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table_length),
-         AML_OFFSET(gpio.pin_table_offset),
-         AML_OFFSET(gpio.res_source_offset)},
-
-        {ACPI_RSC_MOVE_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table),
-         AML_OFFSET(gpio.pin_table_offset),
-         0},
-
-        /* Resource Source */
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.resource_source.index),
-         AML_OFFSET(gpio.res_source_index),
-         1},
-
-        {ACPI_RSC_COUNT_GPIO_RES,
-         ACPI_RS_OFFSET(data.gpio.resource_source.string_length),
-         AML_OFFSET(gpio.res_source_offset),
-         AML_OFFSET(gpio.vendor_offset)},
-
-        {ACPI_RSC_MOVE_GPIO_RES,
-         ACPI_RS_OFFSET(data.gpio.resource_source.string_ptr),
-         AML_OFFSET(gpio.res_source_offset),
-         0},
-
-        /* Vendor Data */
-
-        {ACPI_RSC_COUNT_GPIO_VEN, ACPI_RS_OFFSET(data.gpio.vendor_length),
-         AML_OFFSET(gpio.vendor_length),
-         1},
-
-        {ACPI_RSC_MOVE_GPIO_RES, ACPI_RS_OFFSET(data.gpio.vendor_data),
-         AML_OFFSET(gpio.vendor_offset),
-         0},
-};
-
-/*******************************************************************************
- *
- * acpi_rs_convert_i2c_serial_bus
- *
- ******************************************************************************/
-
-struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {
-        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
-         ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),
-         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_i2c_serial_bus)},
-
-        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
-         sizeof(struct aml_resource_i2c_serialbus),
-         0},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
-         AML_OFFSET(common_serial_bus.revision_id),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
-         AML_OFFSET(common_serial_bus.type),
-         1},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
-         AML_OFFSET(common_serial_bus.flags),
-         0},
-
-        {ACPI_RSC_1BITFLAG,
-         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
-         AML_OFFSET(common_serial_bus.flags),
-         1},
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
-         AML_OFFSET(common_serial_bus.type_revision_id),
-         1},
-
-        {ACPI_RSC_MOVE16,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         1},
-
-        /* Vendor data */
-
-        {ACPI_RSC_COUNT_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         AML_RESOURCE_I2C_MIN_DATA_LEN},
-
-        {ACPI_RSC_MOVE_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
-         0,
-         sizeof(struct aml_resource_i2c_serialbus)},
-
-        /* Resource Source */
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
-         AML_OFFSET(common_serial_bus.res_source_index),
-         1},
-
-        {ACPI_RSC_COUNT_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        {ACPI_RSC_MOVE_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        /* I2C bus type specific */
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.i2c_serial_bus.access_mode),
-         AML_OFFSET(i2c_serial_bus.type_specific_flags),
-         0},
-
-        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.i2c_serial_bus.connection_speed),
-         AML_OFFSET(i2c_serial_bus.connection_speed),
-         1},
-
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.i2c_serial_bus.slave_address),
-         AML_OFFSET(i2c_serial_bus.slave_address),
-         1},
-};
-
-/*******************************************************************************
- *
- * acpi_rs_convert_spi_serial_bus
- *
- ******************************************************************************/
-
-struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {
-        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
-         ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),
-         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_spi_serial_bus)},
-
-        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
-         sizeof(struct aml_resource_spi_serialbus),
-         0},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
-         AML_OFFSET(common_serial_bus.revision_id),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
-         AML_OFFSET(common_serial_bus.type),
-         1},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
-         AML_OFFSET(common_serial_bus.flags),
-         0},
-
-        {ACPI_RSC_1BITFLAG,
-         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
-         AML_OFFSET(common_serial_bus.flags),
-         1},
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
-         AML_OFFSET(common_serial_bus.type_revision_id),
-         1},
-
-        {ACPI_RSC_MOVE16,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         1},
-
-        /* Vendor data */
-
-        {ACPI_RSC_COUNT_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         AML_RESOURCE_SPI_MIN_DATA_LEN},
-
-        {ACPI_RSC_MOVE_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
-         0,
-         sizeof(struct aml_resource_spi_serialbus)},
-
-        /* Resource Source */
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
-         AML_OFFSET(common_serial_bus.res_source_index),
-         1},
-
-        {ACPI_RSC_COUNT_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        {ACPI_RSC_MOVE_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        /* Spi bus type specific  */
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.wire_mode),
-         AML_OFFSET(spi_serial_bus.type_specific_flags),
-         0},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.device_polarity),
-         AML_OFFSET(spi_serial_bus.type_specific_flags),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.data_bit_length),
-         AML_OFFSET(spi_serial_bus.data_bit_length),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_phase),
-         AML_OFFSET(spi_serial_bus.clock_phase),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_polarity),
-         AML_OFFSET(spi_serial_bus.clock_polarity),
-         1},
-
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.spi_serial_bus.device_selection),
-         AML_OFFSET(spi_serial_bus.device_selection),
-         1},
-
-        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.spi_serial_bus.connection_speed),
-         AML_OFFSET(spi_serial_bus.connection_speed),
-         1},
-};
-
-/*******************************************************************************
- *
- * acpi_rs_convert_uart_serial_bus
- *
- ******************************************************************************/
-
-struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = {
-        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
-         ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),
-         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_uart_serial_bus)},
-
-        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,
-         sizeof(struct aml_resource_uart_serialbus),
-         0},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),
-         AML_OFFSET(common_serial_bus.revision_id),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),
-         AML_OFFSET(common_serial_bus.type),
-         1},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),
-         AML_OFFSET(common_serial_bus.flags),
-         0},
-
-        {ACPI_RSC_1BITFLAG,
-         ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),
-         AML_OFFSET(common_serial_bus.flags),
-         1},
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
-         AML_OFFSET(common_serial_bus.type_revision_id),
-         1},
-
-        {ACPI_RSC_MOVE16,
-         ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         1},
-
-        /* Vendor data */
-
-        {ACPI_RSC_COUNT_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         AML_RESOURCE_UART_MIN_DATA_LEN},
-
-        {ACPI_RSC_MOVE_SERIAL_VEN,
-         ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),
-         0,
-         sizeof(struct aml_resource_uart_serialbus)},
-
-        /* Resource Source */
-
-        {ACPI_RSC_MOVE8,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),
-         AML_OFFSET(common_serial_bus.res_source_index),
-         1},
-
-        {ACPI_RSC_COUNT_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        {ACPI_RSC_MOVE_SERIAL_RES,
-         ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),
-         AML_OFFSET(common_serial_bus.type_data_length),
-         sizeof(struct aml_resource_common_serialbus)},
-
-        /* Uart bus type specific  */
-
-        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.flow_control),
-         AML_OFFSET(uart_serial_bus.type_specific_flags),
-         0},
-
-        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.stop_bits),
-         AML_OFFSET(uart_serial_bus.type_specific_flags),
-         2},
-
-        {ACPI_RSC_3BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.data_bits),
-         AML_OFFSET(uart_serial_bus.type_specific_flags),
-         4},
-
-        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.endian),
-         AML_OFFSET(uart_serial_bus.type_specific_flags),
-         7},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.parity),
-         AML_OFFSET(uart_serial_bus.parity),
-         1},
-
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.lines_enabled),
-         AML_OFFSET(uart_serial_bus.lines_enabled),
-         1},
-
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.rx_fifo_size),
-         AML_OFFSET(uart_serial_bus.rx_fifo_size),
-         1},
-
-        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.tx_fifo_size),
-         AML_OFFSET(uart_serial_bus.tx_fifo_size),
-         1},
-
-        {ACPI_RSC_MOVE32,
-         ACPI_RS_OFFSET(data.uart_serial_bus.default_baud_rate),
-         AML_OFFSET(uart_serial_bus.default_baud_rate),
-         1},
-};
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 37d5241c0ac..231811e5693 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("rsutils")
  *
  * FUNCTION:    acpi_rs_decode_bitmask
  *
- * PARAMETERS:  mask            - Bitmask to decode
- *              list            - Where the converted list is returned
+ * PARAMETERS:  Mask            - Bitmask to decode
+ *              List            - Where the converted list is returned
  *
  * RETURN:      Count of bits set (length of list)
  *
@@ -86,8 +86,8 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
  *
  * FUNCTION:    acpi_rs_encode_bitmask
  *
- * PARAMETERS:  list            - List of values to encode
- *              count           - Length of list
+ * PARAMETERS:  List            - List of values to encode
+ *              Count           - Length of list
  *
  * RETURN:      Encoded bitmask
  *
@@ -115,8 +115,8 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
  *
  * FUNCTION:    acpi_rs_move_data
  *
- * PARAMETERS:  destination         - Pointer to the destination descriptor
- *              source              - Pointer to the source descriptor
+ * PARAMETERS:  Destination         - Pointer to the destination descriptor
+ *              Source              - Pointer to the source descriptor
  *              item_count          - How many items to move
  *              move_type           - Byte width
  *
@@ -144,9 +144,6 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                          * since there are no alignment or endian issues
                          */
                 case ACPI_RSC_MOVE8:
-                case ACPI_RSC_MOVE_GPIO_RES:
-                case ACPI_RSC_MOVE_SERIAL_VEN:
-                case ACPI_RSC_MOVE_SERIAL_RES:
                         ACPI_MEMCPY(destination, source, item_count);
                         return;
 
@@ -156,7 +153,6 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                          * misaligned memory transfers
                          */
                 case ACPI_RSC_MOVE16:
-                case ACPI_RSC_MOVE_GPIO_PIN:
                         ACPI_MOVE_16_TO_16(&ACPI_CAST_PTR(u16, destination)[i],
                                            &ACPI_CAST_PTR(u16, source)[i]);
                         break;
@@ -183,7 +179,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
  *
  * PARAMETERS:  total_length        - Length of the AML descriptor, including
  *                                    the header and length fields.
- *              aml                 - Pointer to the raw AML descriptor
+ *              Aml                 - Pointer to the raw AML descriptor
  *
  * RETURN:      None
  *
@@ -235,7 +231,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
  * PARAMETERS:  descriptor_type     - Byte to be inserted as the type
  *              total_length        - Length of the AML descriptor, including
  *                                    the header and length fields.
- *              aml                 - Pointer to the raw AML descriptor
+ *              Aml                 - Pointer to the raw AML descriptor
  *
  * RETURN:      None
  *
@@ -265,8 +261,8 @@ acpi_rs_set_resource_header(u8 descriptor_type,
  *
  * FUNCTION:    acpi_rs_strcpy
  *
- * PARAMETERS:  destination         - Pointer to the destination string
- *              source              - Pointer to the source string
+ * PARAMETERS:  Destination         - Pointer to the destination string
+ *              Source              - Pointer to the source string
  *
  * RETURN:      String length, including NULL terminator
  *
@@ -300,7 +296,7 @@ static u16 acpi_rs_strcpy(char *destination, char *source)
  *              minimum_length      - Minimum length of the descriptor (minus
  *                                    any optional fields)
  *              resource_source     - Where the resource_source is returned
- *              aml                 - Pointer to the raw AML descriptor
+ *              Aml                 - Pointer to the raw AML descriptor
  *              string_ptr          - (optional) where to store the actual
  *                                    resource_source string
  *
@@ -386,7 +382,7 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
  *
  * FUNCTION:    acpi_rs_set_resource_source
  *
- * PARAMETERS:  aml                 - Pointer to the raw AML descriptor
+ * PARAMETERS:  Aml                 - Pointer to the raw AML descriptor
  *              minimum_length      - Minimum length of the descriptor (minus
  *                                    any optional fields)
  *              resource_source     - Internal resource_source
@@ -445,7 +441,7 @@ acpi_rs_set_resource_source(union aml_resource * aml,
  *
  * FUNCTION:    acpi_rs_get_prt_method_data
  *
- * PARAMETERS:  node            - Device node
+ * PARAMETERS:  Node            - Device node
  *              ret_buffer      - Pointer to a buffer structure for the
  *                                results
  *
@@ -494,7 +490,7 @@ acpi_rs_get_prt_method_data(struct acpi_namespace_node * node,
  *
  * FUNCTION:    acpi_rs_get_crs_method_data
  *
- * PARAMETERS:  node            - Device node
+ * PARAMETERS:  Node            - Device node
  *              ret_buffer      - Pointer to a buffer structure for the
  *                                results
  *
@@ -534,7 +530,7 @@ acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
          */
         status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
 
-        /* On exit, we must delete the object returned by evaluateObject */
+        /* On exit, we must delete the object returned by evaluate_object */
 
         acpi_ut_remove_reference(obj_desc);
         return_ACPI_STATUS(status);
@@ -544,7 +540,7 @@ acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
  *
  * FUNCTION:    acpi_rs_get_prs_method_data
  *
- * PARAMETERS:  node            - Device node
+ * PARAMETERS:  Node            - Device node
  *              ret_buffer      - Pointer to a buffer structure for the
  *                                results
  *
@@ -585,7 +581,7 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
          */
         status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
 
-        /* On exit, we must delete the object returned by evaluateObject */
+        /* On exit, we must delete the object returned by evaluate_object */
 
         acpi_ut_remove_reference(obj_desc);
         return_ACPI_STATUS(status);
@@ -594,60 +590,10 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_get_aei_method_data
- *
- * PARAMETERS:  node            - Device node
- *              ret_buffer      - Pointer to a buffer structure for the
- *                                results
- *
- * RETURN:      Status
- *
- * DESCRIPTION: This function is called to get the _AEI value of an object
- *              contained in an object specified by the handle passed in
- *
- *              If the function fails an appropriate status will be returned
- *              and the contents of the callers buffer is undefined.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
-                            struct acpi_buffer *ret_buffer)
-{
-        union acpi_operand_object *obj_desc;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(rs_get_aei_method_data);
-
-        /* Parameters guaranteed valid by caller */
-
-        /* Execute the method, no parameters */
-
-        status = acpi_ut_evaluate_object(node, METHOD_NAME__AEI,
-                                         ACPI_BTYPE_BUFFER, &obj_desc);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * Make the call to create a resource linked list from the
-         * byte stream buffer that comes back from the _CRS method
-         * execution.
-         */
-        status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
-
-        /* On exit, we must delete the object returned by evaluateObject */
-
-        acpi_ut_remove_reference(obj_desc);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_rs_get_method_data
  *
- * PARAMETERS:  handle          - Handle to the containing object
- *              path            - Path to method, relative to Handle
+ * PARAMETERS:  Handle          - Handle to the containing object
+ *              Path            - Path to method, relative to Handle
  *              ret_buffer      - Pointer to a buffer structure for the
  *                                results
  *
@@ -697,7 +643,7 @@ acpi_rs_get_method_data(acpi_handle handle,
  *
  * FUNCTION:    acpi_rs_set_srs_method_data
  *
- * PARAMETERS:  node            - Device node
+ * PARAMETERS:  Node            - Device node
  *              in_buffer       - Pointer to a buffer structure of the
  *                                parameter
  *
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 5aad744b5b8..2ff657a28f2 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acresrc.h"
@@ -79,7 +78,7 @@ acpi_rs_validate_parameters(acpi_handle device_handle,
  * FUNCTION:    acpi_rs_validate_parameters
  *
  * PARAMETERS:  device_handle   - Handle to a device
- *              buffer          - Pointer to a data buffer
+ *              Buffer          - Pointer to a data buffer
  *              return_node     - Pointer to where the device node is returned
  *
  * RETURN:      Status
@@ -307,52 +306,12 @@ acpi_set_current_resources(acpi_handle device_handle,
 
 ACPI_EXPORT_SYMBOL(acpi_set_current_resources)
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_event_resources
- *
- * PARAMETERS:  device_handle   - Handle to the device object for the
- *                                device we are getting resources
- *              in_buffer       - Pointer to a buffer containing the
- *                                resources to be set for the device
- *
- * RETURN:      Status
- *
- * DESCRIPTION: This function is called to get the event resources for a
- *              specific device. The caller must first acquire a handle for
- *              the desired device. The resource data is passed to the routine
- *              the buffer pointed to by the in_buffer variable. Uses the
- *              _AEI method.
- *
- ******************************************************************************/
-acpi_status
-acpi_get_event_resources(acpi_handle device_handle,
-                         struct acpi_buffer *ret_buffer)
-{
-        acpi_status status;
-        struct acpi_namespace_node *node;
-
-        ACPI_FUNCTION_TRACE(acpi_get_event_resources);
-
-        /* Validate parameters then dispatch to internal routine */
-
-        status = acpi_rs_validate_parameters(device_handle, ret_buffer, &node);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_rs_get_aei_method_data(node, ret_buffer);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_get_event_resources)
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_resource_to_address64
  *
- * PARAMETERS:  resource        - Pointer to a resource
- *              out             - Pointer to the users's return buffer
+ * PARAMETERS:  Resource        - Pointer to a resource
+ *              Out             - Pointer to the users's return buffer
  *                                (a struct acpi_resource_address64)
  *
  * RETURN:      Status
@@ -415,9 +374,9 @@ ACPI_EXPORT_SYMBOL(acpi_resource_to_address64)
  * FUNCTION:    acpi_get_vendor_resource
  *
  * PARAMETERS:  device_handle   - Handle for the parent device object
- *              name            - Method name for the parent resource
+ *              Name            - Method name for the parent resource
  *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)
- *              uuid            - Pointer to the UUID to be matched.
+ *              Uuid            - Pointer to the UUID to be matched.
  *                                includes both subtype and 16-byte UUID
  *              ret_buffer      - Where the vendor resource is returned
  *
@@ -526,11 +485,10 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
  *
  * PARAMETERS:  device_handle   - Handle to the device object for the
  *                                device we are querying
- *              name            - Method name of the resources we want.
- *                                (METHOD_NAME__CRS, METHOD_NAME__PRS, or
- *                                METHOD_NAME__AEI)
+ *              Name            - Method name of the resources we want
+ *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)
  *              user_function   - Called for each resource
- *              context         - Passed to user_function
+ *              Context         - Passed to user_function
  *
  * RETURN:      Status
  *
@@ -555,12 +513,11 @@ acpi_walk_resources(acpi_handle device_handle,
 
         if (!device_handle || !user_function || !name ||
             (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
-             !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &&
-             !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) {
+             !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Get the _CRS/_PRS/_AEI resource list */
+        /* Get the _CRS or _PRS resource list */
 
         buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
         status = acpi_rs_get_method_data(device_handle, name, &buffer);
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 390651860bf..6f5588e62c0 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,10 +49,9 @@
 ACPI_MODULE_NAME("tbfadt")
 
 /* Local prototypes */
-static void
+static ACPI_INLINE void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 space_id,
-                             u8 byte_width, u64 address, char *register_name);
+                             u8 space_id, u8 byte_width, u64 address);
 
 static void acpi_tb_convert_fadt(void);
 
@@ -64,15 +63,14 @@ static void acpi_tb_setup_fadt_registers(void);
 
 typedef struct acpi_fadt_info {
         char *name;
-        u16 address64;
-        u16 address32;
-        u16 length;
+        u8 address64;
+        u8 address32;
+        u8 length;
         u8 default_length;
         u8 type;
 
 } acpi_fadt_info;
 
-#define ACPI_FADT_OPTIONAL          0
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
 
@@ -89,7 +87,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
          ACPI_FADT_OFFSET(pm1b_event_block),
          ACPI_FADT_OFFSET(pm1_event_length),
          ACPI_PM1_REGISTER_WIDTH * 2,   /* Enable + Status register */
-         ACPI_FADT_OPTIONAL},
+         0},
 
         {"Pm1aControlBlock",
          ACPI_FADT_OFFSET(xpm1a_control_block),
@@ -103,7 +101,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
          ACPI_FADT_OFFSET(pm1b_control_block),
          ACPI_FADT_OFFSET(pm1_control_length),
          ACPI_PM1_REGISTER_WIDTH,
-         ACPI_FADT_OPTIONAL},
+         0},
 
         {"Pm2ControlBlock",
          ACPI_FADT_OFFSET(xpm2_control_block),
@@ -141,7 +139,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
 
 typedef struct acpi_fadt_pm_info {
         struct acpi_generic_address *target;
-        u16 source;
+        u8 source;
         u8 register_num;
 
 } acpi_fadt_pm_info;
@@ -173,7 +171,7 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
  *
  * PARAMETERS:  generic_address     - GAS struct to be initialized
  *              byte_width          - Width of this register
- *              address             - Address of the register
+ *              Address             - Address of the register
  *
  * RETURN:      None
  *
@@ -183,25 +181,10 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
  *
  ******************************************************************************/
 
-static void
+static ACPI_INLINE void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 space_id,
-                             u8 byte_width, u64 address, char *register_name)
+                             u8 space_id, u8 byte_width, u64 address)
 {
-        u8 bit_width;
-
-        /* Bit width field in the GAS is only one byte long, 255 max */
-
-        bit_width = (u8)(byte_width * 8);
-
-        if (byte_width > 31) {  /* (31*8)=248 */
-                ACPI_ERROR((AE_INFO,
-                            "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-                            "to convert to GAS struct - 255 bits max, truncating",
-                            register_name, byte_width, (byte_width * 8)));
-
-                bit_width = 255;
-        }
 
         /*
          * The 64-bit Address field is non-aligned in the byte packed
@@ -212,7 +195,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
         /* All other fields are byte-wide */
 
         generic_address->space_id = space_id;
-        generic_address->bit_width = bit_width;
+        generic_address->bit_width = (u8)ACPI_MUL_8(byte_width);
         generic_address->bit_offset = 0;
         generic_address->access_width = 0;      /* Access width ANY */
 }
@@ -270,21 +253,16 @@ void acpi_tb_parse_fadt(u32 table_index)
         acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
                               ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
 
-        /* If Hardware Reduced flag is set, there is no FACS */
-
-        if (!acpi_gbl_reduced_hardware) {
-                acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.
-                                      Xfacs, ACPI_SIG_FACS,
-                                      ACPI_TABLE_INDEX_FACS);
-        }
+        acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,
+                              ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_tb_create_local_fadt
  *
- * PARAMETERS:  table               - Pointer to BIOS FADT
- *              length              - Length of the table
+ * PARAMETERS:  Table               - Pointer to BIOS FADT
+ *              Length              - Length of the table
  *
  * RETURN:      None
  *
@@ -299,15 +277,15 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 {
         /*
          * Check if the FADT is larger than the largest table that we expect
-         * (the ACPI 5.0 version). If so, truncate the table, and issue
+         * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
          * a warning.
          */
         if (length > sizeof(struct acpi_table_fadt)) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "FADT (revision %u) is longer than ACPI 5.0 version, "
-                                   "truncating length %u to %u",
-                                   table->revision, length,
-                                   (u32)sizeof(struct acpi_table_fadt)));
+                ACPI_WARNING((AE_INFO,
+                              "FADT (revision %u) is longer than ACPI 2.0 version, "
+                              "truncating length %u to %u",
+                              table->revision, length,
+                              (u32)sizeof(struct acpi_table_fadt)));
         }
 
         /* Clear the entire local FADT */
@@ -319,13 +297,6 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
         ACPI_MEMCPY(&acpi_gbl_FADT, table,
                     ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
 
-        /* Take a copy of the Hardware Reduced flag */
-
-        acpi_gbl_reduced_hardware = FALSE;
-        if (acpi_gbl_FADT.flags & ACPI_FADT_HW_REDUCED) {
-                acpi_gbl_reduced_hardware = TRUE;
-        }
-
         /* Convert the local copy of the FADT to the common internal format */
 
         acpi_tb_convert_fadt();
@@ -379,6 +350,10 @@ static void acpi_tb_convert_fadt(void)
         u32 address32;
         u32 i;
 
+        /* Update the local FADT table header length */
+
+        acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
+
         /*
          * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
          * Later code will always use the X 64-bit field. Also, check for an
@@ -420,10 +395,6 @@ static void acpi_tb_convert_fadt(void)
                 acpi_gbl_FADT.boot_flags = 0;
         }
 
-        /* Update the local FADT table header length */
-
-        acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
-
         /*
          * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
          * generic address structures as necessary. Later code will always use
@@ -452,13 +423,11 @@ static void acpi_tb_convert_fadt(void)
                  * they must match.
                  */
                 if (address64->address && address32 &&
-                    (address64->address != (u64)address32)) {
-                        ACPI_BIOS_ERROR((AE_INFO,
-                                         "32/64X address mismatch in FADT/%s: "
-                                         "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                         fadt_info_table[i].name, address32,
-                                         ACPI_FORMAT_UINT64(address64->
-                                                            address)));
+                    (address64->address != (u64) address32)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "32/64X address mismatch in %s: 0x%8.8X/0x%8.8X%8.8X, using 32",
+                                    fadt_info_table[i].name, address32,
+                                    ACPI_FORMAT_UINT64(address64->address)));
                 }
 
                 /* Always use 32-bit address if it is valid (non-null) */
@@ -474,8 +443,7 @@ static void acpi_tb_convert_fadt(void)
                                                                    &acpi_gbl_FADT,
                                                                    fadt_info_table
                                                                    [i].length),
-                                                     (u64) address32,
-                                                     fadt_info_table[i].name);
+                                                     (u64) address32);
                 }
         }
 }
@@ -484,7 +452,7 @@ static void acpi_tb_convert_fadt(void)
  *
  * FUNCTION:    acpi_tb_validate_fadt
  *
- * PARAMETERS:  table           - Pointer to the FADT to be validated
+ * PARAMETERS:  Table           - Pointer to the FADT to be validated
  *
  * RETURN:      None
  *
@@ -513,31 +481,25 @@ static void acpi_tb_validate_fadt(void)
          * DSDT/X_DSDT) would indicate the presence of two FACS or two DSDT tables.
          */
         if (acpi_gbl_FADT.facs &&
-            (acpi_gbl_FADT.Xfacs != (u64)acpi_gbl_FADT.facs)) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "32/64X FACS address mismatch in FADT - "
-                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                   acpi_gbl_FADT.facs,
-                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
-
-                acpi_gbl_FADT.Xfacs = (u64)acpi_gbl_FADT.facs;
-        }
+            (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
+                ACPI_WARNING((AE_INFO,
+                              "32/64X FACS address mismatch in FADT - "
+                              "0x%8.8X/0x%8.8X%8.8X, using 32",
+                              acpi_gbl_FADT.facs,
+                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
 
-        if (acpi_gbl_FADT.dsdt &&
-            (acpi_gbl_FADT.Xdsdt != (u64)acpi_gbl_FADT.dsdt)) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "32/64X DSDT address mismatch in FADT - "
-                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                   acpi_gbl_FADT.dsdt,
-                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
-
-                acpi_gbl_FADT.Xdsdt = (u64)acpi_gbl_FADT.dsdt;
+                acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
         }
 
-        /* If Hardware Reduced flag is set, we are all done */
+        if (acpi_gbl_FADT.dsdt &&
+            (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
+                ACPI_WARNING((AE_INFO,
+                              "32/64X DSDT address mismatch in FADT - "
+                              "0x%8.8X/0x%8.8X%8.8X, using 32",
+                              acpi_gbl_FADT.dsdt,
+                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
 
-        if (acpi_gbl_reduced_hardware) {
-                return;
+                acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
         }
 
         /* Examine all of the 64-bit extended address fields (X fields) */
@@ -561,10 +523,10 @@ static void acpi_tb_validate_fadt(void)
                  */
                 if (address64->address &&
                     (address64->bit_width != ACPI_MUL_8(length))) {
-                        ACPI_BIOS_WARNING((AE_INFO,
-                                           "32/64X length mismatch in FADT/%s: %u/%u",
-                                           name, ACPI_MUL_8(length),
-                                           address64->bit_width));
+                        ACPI_WARNING((AE_INFO,
+                                      "32/64X length mismatch in %s: %u/%u",
+                                      name, ACPI_MUL_8(length),
+                                      address64->bit_width));
                 }
 
                 if (fadt_info_table[i].type & ACPI_FADT_REQUIRED) {
@@ -573,29 +535,29 @@ static void acpi_tb_validate_fadt(void)
                          * Both the address and length must be non-zero.
                          */
                         if (!address64->address || !length) {
-                                ACPI_BIOS_ERROR((AE_INFO,
-                                                 "Required FADT field %s has zero address and/or length: "
-                                                 "0x%8.8X%8.8X/0x%X",
-                                                 name,
-                                                 ACPI_FORMAT_UINT64(address64->
-                                                                    address),
-                                                 length));
+                                ACPI_ERROR((AE_INFO,
+                                            "Required field %s has zero address and/or length:"
+                                            " 0x%8.8X%8.8X/0x%X",
+                                            name,
+                                            ACPI_FORMAT_UINT64(address64->
+                                                               address),
+                                            length));
                         }
                 } else if (fadt_info_table[i].type & ACPI_FADT_SEPARATE_LENGTH) {
                         /*
-                         * Field is optional (Pm2_control, GPE0, GPE1) AND has its own
+                         * Field is optional (PM2Control, GPE0, GPE1) AND has its own
                          * length field. If present, both the address and length must
                          * be valid.
                          */
                         if ((address64->address && !length) ||
                             (!address64->address && length)) {
-                                ACPI_BIOS_WARNING((AE_INFO,
-                                                   "Optional FADT field %s has zero address or length: "
-                                                   "0x%8.8X%8.8X/0x%X",
-                                                   name,
-                                                   ACPI_FORMAT_UINT64
-                                                   (address64->address),
-                                                   length));
+                                ACPI_WARNING((AE_INFO,
+                                              "Optional field %s has zero address or length: "
+                                              "0x%8.8X%8.8X/0x%X",
+                                              name,
+                                              ACPI_FORMAT_UINT64(address64->
+                                                                 address),
+                                              length));
                         }
                 }
         }
@@ -640,12 +602,12 @@ static void acpi_tb_setup_fadt_registers(void)
                             (fadt_info_table[i].default_length > 0) &&
                             (fadt_info_table[i].default_length !=
                              target64->bit_width)) {
-                                ACPI_BIOS_WARNING((AE_INFO,
-                                                   "Invalid length for FADT/%s: %u, using default %u",
-                                                   fadt_info_table[i].name,
-                                                   target64->bit_width,
-                                                   fadt_info_table[i].
-                                                   default_length));
+                                ACPI_WARNING((AE_INFO,
+                                              "Invalid length for %s: %u, using default %u",
+                                              fadt_info_table[i].name,
+                                              target64->bit_width,
+                                              fadt_info_table[i].
+                                              default_length));
 
                                 /* Incorrect size, set width to the default */
 
@@ -689,8 +651,7 @@ static void acpi_tb_setup_fadt_registers(void)
                                                      source64->address +
                                                      (fadt_pm_info_table[i].
                                                       register_num *
-                                                      pm1_register_byte_width),
-                                                     "PmRegisters");
+                                                      pm1_register_byte_width));
                 }
         }
 }
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 77d1db29a72..a55cb2bb5ab 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("tbfind")
  *
  * FUNCTION:    acpi_tb_find_table
  *
- * PARAMETERS:  signature           - String with ACPI table signature
+ * PARAMETERS:  Signature           - String with ACPI table signature
  *              oem_id              - String with the table OEM ID
  *              oem_table_id        - String with the OEM Table ID
  *              table_index         - Where the table index is returned
@@ -77,7 +77,7 @@ acpi_tb_find_table(char *signature,
         /* Normalize the input strings */
 
         ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header));
-        ACPI_MOVE_NAME(header.signature, signature);
+        ACPI_STRNCPY(header.signature, signature, ACPI_NAME_SIZE);
         ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
         ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index f540ae46292..62365f6075d 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -114,6 +114,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
 {
         u32 i;
         acpi_status status = AE_OK;
+        struct acpi_table_header *override_table = NULL;
 
         ACPI_FUNCTION_TRACE(tb_add_table);
 
@@ -138,14 +139,13 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
         if ((table_desc->pointer->signature[0] != 0x00) &&
             (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
             && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "Table has invalid signature [%4.4s] (0x%8.8X), "
-                                 "must be SSDT or OEMx",
-                                 acpi_ut_valid_acpi_name(*(u32 *)table_desc->
-                                                         pointer->
-                                                         signature) ?
-                                 table_desc->pointer->signature : "????",
-                                 *(u32 *)table_desc->pointer->signature));
+                ACPI_ERROR((AE_INFO,
+                            "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
+                            acpi_ut_valid_acpi_name(*(u32 *)table_desc->
+                                                    pointer->
+                                                    signature) ? table_desc->
+                            pointer->signature : "????",
+                            *(u32 *)table_desc->pointer->signature));
 
                 return_ACPI_STATUS(AE_BAD_SIGNATURE);
         }
@@ -224,10 +224,25 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
         /*
          * ACPI Table Override:
          * Allow the host to override dynamically loaded tables.
-         * NOTE: the table is fully mapped at this point, and the mapping will
-         * be deleted by tb_table_override if the table is actually overridden.
          */
-        (void)acpi_tb_table_override(table_desc->pointer, table_desc);
+        status = acpi_os_table_override(table_desc->pointer, &override_table);
+        if (ACPI_SUCCESS(status) && override_table) {
+                ACPI_INFO((AE_INFO,
+                           "%4.4s @ 0x%p Table override, replaced with:",
+                           table_desc->pointer->signature,
+                           ACPI_CAST_PTR(void, table_desc->address)));
+
+                /* We can delete the table that was passed as a parameter */
+
+                acpi_tb_delete_table(table_desc);
+
+                /* Setup descriptor for the new table */
+
+                table_desc->address = ACPI_PTR_TO_PHYSADDR(override_table);
+                table_desc->pointer = override_table;
+                table_desc->length = override_table->length;
+                table_desc->flags = ACPI_TABLE_ORIGIN_OVERRIDE;
+        }
 
         /* Add the table to the global root table list */
 
@@ -248,95 +263,6 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_table_override
- *
- * PARAMETERS:  table_header        - Header for the original table
- *              table_desc          - Table descriptor initialized for the
- *                                    original table. May or may not be mapped.
- *
- * RETURN:      Pointer to the entire new table. NULL if table not overridden.
- *              If overridden, installs the new table within the input table
- *              descriptor.
- *
- * DESCRIPTION: Attempt table override by calling the OSL override functions.
- *              Note: If the table is overridden, then the entire new table
- *              is mapped and returned by this function.
- *
- ******************************************************************************/
-
-struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
-                                                 *table_header,
-                                                 struct acpi_table_desc
-                                                 *table_desc)
-{
-        acpi_status status;
-        struct acpi_table_header *new_table = NULL;
-        acpi_physical_address new_address = 0;
-        u32 new_table_length = 0;
-        u8 new_flags;
-        char *override_type;
-
-        /* (1) Attempt logical override (returns a logical address) */
-
-        status = acpi_os_table_override(table_header, &new_table);
-        if (ACPI_SUCCESS(status) && new_table) {
-                new_address = ACPI_PTR_TO_PHYSADDR(new_table);
-                new_table_length = new_table->length;
-                new_flags = ACPI_TABLE_ORIGIN_OVERRIDE;
-                override_type = "Logical";
-                goto finish_override;
-        }
-
-        /* (2) Attempt physical override (returns a physical address) */
-
-        status = acpi_os_physical_table_override(table_header,
-                                                 &new_address,
-                                                 &new_table_length);
-        if (ACPI_SUCCESS(status) && new_address && new_table_length) {
-
-                /* Map the entire new table */
-
-                new_table = acpi_os_map_memory(new_address, new_table_length);
-                if (!new_table) {
-                        ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
-                                        "%4.4s %p Attempted physical table override failed",
-                                        table_header->signature,
-                                        ACPI_CAST_PTR(void,
-                                                      table_desc->address)));
-                        return (NULL);
-                }
-
-                override_type = "Physical";
-                new_flags = ACPI_TABLE_ORIGIN_MAPPED;
-                goto finish_override;
-        }
-
-        return (NULL);          /* There was no override */
-
-      finish_override:
-
-        ACPI_INFO((AE_INFO,
-                   "%4.4s %p %s table override, new table: %p",
-                   table_header->signature,
-                   ACPI_CAST_PTR(void, table_desc->address),
-                   override_type, new_table));
-
-        /* We can now unmap/delete the original table (if fully mapped) */
-
-        acpi_tb_delete_table(table_desc);
-
-        /* Setup descriptor for the new table */
-
-        table_desc->address = new_address;
-        table_desc->pointer = new_table;
-        table_desc->length = new_table_length;
-        table_desc->flags = new_flags;
-
-        return (new_table);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_tb_resize_root_table_list
  *
  * PARAMETERS:  None
@@ -350,7 +276,6 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
 acpi_status acpi_tb_resize_root_table_list(void)
 {
         struct acpi_table_desc *tables;
-        u32 table_count;
 
         ACPI_FUNCTION_TRACE(tb_resize_root_table_list);
 
@@ -364,13 +289,8 @@ acpi_status acpi_tb_resize_root_table_list(void)
 
         /* Increase the Table Array size */
 
-        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
-                table_count = acpi_gbl_root_table_list.max_table_count;
-        } else {
-                table_count = acpi_gbl_root_table_list.current_table_count;
-        }
-
-        tables = ACPI_ALLOCATE_ZEROED(((acpi_size) table_count +
+        tables = ACPI_ALLOCATE_ZEROED(((acpi_size) acpi_gbl_root_table_list.
+                                       max_table_count +
                                        ACPI_ROOT_TABLE_SIZE_INCREMENT) *
                                       sizeof(struct acpi_table_desc));
         if (!tables) {
@@ -383,8 +303,8 @@ acpi_status acpi_tb_resize_root_table_list(void)
 
         if (acpi_gbl_root_table_list.tables) {
                 ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
-                            (acpi_size) table_count *
-                            sizeof(struct acpi_table_desc));
+                            (acpi_size) acpi_gbl_root_table_list.
+                            max_table_count * sizeof(struct acpi_table_desc));
 
                 if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
                         ACPI_FREE(acpi_gbl_root_table_list.tables);
@@ -392,9 +312,9 @@ acpi_status acpi_tb_resize_root_table_list(void)
         }
 
         acpi_gbl_root_table_list.tables = tables;
-        acpi_gbl_root_table_list.max_table_count =
-            table_count + ACPI_ROOT_TABLE_SIZE_INCREMENT;
-        acpi_gbl_root_table_list.flags |= ACPI_ROOT_ORIGIN_ALLOCATED;
+        acpi_gbl_root_table_list.max_table_count +=
+            ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.flags |= (u8)ACPI_ROOT_ORIGIN_ALLOCATED;
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -403,10 +323,10 @@ acpi_status acpi_tb_resize_root_table_list(void)
  *
  * FUNCTION:    acpi_tb_store_table
  *
- * PARAMETERS:  address             - Table address
- *              table               - Table header
- *              length              - Table length
- *              flags               - flags
+ * PARAMETERS:  Address             - Table address
+ *              Table               - Table header
+ *              Length              - Table length
+ *              Flags               - flags
  *
  * RETURN:      Status and table index.
  *
@@ -476,11 +396,7 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
         case ACPI_TABLE_ORIGIN_ALLOCATED:
                 ACPI_FREE(table_desc->pointer);
                 break;
-
-                /* Not mapped or allocated, there is nothing we can do */
-
-        default:
-                return;
+        default:;
         }
 
         table_desc->pointer = NULL;
@@ -526,8 +442,6 @@ void acpi_tb_terminate(void)
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-
-        return_VOID;
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 285e24b9738..0f2d395feab 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -118,7 +118,6 @@ acpi_tb_check_xsdt(acpi_physical_address address)
                 return AE_OK;
 }
 
-#if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_tb_initialize_facs
@@ -136,20 +135,12 @@ acpi_status acpi_tb_initialize_facs(void)
 {
         acpi_status status;
 
-        /* If Hardware Reduced flag is set, there is no FACS */
-
-        if (acpi_gbl_reduced_hardware) {
-                acpi_gbl_FACS = NULL;
-                return (AE_OK);
-        }
-
         status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
                                          ACPI_CAST_INDIRECT_PTR(struct
                                                                 acpi_table_header,
                                                                 &acpi_gbl_FACS));
         return status;
 }
-#endif                          /* !ACPI_REDUCED_HARDWARE */
 
 /*******************************************************************************
  *
@@ -178,8 +169,8 @@ u8 acpi_tb_tables_loaded(void)
  *
  * FUNCTION:    acpi_tb_fix_string
  *
- * PARAMETERS:  string              - String to be repaired
- *              length              - Maximum length
+ * PARAMETERS:  String              - String to be repaired
+ *              Length              - Maximum length
  *
  * RETURN:      None
  *
@@ -205,7 +196,7 @@ static void acpi_tb_fix_string(char *string, acpi_size length)
  * FUNCTION:    acpi_tb_cleanup_table_header
  *
  * PARAMETERS:  out_header          - Where the cleaned header is returned
- *              header              - Input ACPI table header
+ *              Header              - Input ACPI table header
  *
  * RETURN:      Returns the cleaned header in out_header
  *
@@ -231,8 +222,8 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
  *
  * FUNCTION:    acpi_tb_print_table_header
  *
- * PARAMETERS:  address             - Table physical address
- *              header              - Table header
+ * PARAMETERS:  Address             - Table physical address
+ *              Header              - Table header
  *
  * RETURN:      None
  *
@@ -296,8 +287,8 @@ acpi_tb_print_table_header(acpi_physical_address address,
  *
  * FUNCTION:    acpi_tb_validate_checksum
  *
- * PARAMETERS:  table               - ACPI table to verify
- *              length              - Length of entire table
+ * PARAMETERS:  Table               - ACPI table to verify
+ *              Length              - Length of entire table
  *
  * RETURN:      Status
  *
@@ -317,11 +308,10 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
         /* Checksum ok? (should be zero) */
 
         if (checksum) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "Incorrect checksum in table [%4.4s] - 0x%2.2X, "
-                                   "should be 0x%2.2X",
-                                   table->signature, table->checksum,
-                                   (u8)(table->checksum - checksum)));
+                ACPI_WARNING((AE_INFO,
+                              "Incorrect checksum in table [%4.4s] - 0x%2.2X, should be 0x%2.2X",
+                              table->signature, table->checksum,
+                              (u8) (table->checksum - checksum)));
 
 #if (ACPI_CHECKSUM_ABORT)
 
@@ -336,8 +326,8 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
  *
  * FUNCTION:    acpi_tb_checksum
  *
- * PARAMETERS:  buffer          - Pointer to memory region to be checked
- *              length          - Length of this memory region
+ * PARAMETERS:  Buffer          - Pointer to memory region to be checked
+ *              Length          - Length of this memory region
  *
  * RETURN:      Checksum (u8)
  *
@@ -354,7 +344,7 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length)
                 sum = (u8) (sum + *(buffer++));
         }
 
-        return (sum);
+        return sum;
 }
 
 /*******************************************************************************
@@ -378,9 +368,8 @@ void acpi_tb_check_dsdt_header(void)
 
         if (acpi_gbl_original_dsdt_header.length != acpi_gbl_DSDT->length ||
             acpi_gbl_original_dsdt_header.checksum != acpi_gbl_DSDT->checksum) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "The DSDT has been corrupted or replaced - "
-                                 "old, new headers below"));
+                ACPI_ERROR((AE_INFO,
+                            "The DSDT has been corrupted or replaced - old, new headers below"));
                 acpi_tb_print_table_header(0, &acpi_gbl_original_dsdt_header);
                 acpi_tb_print_table_header(0, acpi_gbl_DSDT);
 
@@ -440,15 +429,15 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
  *
  * FUNCTION:    acpi_tb_install_table
  *
- * PARAMETERS:  address                 - Physical address of DSDT or FACS
- *              signature               - Table signature, NULL if no need to
+ * PARAMETERS:  Address                 - Physical address of DSDT or FACS
+ *              Signature               - Table signature, NULL if no need to
  *                                        match
  *              table_index             - Index into root table array
  *
  * RETURN:      None
  *
  * DESCRIPTION: Install an ACPI table into the global data structure. The
- *              table override mechanism is called to allow the host
+ *              table override mechanism is implemented here to allow the host
  *              OS to replace any table before it is installed in the root
  *              table array.
  *
@@ -458,9 +447,11 @@ void
 acpi_tb_install_table(acpi_physical_address address,
                       char *signature, u32 table_index)
 {
-        struct acpi_table_header *table;
-        struct acpi_table_header *final_table;
-        struct acpi_table_desc *table_desc;
+        u8 flags;
+        acpi_status status;
+        struct acpi_table_header *table_to_install;
+        struct acpi_table_header *mapped_table;
+        struct acpi_table_header *override_table = NULL;
 
         if (!address) {
                 ACPI_ERROR((AE_INFO,
@@ -471,79 +462,69 @@ acpi_tb_install_table(acpi_physical_address address,
 
         /* Map just the table header */
 
-        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
-        if (!table) {
-                ACPI_ERROR((AE_INFO,
-                            "Could not map memory for table [%s] at %p",
-                            signature, ACPI_CAST_PTR(void, address)));
+        mapped_table =
+            acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!mapped_table) {
                 return;
         }
 
         /* If a particular signature is expected (DSDT/FACS), it must match */
 
-        if (signature && !ACPI_COMPARE_NAME(table->signature, signature)) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "Invalid signature 0x%X for ACPI table, expected [%s]",
-                                 *ACPI_CAST_PTR(u32, table->signature),
-                                 signature));
+        if (signature && !ACPI_COMPARE_NAME(mapped_table->signature, signature)) {
+                ACPI_ERROR((AE_INFO,
+                            "Invalid signature 0x%X for ACPI table, expected [%s]",
+                            *ACPI_CAST_PTR(u32, mapped_table->signature),
+                            signature));
                 goto unmap_and_exit;
         }
 
         /*
-         * Initialize the table entry. Set the pointer to NULL, since the
-         * table is not fully mapped at this time.
-         */
-        table_desc = &acpi_gbl_root_table_list.tables[table_index];
-
-        table_desc->address = address;
-        table_desc->pointer = NULL;
-        table_desc->length = table->length;
-        table_desc->flags = ACPI_TABLE_ORIGIN_MAPPED;
-        ACPI_MOVE_32_TO_32(table_desc->signature.ascii, table->signature);
-
-        /*
          * ACPI Table Override:
          *
          * Before we install the table, let the host OS override it with a new
          * one if desired. Any table within the RSDT/XSDT can be replaced,
          * including the DSDT which is pointed to by the FADT.
-         *
-         * NOTE: If the table is overridden, then final_table will contain a
-         * mapped pointer to the full new table. If the table is not overridden,
-         * or if there has been a physical override, then the table will be
-         * fully mapped later (in verify table). In any case, we must
-         * unmap the header that was mapped above.
          */
-        final_table = acpi_tb_table_override(table, table_desc);
-        if (!final_table) {
-                final_table = table;    /* There was no override */
+        status = acpi_os_table_override(mapped_table, &override_table);
+        if (ACPI_SUCCESS(status) && override_table) {
+                ACPI_INFO((AE_INFO,
+                           "%4.4s @ 0x%p Table override, replaced with:",
+                           mapped_table->signature, ACPI_CAST_PTR(void,
+                                                                  address)));
+
+                acpi_gbl_root_table_list.tables[table_index].pointer =
+                    override_table;
+                address = ACPI_PTR_TO_PHYSADDR(override_table);
+
+                table_to_install = override_table;
+                flags = ACPI_TABLE_ORIGIN_OVERRIDE;
+        } else {
+                table_to_install = mapped_table;
+                flags = ACPI_TABLE_ORIGIN_MAPPED;
         }
 
-        acpi_tb_print_table_header(table_desc->address, final_table);
+        /* Initialize the table entry */
+
+        acpi_gbl_root_table_list.tables[table_index].address = address;
+        acpi_gbl_root_table_list.tables[table_index].length =
+            table_to_install->length;
+        acpi_gbl_root_table_list.tables[table_index].flags = flags;
+
+        ACPI_MOVE_32_TO_32(&
+                           (acpi_gbl_root_table_list.tables[table_index].
+                            signature), table_to_install->signature);
 
-        /* Set the global integer width (based upon revision of the DSDT) */
+        acpi_tb_print_table_header(address, table_to_install);
 
         if (table_index == ACPI_TABLE_INDEX_DSDT) {
-                acpi_ut_set_integer_width(final_table->revision);
-        }
 
-        /*
-         * If we have a physical override during this early loading of the ACPI
-         * tables, unmap the table for now. It will be mapped again later when
-         * it is actually used. This supports very early loading of ACPI tables,
-         * before virtual memory is fully initialized and running within the
-         * host OS. Note: A logical override has the ACPI_TABLE_ORIGIN_OVERRIDE
-         * flag set and will not be deleted below.
-         */
-        if (final_table != table) {
-                acpi_tb_delete_table(table_desc);
+                /* Global integer width is based upon revision of the DSDT */
+
+                acpi_ut_set_integer_width(table_to_install->revision);
         }
 
       unmap_and_exit:
-
-        /* Always unmap the table header that we mapped above */
-
-        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
+        acpi_os_unmap_memory(mapped_table, sizeof(struct acpi_table_header));
 }
 
 /*******************************************************************************
@@ -592,10 +573,10 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
 
                         /* Will truncate 64-bit address to 32 bits, issue warning */
 
-                        ACPI_BIOS_WARNING((AE_INFO,
-                                           "64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
-                                           " truncating",
-                                           ACPI_FORMAT_UINT64(address64)));
+                        ACPI_WARNING((AE_INFO,
+                                      "64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
+                                      " truncating",
+                                      ACPI_FORMAT_UINT64(address64)));
                 }
 #endif
                 return ((acpi_physical_address) (address64));
@@ -606,7 +587,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
  *
  * FUNCTION:    acpi_tb_parse_root_table
  *
- * PARAMETERS:  rsdp                    - Pointer to the RSDP
+ * PARAMETERS:  Rsdp                    - Pointer to the RSDP
  *
  * RETURN:      Status
  *
@@ -697,9 +678,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
         acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
 
         if (length < sizeof(struct acpi_table_header)) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "Invalid table length 0x%X in RSDT/XSDT",
-                                 length));
+                ACPI_ERROR((AE_INFO, "Invalid length 0x%X in RSDT/XSDT",
+                            length));
                 return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
         }
 
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index f5632780421..4b7085dfc68 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -1,11 +1,12 @@
 /******************************************************************************
  *
- * Module Name: tbxface - ACPI table oriented external interfaces
+ * Module Name: tbxface - Public interfaces to the ACPI subsystem
+ *                         ACPI table oriented interfaces
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -50,6 +50,11 @@
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxface")
 
+/* Local prototypes */
+static acpi_status acpi_tb_load_namespace(void);
+
+static int no_auto_ssdt;
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_allocate_root_table
@@ -59,10 +64,11 @@ ACPI_MODULE_NAME("tbxface")
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Allocate a root table array. Used by iASL compiler and
+ * DESCRIPTION: Allocate a root table array. Used by i_aSL compiler and
  *              acpi_initialize_tables.
  *
  ******************************************************************************/
+
 acpi_status acpi_allocate_root_table(u32 initial_table_count)
 {
 
@@ -159,12 +165,14 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
  * DESCRIPTION: Reallocate Root Table List into dynamic memory. Copies the
  *              root list from the previously provided scratch area. Should
  *              be called once dynamic memory allocation is available in the
- *              kernel.
+ *              kernel
  *
  ******************************************************************************/
 acpi_status acpi_reallocate_root_table(void)
 {
-        acpi_status status;
+        struct acpi_table_desc *tables;
+        acpi_size new_size;
+        acpi_size current_size;
 
         ACPI_FUNCTION_TRACE(acpi_reallocate_root_table);
 
@@ -176,18 +184,89 @@ acpi_status acpi_reallocate_root_table(void)
                 return_ACPI_STATUS(AE_SUPPORT);
         }
 
-        acpi_gbl_root_table_list.flags |= ACPI_ROOT_ALLOW_RESIZE;
+        /*
+         * Get the current size of the root table and add the default
+         * increment to create the new table size.
+         */
+        current_size = (acpi_size)
+            acpi_gbl_root_table_list.current_table_count *
+            sizeof(struct acpi_table_desc);
 
-        status = acpi_tb_resize_root_table_list();
-        return_ACPI_STATUS(status);
+        new_size = current_size +
+            (ACPI_ROOT_TABLE_SIZE_INCREMENT * sizeof(struct acpi_table_desc));
+
+        /* Create new array and copy the old array */
+
+        tables = ACPI_ALLOCATE_ZEROED(new_size);
+        if (!tables) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables, current_size);
+
+        /*
+         * Update the root table descriptor. The new size will be the current
+         * number of tables plus the increment, independent of the reserved
+         * size of the original table list.
+         */
+        acpi_gbl_root_table_list.tables = tables;
+        acpi_gbl_root_table_list.max_table_count =
+            acpi_gbl_root_table_list.current_table_count +
+            ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.flags =
+            ACPI_ROOT_ORIGIN_ALLOCATED | ACPI_ROOT_ALLOW_RESIZE;
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_load_table
+ *
+ * PARAMETERS:  table_ptr       - pointer to a buffer containing the entire
+ *                                table to be loaded
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to load a table from the caller's
+ *              buffer. The buffer must contain an entire ACPI Table including
+ *              a valid header. The header fields will be verified, and if it
+ *              is determined that the table is invalid, the call will fail.
+ *
+ ******************************************************************************/
+acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
+{
+        acpi_status status;
+        u32 table_index;
+        struct acpi_table_desc table_desc;
+
+        if (!table_ptr)
+                return AE_BAD_PARAMETER;
+
+        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
+        table_desc.pointer = table_ptr;
+        table_desc.length = table_ptr->length;
+        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
+
+        /*
+         * Install the new table into the local data structures
+         */
+        status = acpi_tb_add_table(&table_desc, &table_index);
+        if (ACPI_FAILURE(status)) {
+                return status;
+        }
+        status = acpi_ns_load_table(table_index, acpi_gbl_root_node);
+        return status;
 }
 
+ACPI_EXPORT_SYMBOL(acpi_load_table)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_table_header
  *
- * PARAMETERS:  signature           - ACPI signature of needed table
- *              instance            - Which instance (for SSDTs)
+ * PARAMETERS:  Signature           - ACPI signature of needed table
+ *              Instance            - Which instance (for SSDTs)
  *              out_table_header    - The pointer to the table header to fill
  *
  * RETURN:      Status and pointer to mapped table header
@@ -236,7 +315,7 @@ acpi_get_table_header(char *signature,
                                                        sizeof(struct
                                                               acpi_table_header));
                                 if (!header) {
-                                        return (AE_NO_MEMORY);
+                                        return AE_NO_MEMORY;
                                 }
                                 ACPI_MEMCPY(out_table_header, header,
                                             sizeof(struct acpi_table_header));
@@ -244,7 +323,7 @@ acpi_get_table_header(char *signature,
                                                      sizeof(struct
                                                             acpi_table_header));
                         } else {
-                                return (AE_NOT_FOUND);
+                                return AE_NOT_FOUND;
                         }
                 } else {
                         ACPI_MEMCPY(out_table_header,
@@ -302,8 +381,8 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *
  * FUNCTION:    acpi_get_table_with_size
  *
- * PARAMETERS:  signature           - ACPI signature of needed table
- *              instance            - Which instance (for SSDTs)
+ * PARAMETERS:  Signature           - ACPI signature of needed table
+ *              Instance            - Which instance (for SSDTs)
  *              out_table           - Where the pointer to the table is returned
  *
  * RETURN:      Status and pointer to table
@@ -356,7 +435,6 @@ acpi_get_table_with_size(char *signature,
 
         return (AE_NOT_FOUND);
 }
-ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)
 
 acpi_status
 acpi_get_table(char *signature,
@@ -374,7 +452,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
  * FUNCTION:    acpi_get_table_by_index
  *
  * PARAMETERS:  table_index         - Table index
- *              table               - Where the pointer to the table is returned
+ *              Table               - Where the pointer to the table is returned
  *
  * RETURN:      Status and pointer to the table
  *
@@ -423,13 +501,157 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
 
 ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_load_namespace
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the namespace from the DSDT and all SSDTs/PSDTs found in
+ *              the RSDT/XSDT.
+ *
+ ******************************************************************************/
+static acpi_status acpi_tb_load_namespace(void)
+{
+        acpi_status status;
+        u32 i;
+        struct acpi_table_header *new_dsdt;
+
+        ACPI_FUNCTION_TRACE(tb_load_namespace);
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+
+        /*
+         * Load the namespace. The DSDT is required, but any SSDT and
+         * PSDT tables are optional. Verify the DSDT.
+         */
+        if (!acpi_gbl_root_table_list.current_table_count ||
+            !ACPI_COMPARE_NAME(&
+                               (acpi_gbl_root_table_list.
+                                tables[ACPI_TABLE_INDEX_DSDT].signature),
+                               ACPI_SIG_DSDT)
+            ||
+            ACPI_FAILURE(acpi_tb_verify_table
+                         (&acpi_gbl_root_table_list.
+                          tables[ACPI_TABLE_INDEX_DSDT]))) {
+                status = AE_NO_ACPI_TABLES;
+                goto unlock_and_exit;
+        }
+
+        /*
+         * Save the DSDT pointer for simple access. This is the mapped memory
+         * address. We must take care here because the address of the .Tables
+         * array can change dynamically as tables are loaded at run-time. Note:
+         * .Pointer field is not validated until after call to acpi_tb_verify_table.
+         */
+        acpi_gbl_DSDT =
+            acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
+
+        /*
+         * Optionally copy the entire DSDT to local memory (instead of simply
+         * mapping it.) There are some BIOSs that corrupt or replace the original
+         * DSDT, creating the need for this option. Default is FALSE, do not copy
+         * the DSDT.
+         */
+        if (acpi_gbl_copy_dsdt_locally) {
+                new_dsdt = acpi_tb_copy_dsdt(ACPI_TABLE_INDEX_DSDT);
+                if (new_dsdt) {
+                        acpi_gbl_DSDT = new_dsdt;
+                }
+        }
+
+        /*
+         * Save the original DSDT header for detection of table corruption
+         * and/or replacement of the DSDT from outside the OS.
+         */
+        ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
+                    sizeof(struct acpi_table_header));
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+
+        /* Load and parse tables */
+
+        status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
+                if ((!ACPI_COMPARE_NAME
+                     (&(acpi_gbl_root_table_list.tables[i].signature),
+                      ACPI_SIG_SSDT)
+                     &&
+                     !ACPI_COMPARE_NAME(&
+                                        (acpi_gbl_root_table_list.tables[i].
+                                         signature), ACPI_SIG_PSDT))
+                    ||
+                    ACPI_FAILURE(acpi_tb_verify_table
+                                 (&acpi_gbl_root_table_list.tables[i]))) {
+                        continue;
+                }
+
+                if (no_auto_ssdt) {
+                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
+                        continue;
+                }
+
+                /* Ignore errors while loading tables, get as many as possible */
+
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                (void)acpi_ns_load_table(i, acpi_gbl_root_node);
+                (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_load_tables
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
+ *
+ ******************************************************************************/
+
+acpi_status acpi_load_tables(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_load_tables);
+
+        /* Load the namespace from the tables */
+
+        status = acpi_tb_load_namespace();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While loading namespace from ACPI tables"));
+        }
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_load_tables)
+
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_table_handler
  *
- * PARAMETERS:  handler         - Table event handler
- *              context         - Value passed to the handler on each event
+ * PARAMETERS:  Handler         - Table event handler
+ *              Context         - Value passed to the handler on each event
  *
  * RETURN:      Status
  *
@@ -475,7 +697,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler)
  *
  * FUNCTION:    acpi_remove_table_handler
  *
- * PARAMETERS:  handler         - Table event handler that was installed
+ * PARAMETERS:  Handler         - Table event handler that was installed
  *                                previously.
  *
  * RETURN:      Status
@@ -511,3 +733,15 @@ acpi_status acpi_remove_table_handler(acpi_tbl_handler handler)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_remove_table_handler)
+
+
+static int __init acpi_no_auto_ssdt_setup(char *s) {
+
+        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
+
+        no_auto_ssdt = 1;
+
+        return 1;
+}
+
+__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
deleted file mode 100644
index a5e1e4e4709..00000000000
--- a/drivers/acpi/acpica/tbxfload.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbxfload - Table load/unload external interfaces
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <linux/export.h>
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include "acnamesp.h"
-#include "actables.h"
-
-#define _COMPONENT          ACPI_TABLES
-ACPI_MODULE_NAME("tbxfload")
-
-/* Local prototypes */
-static acpi_status acpi_tb_load_namespace(void);
-
-static int no_auto_ssdt;
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_load_tables
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
- *
- ******************************************************************************/
-
-acpi_status acpi_load_tables(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_load_tables);
-
-        /* Load the namespace from the tables */
-
-        status = acpi_tb_load_namespace();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "While loading namespace from ACPI tables"));
-        }
-
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_load_tables)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_load_namespace
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load the namespace from the DSDT and all SSDTs/PSDTs found in
- *              the RSDT/XSDT.
- *
- ******************************************************************************/
-static acpi_status acpi_tb_load_namespace(void)
-{
-        acpi_status status;
-        u32 i;
-        struct acpi_table_header *new_dsdt;
-
-        ACPI_FUNCTION_TRACE(tb_load_namespace);
-
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-
-        /*
-         * Load the namespace. The DSDT is required, but any SSDT and
-         * PSDT tables are optional. Verify the DSDT.
-         */
-        if (!acpi_gbl_root_table_list.current_table_count ||
-            !ACPI_COMPARE_NAME(&
-                               (acpi_gbl_root_table_list.
-                                tables[ACPI_TABLE_INDEX_DSDT].signature),
-                               ACPI_SIG_DSDT)
-            ||
-            ACPI_FAILURE(acpi_tb_verify_table
-                         (&acpi_gbl_root_table_list.
-                          tables[ACPI_TABLE_INDEX_DSDT]))) {
-                status = AE_NO_ACPI_TABLES;
-                goto unlock_and_exit;
-        }
-
-        /*
-         * Save the DSDT pointer for simple access. This is the mapped memory
-         * address. We must take care here because the address of the .Tables
-         * array can change dynamically as tables are loaded at run-time. Note:
-         * .Pointer field is not validated until after call to acpi_tb_verify_table.
-         */
-        acpi_gbl_DSDT =
-            acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
-
-        /*
-         * Optionally copy the entire DSDT to local memory (instead of simply
-         * mapping it.) There are some BIOSs that corrupt or replace the original
-         * DSDT, creating the need for this option. Default is FALSE, do not copy
-         * the DSDT.
-         */
-        if (acpi_gbl_copy_dsdt_locally) {
-                new_dsdt = acpi_tb_copy_dsdt(ACPI_TABLE_INDEX_DSDT);
-                if (new_dsdt) {
-                        acpi_gbl_DSDT = new_dsdt;
-                }
-        }
-
-        /*
-         * Save the original DSDT header for detection of table corruption
-         * and/or replacement of the DSDT from outside the OS.
-         */
-        ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
-                    sizeof(struct acpi_table_header));
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-
-        /* Load and parse tables */
-
-        status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
-
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-                if ((!ACPI_COMPARE_NAME
-                     (&(acpi_gbl_root_table_list.tables[i].signature),
-                      ACPI_SIG_SSDT)
-                     &&
-                     !ACPI_COMPARE_NAME(&
-                                        (acpi_gbl_root_table_list.tables[i].
-                                         signature), ACPI_SIG_PSDT))
-                    ||
-                    ACPI_FAILURE(acpi_tb_verify_table
-                                 (&acpi_gbl_root_table_list.tables[i]))) {
-                        continue;
-                }
-
-                if (no_auto_ssdt) {
-                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
-                        continue;
-                }
-
-                /* Ignore errors while loading tables, get as many as possible */
-
-                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-                (void)acpi_ns_load_table(i, acpi_gbl_root_node);
-                (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        }
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_load_table
- *
- * PARAMETERS:  table               - Pointer to a buffer containing the ACPI
- *                                    table to be loaded.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Dynamically load an ACPI table from the caller's buffer. Must
- *              be a valid ACPI table with a valid ACPI table header.
- *              Note1: Mainly intended to support hotplug addition of SSDTs.
- *              Note2: Does not copy the incoming table. User is responsible
- *              to ensure that the table is not deleted or unmapped.
- *
- ******************************************************************************/
-
-acpi_status acpi_load_table(struct acpi_table_header *table)
-{
-        acpi_status status;
-        struct acpi_table_desc table_desc;
-        u32 table_index;
-
-        ACPI_FUNCTION_TRACE(acpi_load_table);
-
-        /* Parameter validation */
-
-        if (!table) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        /* Init local table descriptor */
-
-        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
-        table_desc.address = ACPI_PTR_TO_PHYSADDR(table);
-        table_desc.pointer = table;
-        table_desc.length = table->length;
-        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
-
-        /* Must acquire the interpreter lock during this operation */
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Install the table and load it into the namespace */
-
-        ACPI_INFO((AE_INFO, "Host-directed Dynamic ACPI Table Load:"));
-        status = acpi_tb_add_table(&table_desc, &table_index);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
-        }
-
-        status = acpi_ns_load_table(table_index, acpi_gbl_root_node);
-
-        /* Invoke table handler if present */
-
-        if (acpi_gbl_table_handler) {
-                (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD, table,
-                                             acpi_gbl_table_handler_context);
-        }
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_load_table)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_unload_parent_table
- *
- * PARAMETERS:  object              - Handle to any namespace object owned by
- *                                    the table to be unloaded
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Via any namespace object within an SSDT or OEMx table, unloads
- *              the table and deletes all namespace objects associated with
- *              that table. Unloading of the DSDT is not allowed.
- *              Note: Mainly intended to support hotplug removal of SSDTs.
- *
- ******************************************************************************/
-acpi_status acpi_unload_parent_table(acpi_handle object)
-{
-        struct acpi_namespace_node *node =
-            ACPI_CAST_PTR(struct acpi_namespace_node, object);
-        acpi_status status = AE_NOT_EXIST;
-        acpi_owner_id owner_id;
-        u32 i;
-
-        ACPI_FUNCTION_TRACE(acpi_unload_parent_table);
-
-        /* Parameter validation */
-
-        if (!object) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        /*
-         * The node owner_id is currently the same as the parent table ID.
-         * However, this could change in the future.
-         */
-        owner_id = node->owner_id;
-        if (!owner_id) {
-
-                /* owner_id==0 means DSDT is the owner. DSDT cannot be unloaded */
-
-                return_ACPI_STATUS(AE_TYPE);
-        }
-
-        /* Must acquire the interpreter lock during this operation */
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Find the table in the global table list */
-
-        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; i++) {
-                if (owner_id != acpi_gbl_root_table_list.tables[i].owner_id) {
-                        continue;
-                }
-
-                /*
-                 * Allow unload of SSDT and OEMx tables only. Do not allow unload
-                 * of the DSDT. No other types of tables should get here, since
-                 * only these types can contain AML and thus are the only types
-                 * that can create namespace objects.
-                 */
-                if (ACPI_COMPARE_NAME
-                    (acpi_gbl_root_table_list.tables[i].signature.ascii,
-                     ACPI_SIG_DSDT)) {
-                        status = AE_TYPE;
-                        break;
-                }
-
-                /* Ensure the table is actually loaded */
-
-                if (!acpi_tb_is_table_loaded(i)) {
-                        status = AE_NOT_EXIST;
-                        break;
-                }
-
-                /* Invoke table handler if present */
-
-                if (acpi_gbl_table_handler) {
-                        (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,
-                                                     acpi_gbl_root_table_list.
-                                                     tables[i].pointer,
-                                                     acpi_gbl_table_handler_context);
-                }
-
-                /*
-                 * Delete all namespace objects owned by this table. Note that
-                 * these objects can appear anywhere in the namespace by virtue
-                 * of the AML "Scope" operator. Thus, we need to track ownership
-                 * by an ID, not simply a position within the hierarchy.
-                 */
-                status = acpi_tb_delete_namespace_by_owner(i);
-                if (ACPI_FAILURE(status)) {
-                        break;
-                }
-
-                status = acpi_tb_release_owner_id(i);
-                acpi_tb_set_table_loaded_flag(i, FALSE);
-                break;
-        }
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_unload_parent_table)
-
-static int __init acpi_no_auto_ssdt_setup(char *s) {
-
-        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
-
-        no_auto_ssdt = 1;
-
-        return 1;
-}
-
-__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 28f330230f9..7eb6c6cc1ed 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
  *
  * FUNCTION:    acpi_tb_validate_rsdp
  *
- * PARAMETERS:  rsdp                - Pointer to unvalidated RSDP
+ * PARAMETERS:  Rsdp                - Pointer to unvalidated RSDP
  *
  * RETURN:      Status
  *
@@ -67,6 +67,7 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
 
 static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 {
+        ACPI_FUNCTION_ENTRY();
 
         /*
          * The signature and checksum must both be correct
@@ -106,10 +107,10 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
  *
  * RETURN:      Status, RSDP physical address
  *
- * DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor
- *              pointer structure. If it is found, set *RSDP to point to it.
+ * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
+ *              pointer structure.  If it is found, set *RSDP to point to it.
  *
- * NOTE1:       The RSDP must be either in the first 1K of the Extended
+ * NOTE1:       The RSDP must be either in the first 1_k of the Extended
  *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
  *              Only a 32-bit physical address is necessary.
  *
@@ -151,7 +152,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
         if (physical_address > 0x400) {
                 /*
                  * 1b) Search EBDA paragraphs (EBDA is required to be a
-                 *     minimum of 1K length)
+                 *     minimum of 1_k length)
                  */
                 table_ptr = acpi_os_map_memory((acpi_physical_address)
                                                physical_address,
@@ -215,7 +216,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
 
         /* A valid RSDP was not found */
 
-        ACPI_BIOS_ERROR((AE_INFO, "A valid RSDP was not found"));
+        ACPI_ERROR((AE_INFO, "A valid RSDP was not found"));
         return_ACPI_STATUS(AE_NOT_FOUND);
 }
 
@@ -224,7 +225,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
  * FUNCTION:    acpi_tb_scan_memory_for_rsdp
  *
  * PARAMETERS:  start_address       - Starting pointer for search
- *              length              - Maximum length to search
+ *              Length              - Maximum length to search
  *
  * RETURN:      Pointer to the RSDP if found, otherwise NULL.
  *
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
deleted file mode 100644
index 64880306133..00000000000
--- a/drivers/acpi/acpica/utaddress.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/******************************************************************************
- *
- * Module Name: utaddress - op_region address range check
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include "acnamesp.h"
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utaddress")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_add_address_range
- *
- * PARAMETERS:  space_id            - Address space ID
- *              address             - op_region start address
- *              length              - op_region length
- *              region_node         - op_region namespace node
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Add the Operation Region address range to the global list.
- *              The only supported Space IDs are Memory and I/O. Called when
- *              the op_region address/length operands are fully evaluated.
- *
- * MUTEX:       Locks the namespace
- *
- * NOTE: Because this interface is only called when an op_region argument
- * list is evaluated, there cannot be any duplicate region_nodes.
- * Duplicate Address/Length values are allowed, however, so that multiple
- * address conflicts can be detected.
- *
- ******************************************************************************/
-acpi_status
-acpi_ut_add_address_range(acpi_adr_space_type space_id,
-                          acpi_physical_address address,
-                          u32 length, struct acpi_namespace_node *region_node)
-{
-        struct acpi_address_range *range_info;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(ut_add_address_range);
-
-        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
-            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Allocate/init a new info block, add it to the appropriate list */
-
-        range_info = ACPI_ALLOCATE(sizeof(struct acpi_address_range));
-        if (!range_info) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        range_info->start_address = address;
-        range_info->end_address = (address + length - 1);
-        range_info->region_node = region_node;
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                ACPI_FREE(range_info);
-                return_ACPI_STATUS(status);
-        }
-
-        range_info->next = acpi_gbl_address_range_list[space_id];
-        acpi_gbl_address_range_list[space_id] = range_info;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                          "\nAdded [%4.4s] address range: 0x%p-0x%p\n",
-                          acpi_ut_get_node_name(range_info->region_node),
-                          ACPI_CAST_PTR(void, address),
-                          ACPI_CAST_PTR(void, range_info->end_address)));
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_remove_address_range
- *
- * PARAMETERS:  space_id            - Address space ID
- *              region_node         - op_region namespace node
- *
- * RETURN:      None
- *
- * DESCRIPTION: Remove the Operation Region from the global list. The only
- *              supported Space IDs are Memory and I/O. Called when an
- *              op_region is deleted.
- *
- * MUTEX:       Assumes the namespace is locked
- *
- ******************************************************************************/
-
-void
-acpi_ut_remove_address_range(acpi_adr_space_type space_id,
-                             struct acpi_namespace_node *region_node)
-{
-        struct acpi_address_range *range_info;
-        struct acpi_address_range *prev;
-
-        ACPI_FUNCTION_TRACE(ut_remove_address_range);
-
-        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
-            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                return_VOID;
-        }
-
-        /* Get the appropriate list head and check the list */
-
-        range_info = prev = acpi_gbl_address_range_list[space_id];
-        while (range_info) {
-                if (range_info->region_node == region_node) {
-                        if (range_info == prev) {       /* Found at list head */
-                                acpi_gbl_address_range_list[space_id] =
-                                    range_info->next;
-                        } else {
-                                prev->next = range_info->next;
-                        }
-
-                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "\nRemoved [%4.4s] address range: 0x%p-0x%p\n",
-                                          acpi_ut_get_node_name(range_info->
-                                                                region_node),
-                                          ACPI_CAST_PTR(void,
-                                                        range_info->
-                                                        start_address),
-                                          ACPI_CAST_PTR(void,
-                                                        range_info->
-                                                        end_address)));
-
-                        ACPI_FREE(range_info);
-                        return_VOID;
-                }
-
-                prev = range_info;
-                range_info = range_info->next;
-        }
-
-        return_VOID;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_check_address_range
- *
- * PARAMETERS:  space_id            - Address space ID
- *              address             - Start address
- *              length              - Length of address range
- *              warn                - TRUE if warning on overlap desired
- *
- * RETURN:      Count of the number of conflicts detected. Zero is always
- *              returned for Space IDs other than Memory or I/O.
- *
- * DESCRIPTION: Check if the input address range overlaps any of the
- *              ASL operation region address ranges. The only supported
- *              Space IDs are Memory and I/O.
- *
- * MUTEX:       Assumes the namespace is locked.
- *
- ******************************************************************************/
-
-u32
-acpi_ut_check_address_range(acpi_adr_space_type space_id,
-                            acpi_physical_address address, u32 length, u8 warn)
-{
-        struct acpi_address_range *range_info;
-        acpi_physical_address end_address;
-        char *pathname;
-        u32 overlap_count = 0;
-
-        ACPI_FUNCTION_TRACE(ut_check_address_range);
-
-        if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
-            (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                return_UINT32(0);
-        }
-
-        range_info = acpi_gbl_address_range_list[space_id];
-        end_address = address + length - 1;
-
-        /* Check entire list for all possible conflicts */
-
-        while (range_info) {
-                /*
-                 * Check if the requested Address/Length overlaps this address_range.
-                 * Four cases to consider:
-                 *
-                 * 1) Input address/length is contained completely in the address range
-                 * 2) Input address/length overlaps range at the range start
-                 * 3) Input address/length overlaps range at the range end
-                 * 4) Input address/length completely encompasses the range
-                 */
-                if ((address <= range_info->end_address) &&
-                    (end_address >= range_info->start_address)) {
-
-                        /* Found an address range overlap */
-
-                        overlap_count++;
-                        if (warn) {     /* Optional warning message */
-                                pathname =
-                                    acpi_ns_get_external_pathname(range_info->
-                                                                  region_node);
-
-                                ACPI_WARNING((AE_INFO,
-                                              "0x%p-0x%p %s conflicts with Region %s %d",
-                                              ACPI_CAST_PTR(void, address),
-                                              ACPI_CAST_PTR(void, end_address),
-                                              acpi_ut_get_region_name(space_id),
-                                              pathname, overlap_count));
-                                ACPI_FREE(pathname);
-                        }
-                }
-
-                range_info = range_info->next;
-        }
-
-        return_UINT32(overlap_count);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_delete_address_lists
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Delete all global address range lists (called during
- *              subsystem shutdown).
- *
- ******************************************************************************/
-
-void acpi_ut_delete_address_lists(void)
-{
-        struct acpi_address_range *next;
-        struct acpi_address_range *range_info;
-        int i;
-
-        /* Delete all elements in all address range lists */
-
-        for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++) {
-                next = acpi_gbl_address_range_list[i];
-
-                while (next) {
-                        range_info = next;
-                        next = range_info->next;
-                        ACPI_FREE(range_info);
-                }
-
-                acpi_gbl_address_range_list[i] = NULL;
-        }
-}
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index ed29d474095..0a697351cf6 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -189,7 +189,7 @@ acpi_status acpi_ut_delete_caches(void)
  *
  * FUNCTION:    acpi_ut_validate_buffer
  *
- * PARAMETERS:  buffer              - Buffer descriptor to be validated
+ * PARAMETERS:  Buffer              - Buffer descriptor to be validated
  *
  * RETURN:      Status
  *
@@ -227,7 +227,7 @@ acpi_status acpi_ut_validate_buffer(struct acpi_buffer * buffer)
  *
  * FUNCTION:    acpi_ut_initialize_buffer
  *
- * PARAMETERS:  buffer              - Buffer to be validated
+ * PARAMETERS:  Buffer              - Buffer to be validated
  *              required_length     - Length needed
  *
  * RETURN:      Status
@@ -308,10 +308,10 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
  *
  * FUNCTION:    acpi_ut_allocate
  *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
+ * PARAMETERS:  Size                - Size of the allocation
+ *              Component           - Component type of caller
+ *              Module              - Source file name of caller
+ *              Line                - Line number of caller
  *
  * RETURN:      Address of the allocated memory on success, NULL on failure.
  *
@@ -352,10 +352,10 @@ void *acpi_ut_allocate(acpi_size size,
  *
  * FUNCTION:    acpi_ut_allocate_zeroed
  *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
+ * PARAMETERS:  Size                - Size of the allocation
+ *              Component           - Component type of caller
+ *              Module              - Source file name of caller
+ *              Line                - Line number of caller
  *
  * RETURN:      Address of the allocated memory on success, NULL on failure.
  *
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
deleted file mode 100644
index e1d40ed2639..00000000000
--- a/drivers/acpi/acpica/utcache.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/******************************************************************************
- *
- * Module Name: utcache - local cache allocation routines
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utcache")
-
-#ifdef ACPI_USE_LOCAL_CACHE
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_create_cache
- *
- * PARAMETERS:  cache_name      - Ascii name for the cache
- *              object_size     - Size of each cached object
- *              max_depth       - Maximum depth of the cache (in objects)
- *              return_cache    - Where the new cache object is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a cache object
- *
- ******************************************************************************/
-acpi_status
-acpi_os_create_cache(char *cache_name,
-                     u16 object_size,
-                     u16 max_depth, struct acpi_memory_list ** return_cache)
-{
-        struct acpi_memory_list *cache;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache_name || !return_cache || (object_size < 16)) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* Create the cache object */
-
-        cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
-        if (!cache) {
-                return (AE_NO_MEMORY);
-        }
-
-        /* Populate the cache object and return it */
-
-        ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
-        cache->link_offset = 8;
-        cache->list_name = cache_name;
-        cache->object_size = object_size;
-        cache->max_depth = max_depth;
-
-        *return_cache = cache;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_purge_cache
- *
- * PARAMETERS:  cache           - Handle to cache object
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Free all objects within the requested cache.
- *
- ******************************************************************************/
-
-acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
-{
-        char *next;
-        acpi_status status;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Walk the list of objects in this cache */
-
-        while (cache->list_head) {
-
-                /* Delete and unlink one cached state object */
-
-                next = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                &(((char *)cache->
-                                                   list_head)[cache->
-                                                              link_offset])));
-                ACPI_FREE(cache->list_head);
-
-                cache->list_head = next;
-                cache->current_depth--;
-        }
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_delete_cache
- *
- * PARAMETERS:  cache           - Handle to cache object
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Free all objects within the requested cache and delete the
- *              cache object.
- *
- ******************************************************************************/
-
-acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Purge all objects in the cache */
-
-        status = acpi_os_purge_cache(cache);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Now we can delete the cache object */
-
-        acpi_os_free(cache);
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_release_object
- *
- * PARAMETERS:  cache       - Handle to cache object
- *              object      - The object to be released
- *
- * RETURN:      None
- *
- * DESCRIPTION: Release an object to the specified cache. If cache is full,
- *              the object is deleted.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_os_release_object(struct acpi_memory_list * cache, void *object)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache || !object) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* If cache is full, just free this object */
-
-        if (cache->current_depth >= cache->max_depth) {
-                ACPI_FREE(object);
-                ACPI_MEM_TRACKING(cache->total_freed++);
-        }
-
-        /* Otherwise put this object back into the cache */
-
-        else {
-                status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-
-                /* Mark the object as cached */
-
-                ACPI_MEMSET(object, 0xCA, cache->object_size);
-                ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);
-
-                /* Put the object at the head of the cache list */
-
-                *(ACPI_CAST_INDIRECT_PTR(char,
-                                         &(((char *)object)[cache->
-                                                            link_offset]))) =
-                    cache->list_head;
-                cache->list_head = object;
-                cache->current_depth++;
-
-                (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
-        }
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_acquire_object
- *
- * PARAMETERS:  cache           - Handle to cache object
- *
- * RETURN:      the acquired object. NULL on error
- *
- * DESCRIPTION: Get an object from the specified cache. If cache is empty,
- *              the object is allocated.
- *
- ******************************************************************************/
-
-void *acpi_os_acquire_object(struct acpi_memory_list *cache)
-{
-        acpi_status status;
-        void *object;
-
-        ACPI_FUNCTION_NAME(os_acquire_object);
-
-        if (!cache) {
-                return (NULL);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
-        if (ACPI_FAILURE(status)) {
-                return (NULL);
-        }
-
-        ACPI_MEM_TRACKING(cache->requests++);
-
-        /* Check the cache first */
-
-        if (cache->list_head) {
-
-                /* There is an object available, use it */
-
-                object = cache->list_head;
-                cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                            &(((char *)
-                                                               object)[cache->
-                                                                       link_offset])));
-
-                cache->current_depth--;
-
-                ACPI_MEM_TRACKING(cache->hits++);
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Object %p from %s cache\n", object,
-                                  cache->list_name));
-
-                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (NULL);
-                }
-
-                /* Clear (zero) the previously used Object */
-
-                ACPI_MEMSET(object, 0, cache->object_size);
-        } else {
-                /* The cache is empty, create a new object */
-
-                ACPI_MEM_TRACKING(cache->total_allocated++);
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-                if ((cache->total_allocated - cache->total_freed) >
-                    cache->max_occupied) {
-                        cache->max_occupied =
-                            cache->total_allocated - cache->total_freed;
-                }
-#endif
-
-                /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
-
-                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (NULL);
-                }
-
-                object = ACPI_ALLOCATE_ZEROED(cache->object_size);
-                if (!object) {
-                        return (NULL);
-                }
-        }
-
-        return (object);
-}
-#endif                          /* ACPI_USE_LOCAL_CACHE */
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 294692ae76e..aded299a2fa 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -317,7 +317,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
  * FUNCTION:    acpi_ut_copy_ipackage_to_epackage
  *
  * PARAMETERS:  internal_object     - Pointer to the object we are returning
- *              buffer              - Where the object is returned
+ *              Buffer              - Where the object is returned
  *              space_used          - Where the object length is returned
  *
  * RETURN:      Status
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 5d95166245a..a9bcd816dc2 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,15 +41,13 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
-
 #ifdef ACPI_DEBUG_OUTPUT
-static acpi_thread_id acpi_gbl_prev_thread_id = (acpi_thread_id) 0xFFFFFFFF;
+static acpi_thread_id acpi_gbl_prev_thread_id;
 static char *acpi_gbl_fn_entry_str = "----Entry";
 static char *acpi_gbl_fn_exit_str = "----Exit-";
 
@@ -110,7 +108,7 @@ void acpi_ut_track_stack_ptr(void)
  * RETURN:      Updated pointer to the function name
  *
  * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
- *              This allows compiler macros such as __FUNCTION__ to be used
+ *              This allows compiler macros such as __func__ to be used
  *              with no change to the debug output.
  *
  ******************************************************************************/
@@ -146,7 +144,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              format              - Printf format field
+ *              Format              - Printf format field
  *              ...                 - Optional printf arguments
  *
  * RETURN:      None
@@ -218,12 +216,12 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              format              - Printf format field
+ *              Format              - Printf format field
  *              ...                 - Optional printf arguments
  *
  * RETURN:      None
  *
- * DESCRIPTION: Print message with no headers. Has same interface as
+ * DESCRIPTION: Print message with no headers.  Has same interface as
  *              debug_print so that the same macros can be used.
  *
  ******************************************************************************/
@@ -259,7 +257,7 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print_raw)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -287,11 +285,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              pointer             - Pointer to display
+ *              Pointer             - Pointer to display
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -300,7 +298,6 @@ acpi_ut_trace_ptr(u32 line_number,
                   const char *function_name,
                   const char *module_name, u32 component_id, void *pointer)
 {
-
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
@@ -317,11 +314,11 @@ acpi_ut_trace_ptr(u32 line_number,
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              string              - Additional string to display
+ *              String              - Additional string to display
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -348,11 +345,11 @@ acpi_ut_trace_str(u32 line_number,
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              integer             - Integer to display
+ *              Integer             - Integer to display
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -382,7 +379,7 @@ acpi_ut_trace_u32(u32 line_number,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -410,11 +407,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              status              - Exit status code
+ *              Status              - Exit status code
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit status also.
  *
  ******************************************************************************/
@@ -451,11 +448,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              value               - Value to be printed with exit msg
+ *              Value               - Value to be printed with exit msg
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit value also.
  *
  ******************************************************************************/
@@ -483,11 +480,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
  *              function_name       - Caller's procedure name
  *              module_name         - Caller's module name
  *              component_id        - Caller's component ID
- *              ptr                 - Pointer to display
+ *              Ptr                 - Pointer to display
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit value also.
  *
  ******************************************************************************/
@@ -510,10 +507,10 @@ acpi_ut_ptr_exit(u32 line_number,
  *
  * FUNCTION:    acpi_ut_dump_buffer
  *
- * PARAMETERS:  buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
- *              offset              - Beginning buffer offset (display only)
+ * PARAMETERS:  Buffer              - Buffer to dump
+ *              Count               - Amount to dump, in bytes
+ *              Display             - BYTE, WORD, DWORD, or QWORD display
+ *              component_iD        - Caller's component ID
  *
  * RETURN:      None
  *
@@ -521,7 +518,7 @@ acpi_ut_ptr_exit(u32 line_number,
  *
  ******************************************************************************/
 
-void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
+void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 {
         u32 i = 0;
         u32 j;
@@ -543,7 +540,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
 
                 /* Print current offset */
 
-                acpi_os_printf("%6.4X: ", (base_offset + i));
+                acpi_os_printf("%6.4X: ", i);
 
                 /* Print 16 hex chars */
 
@@ -625,12 +622,12 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_debug_dump_buffer
+ * FUNCTION:    acpi_ut_dump_buffer
  *
- * PARAMETERS:  buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
- *              component_ID        - Caller's component ID
+ * PARAMETERS:  Buffer              - Buffer to dump
+ *              Count               - Amount to dump, in bytes
+ *              Display             - BYTE, WORD, DWORD, or QWORD display
+ *              component_iD        - Caller's component ID
  *
  * RETURN:      None
  *
@@ -638,8 +635,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
  *
  ******************************************************************************/
 
-void
-acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
+void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)
 {
 
         /* Only dump the buffer if tracing is enabled */
@@ -649,5 +645,5 @@ acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
                 return;
         }
 
-        acpi_ut_dump_buffer(buffer, count, display, 0);
+        acpi_ut_dump_buffer2(buffer, count, display);
 }
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 60a158472d8..97cb36f85ce 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -49,6 +48,41 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdecode")
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_format_exception
+ *
+ * PARAMETERS:  Status       - The acpi_status code to be formatted
+ *
+ * RETURN:      A string containing the exception text. A valid pointer is
+ *              always returned.
+ *
+ * DESCRIPTION: This function translates an ACPI exception into an ASCII string
+ *              It is here instead of utxface.c so it is always present.
+ *
+ ******************************************************************************/
+const char *acpi_format_exception(acpi_status status)
+{
+        const char *exception = NULL;
+
+        ACPI_FUNCTION_ENTRY();
+
+        exception = acpi_ut_validate_exception(status);
+        if (!exception) {
+
+                /* Exception code was not recognized */
+
+                ACPI_ERROR((AE_INFO,
+                            "Unknown exception code: 0x%8.8X", status));
+
+                exception = "UNKNOWN_STATUS_CODE";
+        }
+
+        return (ACPI_CAST_PTR(const char, exception));
+}
+
+ACPI_EXPORT_SYMBOL(acpi_format_exception)
+
 /*
  * Properties of the ACPI Object Types, both internal and external.
  * The table is indexed by values of acpi_object_type
@@ -91,8 +125,8 @@ const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES] = {
  *
  * FUNCTION:    acpi_ut_hex_to_ascii_char
  *
- * PARAMETERS:  integer             - Contains the hex digit
- *              position            - bit position of the digit within the
+ * PARAMETERS:  Integer             - Contains the hex digit
+ *              Position            - bit position of the digit within the
  *                                    integer (multiple of 4)
  *
  * RETURN:      The converted Ascii character
@@ -129,17 +163,14 @@ char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
 /* Region type decoding */
 
 const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
-        "SystemMemory",         /* 0x00 */
-        "SystemIO",             /* 0x01 */
-        "PCI_Config",           /* 0x02 */
-        "EmbeddedControl",      /* 0x03 */
-        "SMBus",                /* 0x04 */
-        "SystemCMOS",           /* 0x05 */
-        "PCIBARTarget",         /* 0x06 */
-        "IPMI",                 /* 0x07 */
-        "GeneralPurposeIo",     /* 0x08 */
-        "GenericSerialBus",     /* 0x09 */
-        "PCC"                   /* 0x0A */
+        "SystemMemory",
+        "SystemIO",
+        "PCI_Config",
+        "EmbeddedControl",
+        "SMBus",
+        "SystemCMOS",
+        "PCIBARTarget",
+        "IPMI"
 };
 
 char *acpi_ut_get_region_name(u8 space_id)
@@ -194,7 +225,7 @@ char *acpi_ut_get_event_name(u32 event_id)
  *
  * FUNCTION:    acpi_ut_get_type_name
  *
- * PARAMETERS:  type                - An ACPI object type
+ * PARAMETERS:  Type                - An ACPI object type
  *
  * RETURN:      Decoded ACPI object type name
  *
@@ -272,7 +303,7 @@ char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
  *
  * FUNCTION:    acpi_ut_get_node_name
  *
- * PARAMETERS:  object               - A namespace node
+ * PARAMETERS:  Object               - A namespace node
  *
  * RETURN:      ASCII name of the node
  *
@@ -317,7 +348,7 @@ char *acpi_ut_get_node_name(void *object)
  *
  * FUNCTION:    acpi_ut_get_descriptor_name
  *
- * PARAMETERS:  object               - An ACPI object
+ * PARAMETERS:  Object               - An ACPI object
  *
  * RETURN:      Decoded name of the descriptor type
  *
@@ -367,7 +398,7 @@ char *acpi_ut_get_descriptor_name(void *object)
  *
  * FUNCTION:    acpi_ut_get_reference_name
  *
- * PARAMETERS:  object               - An ACPI reference object
+ * PARAMETERS:  Object               - An ACPI reference object
  *
  * RETURN:      Decoded name of the type of reference
  *
@@ -463,20 +494,19 @@ char *acpi_ut_get_mutex_name(u32 mutex_id)
 
 /* Names for Notify() values, used for debug output */
 
-static const char *acpi_gbl_notify_value_names[ACPI_NOTIFY_MAX + 1] = {
-        /* 00 */ "Bus Check",
-        /* 01 */ "Device Check",
-        /* 02 */ "Device Wake",
-        /* 03 */ "Eject Request",
-        /* 04 */ "Device Check Light",
-        /* 05 */ "Frequency Mismatch",
-        /* 06 */ "Bus Mode Mismatch",
-        /* 07 */ "Power Fault",
-        /* 08 */ "Capabilities Check",
-        /* 09 */ "Device PLD Check",
-        /* 10 */ "Reserved",
-        /* 11 */ "System Locality Update",
-        /* 12 */ "Shutdown Request"
+static const char *acpi_gbl_notify_value_names[] = {
+        "Bus Check",
+        "Device Check",
+        "Device Wake",
+        "Eject Request",
+        "Device Check Light",
+        "Frequency Mismatch",
+        "Bus Mode Mismatch",
+        "Power Fault",
+        "Capabilities Check",
+        "Device PLD Check",
+        "Reserved",
+        "System Locality Update"
 };
 
 const char *acpi_ut_get_notify_name(u32 notify_value)
@@ -486,10 +516,9 @@ const char *acpi_ut_get_notify_name(u32 notify_value)
                 return (acpi_gbl_notify_value_names[notify_value]);
         } else if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
                 return ("Reserved");
-        } else if (notify_value <= ACPI_MAX_DEVICE_SPECIFIC_NOTIFY) {
-                return ("Device Specific");
-        } else {
-                return ("Hardware Specific");
+        } else {                /* Greater or equal to 0x80 */
+
+                return ("**Device Specific**");
         }
 }
 #endif
@@ -498,7 +527,7 @@ const char *acpi_ut_get_notify_name(u32 notify_value)
  *
  * FUNCTION:    acpi_ut_valid_object_type
  *
- * PARAMETERS:  type            - Object type to be validated
+ * PARAMETERS:  Type            - Object type to be validated
  *
  * RETURN:      TRUE if valid object type, FALSE otherwise
  *
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 798105443d0..31f5a7832ef 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action);
  *
  * FUNCTION:    acpi_ut_delete_internal_obj
  *
- * PARAMETERS:  object         - Object to be deleted
+ * PARAMETERS:  Object         - Object to be deleted
  *
  * RETURN:      None
  *
@@ -152,7 +152,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
         case ACPI_TYPE_PROCESSOR:
         case ACPI_TYPE_THERMAL:
 
-                /* Walk the address handler list for this object */
+                /* Walk the notify handler list for this object */
 
                 handler_desc = object->common_notify.handler;
                 while (handler_desc) {
@@ -215,14 +215,11 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
                                   "***** Region %p\n", object));
 
-                /*
-                 * Update address_range list. However, only permanent regions
-                 * are installed in this list. (Not created within a method)
-                 */
-                if (!(object->region.node->flags & ANOBJ_TEMPORARY)) {
-                        acpi_ut_remove_address_range(object->region.space_id,
-                                                     object->region.node);
-                }
+                /* Invalidate the region address/length via the host OS */
+
+                acpi_os_invalidate_address(object->region.space_id,
+                                          object->region.address,
+                                          (acpi_size) object->region.length);
 
                 second_desc = acpi_ns_get_secondary_object(object);
                 if (second_desc) {
@@ -358,8 +355,8 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)
  *
  * FUNCTION:    acpi_ut_update_ref_count
  *
- * PARAMETERS:  object          - Object whose ref count is to be updated
- *              action          - What to do
+ * PARAMETERS:  Object          - Object whose ref count is to be updated
+ *              Action          - What to do
  *
  * RETURN:      New ref count
  *
@@ -456,9 +453,9 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
  *
  * FUNCTION:    acpi_ut_update_object_reference
  *
- * PARAMETERS:  object              - Increment ref count for this object
+ * PARAMETERS:  Object              - Increment ref count for this object
  *                                    and all sub-objects
- *              action              - Either REF_INCREMENT or REF_DECREMENT or
+ *              Action              - Either REF_INCREMENT or REF_DECREMENT or
  *                                    REF_FORCE_DELETE
  *
  * RETURN:      Status
@@ -480,7 +477,6 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
         acpi_status status = AE_OK;
         union acpi_generic_state *state_list = NULL;
         union acpi_operand_object *next_object = NULL;
-        union acpi_operand_object *prev_object;
         union acpi_generic_state *state;
         u32 i;
 
@@ -506,21 +502,12 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
                 case ACPI_TYPE_POWER:
                 case ACPI_TYPE_THERMAL:
 
-                        /*
-                         * Update the notify objects for these types (if present)
-                         * Two lists, system and device notify handlers.
-                         */
-                        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                                prev_object =
-                                    object->common_notify.notify_list[i];
-                                while (prev_object) {
-                                        next_object =
-                                            prev_object->notify.next[i];
-                                        acpi_ut_update_ref_count(prev_object,
-                                                                 action);
-                                        prev_object = next_object;
-                                }
-                        }
+                        /* Update the notify objects for these types (if present) */
+
+                        acpi_ut_update_ref_count(object->common_notify.
+                                                 system_notify, action);
+                        acpi_ut_update_ref_count(object->common_notify.
+                                                 device_notify, action);
                         break;
 
                 case ACPI_TYPE_PACKAGE:
@@ -640,7 +627,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
  *
  * FUNCTION:    acpi_ut_add_reference
  *
- * PARAMETERS:  object          - Object whose reference count is to be
+ * PARAMETERS:  Object          - Object whose reference count is to be
  *                                incremented
  *
  * RETURN:      None
@@ -674,7 +661,7 @@ void acpi_ut_add_reference(union acpi_operand_object *object)
  *
  * FUNCTION:    acpi_ut_remove_reference
  *
- * PARAMETERS:  object         - Object whose ref count will be decremented
+ * PARAMETERS:  Object         - Object whose ref count will be decremented
  *
  * RETURN:      None
  *
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index a9c65fbea5f..18f73c9d10b 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("uteval")
  * FUNCTION:    acpi_ut_evaluate_object
  *
  * PARAMETERS:  prefix_node         - Starting node
- *              path                - Path to object from starting node
+ *              Path                - Path to object from starting node
  *              expected_return_types - Bitmap of allowed return types
  *              return_desc         - Where a return value is stored
  *
@@ -187,7 +187,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
  *
  * PARAMETERS:  object_name         - Object name to be evaluated
  *              device_node         - Node for the device
- *              value               - Where the value is returned
+ *              Value               - Where the value is returned
  *
  * RETURN:      Status
  *
@@ -229,7 +229,7 @@ acpi_ut_evaluate_numeric_object(char *object_name,
  * FUNCTION:    acpi_ut_execute_STA
  *
  * PARAMETERS:  device_node         - Node for the device
- *              flags               - Where the status flags are returned
+ *              Flags               - Where the status flags are returned
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c
deleted file mode 100644
index 23b98945f6b..00000000000
--- a/drivers/acpi/acpica/utexcep.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- *
- * Module Name: utexcep - Exception code support
- *
- ******************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#define ACPI_DEFINE_EXCEPTION_TABLE
-#include <linux/export.h>
-#include <acpi/acpi.h>
-#include "accommon.h"
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utexcep")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_format_exception
- *
- * PARAMETERS:  status              - The acpi_status code to be formatted
- *
- * RETURN:      A string containing the exception text. A valid pointer is
- *              always returned.
- *
- * DESCRIPTION: This function translates an ACPI exception into an ASCII
- *              string. Returns "unknown status" string for invalid codes.
- *
- ******************************************************************************/
-const char *acpi_format_exception(acpi_status status)
-{
-        const char *exception = NULL;
-
-        ACPI_FUNCTION_ENTRY();
-
-        exception = acpi_ut_validate_exception(status);
-        if (!exception) {
-
-                /* Exception code was not recognized */
-
-                ACPI_ERROR((AE_INFO,
-                            "Unknown exception code: 0x%8.8X", status));
-
-                exception = "UNKNOWN_STATUS_CODE";
-        }
-
-        return (ACPI_CAST_PTR(const char, exception));
-}
-
-ACPI_EXPORT_SYMBOL(acpi_format_exception)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_validate_exception
- *
- * PARAMETERS:  status              - The acpi_status code to be formatted
- *
- * RETURN:      A string containing the exception text. NULL if exception is
- *              not valid.
- *
- * DESCRIPTION: This function validates and translates an ACPI exception into
- *              an ASCII string.
- *
- ******************************************************************************/
-const char *acpi_ut_validate_exception(acpi_status status)
-{
-        u32 sub_status;
-        const char *exception = NULL;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /*
-         * Status is composed of two parts, a "type" and an actual code
-         */
-        sub_status = (status & ~AE_CODE_MASK);
-
-        switch (status & AE_CODE_MASK) {
-        case AE_CODE_ENVIRONMENTAL:
-
-                if (sub_status <= AE_CODE_ENV_MAX) {
-                        exception = acpi_gbl_exception_names_env[sub_status];
-                }
-                break;
-
-        case AE_CODE_PROGRAMMER:
-
-                if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception = acpi_gbl_exception_names_pgm[sub_status];
-                }
-                break;
-
-        case AE_CODE_ACPI_TABLES:
-
-                if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception = acpi_gbl_exception_names_tbl[sub_status];
-                }
-                break;
-
-        case AE_CODE_AML:
-
-                if (sub_status <= AE_CODE_AML_MAX) {
-                        exception = acpi_gbl_exception_names_aml[sub_status];
-                }
-                break;
-
-        case AE_CODE_CONTROL:
-
-                if (sub_status <= AE_CODE_CTRL_MAX) {
-                        exception = acpi_gbl_exception_names_ctrl[sub_status];
-                }
-                break;
-
-        default:
-                break;
-        }
-
-        return (ACPI_CAST_PTR(const char, exception));
-}
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index ed1893155f8..833a38a9c90 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,6 @@
 
 #define DEFINE_ACPI_GLOBALS
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 
@@ -140,7 +139,6 @@ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
         {NULL, ACPI_TYPE_ANY, NULL}
 };
 
-#if (!ACPI_REDUCED_HARDWARE)
 /******************************************************************************
  *
  * Event and Hardware globals
@@ -237,7 +235,6 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
                                         ACPI_BITMASK_RT_CLOCK_STATUS,
                                         ACPI_BITMASK_RT_CLOCK_ENABLE},
 };
-#endif                          /* !ACPI_REDUCED_HARDWARE */
 
 /*******************************************************************************
  *
@@ -247,9 +244,8 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Initialize ACPICA globals. All globals that require specific
- *              initialization should be initialized here. This allows for
- *              a warm restart.
+ * DESCRIPTION: Init library globals.  All globals that require specific
+ *              initialization should be initialized here!
  *
  ******************************************************************************/
 
@@ -267,12 +263,6 @@ acpi_status acpi_ut_init_globals(void)
                 return_ACPI_STATUS(status);
         }
 
-        /* Address Range lists */
-
-        for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++) {
-                acpi_gbl_address_range_list[i] = NULL;
-        }
-
         /* Mutex locked flags */
 
         for (i = 0; i < ACPI_NUM_MUTEX; i++) {
@@ -285,12 +275,10 @@ acpi_status acpi_ut_init_globals(void)
                 acpi_gbl_owner_id_mask[i] = 0;
         }
 
-        /* Last owner_ID is never valid */
+        /* Last owner_iD is never valid */
 
         acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;
 
-#if (!ACPI_REDUCED_HARDWARE)
-
         /* GPE support */
 
         acpi_gbl_gpe_xrupt_list_head = NULL;
@@ -299,18 +287,15 @@ acpi_status acpi_ut_init_globals(void)
         acpi_current_gpe_count = 0;
         acpi_gbl_all_gpes_initialized = FALSE;
 
-        acpi_gbl_global_event_handler = NULL;
-
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
         /* Global handlers */
 
-        acpi_gbl_global_notify[0].handler = NULL;
-        acpi_gbl_global_notify[1].handler = NULL;
+        acpi_gbl_system_notify.handler = NULL;
+        acpi_gbl_device_notify.handler = NULL;
         acpi_gbl_exception_handler = NULL;
         acpi_gbl_init_handler = NULL;
         acpi_gbl_table_handler = NULL;
         acpi_gbl_interface_handler = NULL;
+        acpi_gbl_global_event_handler = NULL;
 
         /* Global Lock support */
 
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 774c3aefbf5..b679ea69354 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -1,11 +1,11 @@
 /******************************************************************************
  *
- * Module Name: utids - support for device Ids - HID, UID, CID
+ * Module Name: utids - support for device IDs - HID, UID, CID
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,10 +67,10 @@ ACPI_MODULE_NAME("utids")
  ******************************************************************************/
 acpi_status
 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id **return_id)
+                    struct acpica_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpi_pnp_device_id *hid;
+        struct acpica_device_id *hid;
         u32 length;
         acpi_status status;
 
@@ -94,17 +94,16 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the HID */
 
         hid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
                                  (acpi_size) length);
         if (!hid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after PNP_DEVICE_ID struct */
+        /* Area for the string starts after DEVICE_ID struct */
 
-        hid->string =
-            ACPI_ADD_PTR(char, hid, sizeof(struct acpi_pnp_device_id));
+        hid->string = ACPI_ADD_PTR(char, hid, sizeof(struct acpica_device_id));
 
         /* Convert EISAID to a string or simply copy existing string */
 
@@ -127,73 +126,6 @@ cleanup:
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_execute_SUB
- *
- * PARAMETERS:  device_node         - Node for the device
- *              return_id           - Where the _SUB is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Executes the _SUB control method that returns the subsystem
- *              ID of the device. The _SUB value is always a string containing
- *              either a valid PNP or ACPI ID.
- *
- *              NOTE: Internal function, no parameter validation
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id **return_id)
-{
-        union acpi_operand_object *obj_desc;
-        struct acpi_pnp_device_id *sub;
-        u32 length;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(ut_execute_SUB);
-
-        status = acpi_ut_evaluate_object(device_node, METHOD_NAME__SUB,
-                                         ACPI_BTYPE_STRING, &obj_desc);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Get the size of the String to be returned, includes null terminator */
-
-        length = obj_desc->string.length + 1;
-
-        /* Allocate a buffer for the SUB */
-
-        sub =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
-                                 (acpi_size) length);
-        if (!sub) {
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-
-        /* Area for the string starts after PNP_DEVICE_ID struct */
-
-        sub->string =
-            ACPI_ADD_PTR(char, sub, sizeof(struct acpi_pnp_device_id));
-
-        /* Simply copy existing string */
-
-        ACPI_STRCPY(sub->string, obj_desc->string.pointer);
-        sub->length = length;
-        *return_id = sub;
-
-      cleanup:
-
-        /* On exit, we must delete the return object */
-
-        acpi_ut_remove_reference(obj_desc);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_execute_UID
  *
  * PARAMETERS:  device_node         - Node for the device
@@ -212,10 +144,10 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id **return_id)
+                    struct acpica_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpi_pnp_device_id *uid;
+        struct acpica_device_id *uid;
         u32 length;
         acpi_status status;
 
@@ -239,17 +171,16 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the UID */
 
         uid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
                                  (acpi_size) length);
         if (!uid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after PNP_DEVICE_ID struct */
+        /* Area for the string starts after DEVICE_ID struct */
 
-        uid->string =
-            ACPI_ADD_PTR(char, uid, sizeof(struct acpi_pnp_device_id));
+        uid->string = ACPI_ADD_PTR(char, uid, sizeof(struct acpica_device_id));
 
         /* Convert an Integer to string, or just copy an existing string */
 
@@ -295,11 +226,11 @@ cleanup:
 
 acpi_status
 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                    struct acpi_pnp_device_id_list **return_cid_list)
+                    struct acpica_device_id_list **return_cid_list)
 {
         union acpi_operand_object **cid_objects;
         union acpi_operand_object *obj_desc;
-        struct acpi_pnp_device_id_list *cid_list;
+        struct acpica_device_id_list *cid_list;
         char *next_id_string;
         u32 string_area_size;
         u32 length;
@@ -357,12 +288,11 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
         /*
          * Now that we know the length of the CIDs, allocate return buffer:
          * 1) Size of the base structure +
-         * 2) Size of the CID PNP_DEVICE_ID array +
+         * 2) Size of the CID DEVICE_ID array +
          * 3) Size of the actual CID strings
          */
-        cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
-            ((count - 1) * sizeof(struct acpi_pnp_device_id)) +
-            string_area_size;
+        cid_list_size = sizeof(struct acpica_device_id_list) +
+            ((count - 1) * sizeof(struct acpica_device_id)) + string_area_size;
 
         cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
         if (!cid_list) {
@@ -370,10 +300,10 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
                 goto cleanup;
         }
 
-        /* Area for CID strings starts after the CID PNP_DEVICE_ID array */
+        /* Area for CID strings starts after the CID DEVICE_ID array */
 
         next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
-            ((acpi_size) count * sizeof(struct acpi_pnp_device_id));
+            ((acpi_size) count * sizeof(struct acpica_device_id));
 
         /* Copy/convert the CIDs to the return buffer */
 
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index 246798e4c93..191b6828cce 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,35 +53,27 @@ ACPI_MODULE_NAME("utinit")
 /* Local prototypes */
 static void acpi_ut_terminate(void);
 
-#if (!ACPI_REDUCED_HARDWARE)
-
-static void acpi_ut_free_gpe_lists(void);
-
-#else
-
-#define acpi_ut_free_gpe_lists()
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
-#if (!ACPI_REDUCED_HARDWARE)
 /******************************************************************************
  *
- * FUNCTION:    acpi_ut_free_gpe_lists
+ * FUNCTION:    acpi_ut_terminate
  *
  * PARAMETERS:  none
  *
  * RETURN:      none
  *
- * DESCRIPTION: Free global GPE lists
+ * DESCRIPTION: Free global memory
  *
  ******************************************************************************/
 
-static void acpi_ut_free_gpe_lists(void)
+static void acpi_ut_terminate(void)
 {
         struct acpi_gpe_block_info *gpe_block;
         struct acpi_gpe_block_info *next_gpe_block;
         struct acpi_gpe_xrupt_info *gpe_xrupt_info;
         struct acpi_gpe_xrupt_info *next_gpe_xrupt_info;
 
+        ACPI_FUNCTION_TRACE(ut_terminate);
+
         /* Free global GPE blocks and related info structures */
 
         gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
@@ -99,27 +91,7 @@ static void acpi_ut_free_gpe_lists(void)
                 ACPI_FREE(gpe_xrupt_info);
                 gpe_xrupt_info = next_gpe_xrupt_info;
         }
-}
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_ut_terminate
- *
- * PARAMETERS:  none
- *
- * RETURN:      none
- *
- * DESCRIPTION: Free global memory
- *
- ******************************************************************************/
-
-static void acpi_ut_terminate(void)
-{
-        ACPI_FUNCTION_TRACE(ut_terminate);
 
-        acpi_ut_free_gpe_lists();
-        acpi_ut_delete_address_lists();
         return_VOID;
 }
 
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index b1eb7f17e11..f6bb75c6faf 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("utlock")
  * FUNCTION:    acpi_ut_create_rw_lock
  *              acpi_ut_delete_rw_lock
  *
- * PARAMETERS:  lock                - Pointer to a valid RW lock
+ * PARAMETERS:  Lock                - Pointer to a valid RW lock
  *
  * RETURN:      Status
  *
@@ -89,7 +89,7 @@ void acpi_ut_delete_rw_lock(struct acpi_rw_lock *lock)
  * FUNCTION:    acpi_ut_acquire_read_lock
  *              acpi_ut_release_read_lock
  *
- * PARAMETERS:  lock                - Pointer to a valid RW lock
+ * PARAMETERS:  Lock                - Pointer to a valid RW lock
  *
  * RETURN:      Status
  *
@@ -149,7 +149,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
  * FUNCTION:    acpi_ut_acquire_write_lock
  *              acpi_ut_release_write_lock
  *
- * PARAMETERS:  lock                - Pointer to a valid RW lock
+ * PARAMETERS:  Lock                - Pointer to a valid RW lock
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index 49563674833..ce481da9bb4 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,15 +73,15 @@ typedef union uint64_overlay {
  *
  * FUNCTION:    acpi_ut_short_divide
  *
- * PARAMETERS:  dividend            - 64-bit dividend
- *              divisor             - 32-bit divisor
+ * PARAMETERS:  Dividend            - 64-bit dividend
+ *              Divisor             - 32-bit divisor
  *              out_quotient        - Pointer to where the quotient is returned
  *              out_remainder       - Pointer to where the remainder is returned
  *
  * RETURN:      Status (Checks for divide-by-zero)
  *
  * DESCRIPTION: Perform a short (maximum 64 bits divided by 32 bits)
- *              divide and modulo. The result is a 64-bit quotient and a
+ *              divide and modulo.  The result is a 64-bit quotient and a
  *              32-bit remainder.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 9286a69eb9a..c33a852d4f4 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#include <linux/module.h>
+
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -48,41 +50,79 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
 
-#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP
 /*******************************************************************************
  *
- * FUNCTION:    ut_convert_backslashes
+ * FUNCTION:    acpi_ut_validate_exception
  *
- * PARAMETERS:  pathname        - File pathname string to be converted
+ * PARAMETERS:  Status       - The acpi_status code to be formatted
  *
- * RETURN:      Modifies the input Pathname
+ * RETURN:      A string containing the exception text. NULL if exception is
+ *              not valid.
  *
- * DESCRIPTION: Convert all backslashes (0x5C) to forward slashes (0x2F) within
- *              the entire input file pathname string.
+ * DESCRIPTION: This function validates and translates an ACPI exception into
+ *              an ASCII string.
  *
  ******************************************************************************/
-void ut_convert_backslashes(char *pathname)
+const char *acpi_ut_validate_exception(acpi_status status)
 {
+        u32 sub_status;
+        const char *exception = NULL;
 
-        if (!pathname) {
-                return;
-        }
+        ACPI_FUNCTION_ENTRY();
+
+        /*
+         * Status is composed of two parts, a "type" and an actual code
+         */
+        sub_status = (status & ~AE_CODE_MASK);
+
+        switch (status & AE_CODE_MASK) {
+        case AE_CODE_ENVIRONMENTAL:
+
+                if (sub_status <= AE_CODE_ENV_MAX) {
+                        exception = acpi_gbl_exception_names_env[sub_status];
+                }
+                break;
 
-        while (*pathname) {
-                if (*pathname == '\\') {
-                        *pathname = '/';
+        case AE_CODE_PROGRAMMER:
+
+                if (sub_status <= AE_CODE_PGM_MAX) {
+                        exception = acpi_gbl_exception_names_pgm[sub_status];
+                }
+                break;
+
+        case AE_CODE_ACPI_TABLES:
+
+                if (sub_status <= AE_CODE_TBL_MAX) {
+                        exception = acpi_gbl_exception_names_tbl[sub_status];
                 }
+                break;
+
+        case AE_CODE_AML:
+
+                if (sub_status <= AE_CODE_AML_MAX) {
+                        exception = acpi_gbl_exception_names_aml[sub_status];
+                }
+                break;
+
+        case AE_CODE_CONTROL:
 
-                pathname++;
+                if (sub_status <= AE_CODE_CTRL_MAX) {
+                        exception = acpi_gbl_exception_names_ctrl[sub_status];
+                }
+                break;
+
+        default:
+                break;
         }
+
+        return (ACPI_CAST_PTR(const char, exception));
 }
-#endif
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_is_pci_root_bridge
  *
- * PARAMETERS:  id              - The HID/CID in string format
+ * PARAMETERS:  Id              - The HID/CID in string format
  *
  * RETURN:      TRUE if the Id is a match for a PCI/PCI-Express Root Bridge
  *
@@ -110,7 +150,7 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
  *
  * FUNCTION:    acpi_ut_is_aml_table
  *
- * PARAMETERS:  table               - An ACPI table
+ * PARAMETERS:  Table               - An ACPI table
  *
  * RETURN:      TRUE if table contains executable AML; FALSE otherwise
  *
@@ -199,8 +239,8 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
                                  */
                                 acpi_gbl_owner_id_mask[j] |= (1 << k);
 
-                                acpi_gbl_last_owner_id_index = (u8)j;
-                                acpi_gbl_next_owner_id_offset = (u8)(k + 1);
+                                acpi_gbl_last_owner_id_index = (u8) j;
+                                acpi_gbl_next_owner_id_offset = (u8) (k + 1);
 
                                 /*
                                  * Construct encoded ID from the index and bit position
@@ -244,13 +284,13 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
  *
  * FUNCTION:    acpi_ut_release_owner_id
  *
- * PARAMETERS:  owner_id_ptr        - Pointer to a previously allocated owner_ID
+ * PARAMETERS:  owner_id_ptr        - Pointer to a previously allocated owner_iD
  *
  * RETURN:      None. No error is returned because we are either exiting a
  *              control method or unloading a table. Either way, we would
  *              ignore any error anyway.
  *
- * DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 255
+ * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 255
  *
  ******************************************************************************/
 
@@ -267,7 +307,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
 
         *owner_id_ptr = 0;
 
-        /* Zero is not a valid owner_ID */
+        /* Zero is not a valid owner_iD */
 
         if (owner_id == 0) {
                 ACPI_ERROR((AE_INFO, "Invalid OwnerId: 0x%2.2X", owner_id));
@@ -337,78 +377,11 @@ void acpi_ut_strupr(char *src_string)
         return;
 }
 
-#ifdef ACPI_ASL_COMPILER
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_strlwr (strlwr)
- *
- * PARAMETERS:  src_string      - The source string to convert
- *
- * RETURN:      None
- *
- * DESCRIPTION: Convert string to lowercase
- *
- * NOTE: This is not a POSIX function, so it appears here, not in utclib.c
- *
- ******************************************************************************/
-
-void acpi_ut_strlwr(char *src_string)
-{
-        char *string;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!src_string) {
-                return;
-        }
-
-        /* Walk entire string, lowercasing the letters */
-
-        for (string = src_string; *string; string++) {
-                *string = (char)ACPI_TOLOWER(*string);
-        }
-
-        return;
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_ut_stricmp
- *
- * PARAMETERS:  string1             - first string to compare
- *              string2             - second string to compare
- *
- * RETURN:      int that signifies string relationship. Zero means strings
- *              are equal.
- *
- * DESCRIPTION: Implementation of the non-ANSI stricmp function (compare
- *              strings with no case sensitivity)
- *
- ******************************************************************************/
-
-int acpi_ut_stricmp(char *string1, char *string2)
-{
-        int c1;
-        int c2;
-
-        do {
-                c1 = tolower((int)*string1);
-                c2 = tolower((int)*string2);
-
-                string1++;
-                string2++;
-        }
-        while ((c1 == c2) && (c1));
-
-        return (c1 - c2);
-}
-#endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_print_string
  *
- * PARAMETERS:  string          - Null terminated ASCII string
+ * PARAMETERS:  String          - Null terminated ASCII string
  *              max_length      - Maximum output length
  *
  * RETURN:      None
@@ -494,7 +467,7 @@ void acpi_ut_print_string(char *string, u8 max_length)
  *
  * FUNCTION:    acpi_ut_dword_byte_swap
  *
- * PARAMETERS:  value           - Value to be converted
+ * PARAMETERS:  Value           - Value to be converted
  *
  * RETURN:      u32 integer with bytes swapped
  *
@@ -534,8 +507,8 @@ u32 acpi_ut_dword_byte_swap(u32 value)
  * RETURN:      None
  *
  * DESCRIPTION: Set the global integer bit width based upon the revision
- *              of the DSDT. For Revision 1 and 0, Integers are 32 bits.
- *              For Revision 2 and above, Integers are 64 bits. Yes, this
+ *              of the DSDT.  For Revision 1 and 0, Integers are 32 bits.
+ *              For Revision 2 and above, Integers are 64 bits.  Yes, this
  *              makes a difference.
  *
  ******************************************************************************/
@@ -564,9 +537,9 @@ void acpi_ut_set_integer_width(u8 revision)
  *
  * FUNCTION:    acpi_ut_display_init_pathname
  *
- * PARAMETERS:  type                - Object type of the node
+ * PARAMETERS:  Type                - Object type of the node
  *              obj_handle          - Handle whose pathname will be displayed
- *              path                - Additional path string to be appended.
+ *              Path                - Additional path string to be appended.
  *                                      (NULL if no extra path)
  *
  * RETURN:      acpi_status
@@ -631,8 +604,8 @@ acpi_ut_display_init_pathname(u8 type,
  *
  * FUNCTION:    acpi_ut_valid_acpi_char
  *
- * PARAMETERS:  char            - The character to be examined
- *              position        - Byte position (0-3)
+ * PARAMETERS:  Char            - The character to be examined
+ *              Position        - Byte position (0-3)
  *
  * RETURN:      TRUE if the character is valid, FALSE otherwise
  *
@@ -667,11 +640,11 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position)
  *
  * FUNCTION:    acpi_ut_valid_acpi_name
  *
- * PARAMETERS:  name            - The name to be examined
+ * PARAMETERS:  Name            - The name to be examined
  *
  * RETURN:      TRUE if the name is valid, FALSE otherwise
  *
- * DESCRIPTION: Check for a valid ACPI name. Each character must be one of:
+ * DESCRIPTION: Check for a valid ACPI name.  Each character must be one of:
  *              1) Upper case alpha
  *              2) numeric
  *              3) underscore
@@ -698,72 +671,42 @@ u8 acpi_ut_valid_acpi_name(u32 name)
  *
  * FUNCTION:    acpi_ut_repair_name
  *
- * PARAMETERS:  name            - The ACPI name to be repaired
+ * PARAMETERS:  Name            - The ACPI name to be repaired
  *
  * RETURN:      Repaired version of the name
  *
  * DESCRIPTION: Repair an ACPI name: Change invalid characters to '*' and
- *              return the new name. NOTE: the Name parameter must reside in
- *              read/write memory, cannot be a const.
- *
- * An ACPI Name must consist of valid ACPI characters. We will repair the name
- * if necessary because we don't want to abort because of this, but we want
- * all namespace names to be printable. A warning message is appropriate.
- *
- * This issue came up because there are in fact machines that exhibit
- * this problem, and we want to be able to enable ACPI support for them,
- * even though there are a few bad names.
+ *              return the new name.
  *
  ******************************************************************************/
 
-void acpi_ut_repair_name(char *name)
+acpi_name acpi_ut_repair_name(char *name)
 {
-        u32 i;
-        u8 found_bad_char = FALSE;
-        u32 original_name;
-
-        ACPI_FUNCTION_NAME(ut_repair_name);
-
-        ACPI_MOVE_NAME(&original_name, name);
-
-        /* Check each character in the name */
+       u32 i;
+        char new_name[ACPI_NAME_SIZE];
 
         for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                if (acpi_ut_valid_acpi_char(name[i], i)) {
-                        continue;
-                }
+                new_name[i] = name[i];
 
                 /*
                  * Replace a bad character with something printable, yet technically
                  * still invalid. This prevents any collisions with existing "good"
                  * names in the namespace.
                  */
-                name[i] = '*';
-                found_bad_char = TRUE;
-        }
-
-        if (found_bad_char) {
-
-                /* Report warning only if in strict mode or debug mode */
-
-                if (!acpi_gbl_enable_interpreter_slack) {
-                        ACPI_WARNING((AE_INFO,
-                                      "Found bad character(s) in name, repaired: [%4.4s]\n",
-                                      name));
-                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Found bad character(s) in name, repaired: [%4.4s]\n",
-                                          name));
+                if (!acpi_ut_valid_acpi_char(name[i], i)) {
+                        new_name[i] = '*';
                 }
         }
+
+        return (*(u32 *) new_name);
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_strtoul64
  *
- * PARAMETERS:  string          - Null terminated string
- *              base            - Radix of the string: 16 or ACPI_ANY_BASE;
+ * PARAMETERS:  String          - Null terminated string
+ *              Base            - Radix of the string: 16 or ACPI_ANY_BASE;
  *                                ACPI_ANY_BASE means 'in behalf of to_integer'
  *              ret_integer     - Where the converted integer is returned
  *
@@ -776,7 +719,7 @@ void acpi_ut_repair_name(char *name)
  *
  ******************************************************************************/
 
-acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
 {
         u32 this_digit = 0;
         u64 return_value = 0;
@@ -812,7 +755,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
         if (to_integer_op) {
                 /*
-                 * Base equal to ACPI_ANY_BASE means 'ToInteger operation case'.
+                 * Base equal to ACPI_ANY_BASE means 'to_integer operation case'.
                  * We need to determine if it is decimal or hexadecimal.
                  */
                 if ((*string == '0') && (ACPI_TOLOWER(*(string + 1)) == 'x')) {
@@ -849,14 +792,14 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
                         /* Convert ASCII 0-9 to Decimal value */
 
-                        this_digit = ((u8)*string) - '0';
+                        this_digit = ((u8) * string) - '0';
                 } else if (base == 10) {
 
                         /* Digit is out of range; possible in to_integer case only */
 
                         term = 1;
                 } else {
-                        this_digit = (u8)ACPI_TOUPPER(*string);
+                        this_digit = (u8) ACPI_TOUPPER(*string);
                         if (ACPI_IS_XDIGIT((char)this_digit)) {
 
                                 /* Convert ASCII Hex char to value */
@@ -883,9 +826,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
                 valid_digits++;
 
-                if (sign_of0x
-                    && ((valid_digits > 16)
-                        || ((valid_digits > 8) && mode32))) {
+                if (sign_of0x && ((valid_digits > 16)
+                                  || ((valid_digits > 8) && mode32))) {
                         /*
                          * This is to_integer operation case.
                          * No any restrictions for string-to-integer conversion,
@@ -896,7 +838,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
                 /* Divide the digit into the correct position */
 
-                (void)acpi_ut_short_divide((dividend - (u64)this_digit),
+                (void)acpi_ut_short_divide((dividend - (u64) this_digit),
                                            base, &quotient, NULL);
 
                 if (return_value > quotient) {
@@ -936,8 +878,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
  *
  * FUNCTION:    acpi_ut_create_update_state_and_push
  *
- * PARAMETERS:  object          - Object to be added to the new state
- *              action          - Increment/Decrement
+ * PARAMETERS:  Object          - Object to be added to the new state
+ *              Action          - Increment/Decrement
  *              state_list      - List the state will be added to
  *
  * RETURN:      Status
@@ -977,7 +919,7 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
  * PARAMETERS:  source_object       - The package to walk
  *              target_object       - Target object (if package is being copied)
  *              walk_callback       - Called once for each package element
- *              context             - Passed to the callback function
+ *              Context             - Passed to the callback function
  *
  * RETURN:      Status
  *
@@ -986,7 +928,7 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
  ******************************************************************************/
 
 acpi_status
-acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
+acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
                           void *target_object,
                           acpi_pkg_callback walk_callback, void *context)
 {
@@ -1013,10 +955,10 @@ acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
 
                 /*
                  * Check for:
-                 * 1) An uninitialized package element. It is completely
+                 * 1) An uninitialized package element.  It is completely
                  *    legal to declare a package and leave it uninitialized
                  * 2) Not an internal object - can be a namespace node instead
-                 * 3) Any type other than a package. Packages are handled in else
+                 * 3) Any type other than a package.  Packages are handled in else
                  *    case below.
                  */
                 if ((!this_source_obj) ||
@@ -1035,7 +977,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
                                state->pkg.source_object->package.count) {
                                 /*
                                  * We've handled all of the objects at this level,  This means
-                                 * that we have just completed a package. That package may
+                                 * that we have just completed a package.  That package may
                                  * have contained one or more packages itself.
                                  *
                                  * Delete this state and pop the previous state (package).
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 5ccf57c0d87..7d797e2baec 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -147,7 +147,7 @@ void acpi_ut_mutex_terminate(void)
  *
  * FUNCTION:    acpi_ut_create_mutex
  *
- * PARAMETERS:  mutex_ID        - ID of the mutex to be created
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be created
  *
  * RETURN:      Status
  *
@@ -176,7 +176,7 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
  *
  * FUNCTION:    acpi_ut_delete_mutex
  *
- * PARAMETERS:  mutex_ID        - ID of the mutex to be deleted
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be deleted
  *
  * RETURN:      Status
  *
@@ -193,15 +193,13 @@ static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 
         acpi_gbl_mutex_info[mutex_id].mutex = NULL;
         acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
-
-        return_VOID;
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_acquire_mutex
  *
- * PARAMETERS:  mutex_ID        - ID of the mutex to be acquired
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be acquired
  *
  * RETURN:      Status
  *
@@ -228,9 +226,9 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 /*
                  * Mutex debug code, for internal debugging only.
                  *
-                 * Deadlock prevention. Check if this thread owns any mutexes of value
-                 * greater than or equal to this one. If so, the thread has violated
-                 * the mutex ordering rule. This indicates a coding error somewhere in
+                 * Deadlock prevention.  Check if this thread owns any mutexes of value
+                 * greater than or equal to this one.  If so, the thread has violated
+                 * the mutex ordering rule.  This indicates a coding error somewhere in
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
@@ -285,7 +283,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
  *
  * FUNCTION:    acpi_ut_release_mutex
  *
- * PARAMETERS:  mutex_ID        - ID of the mutex to be released
+ * PARAMETERS:  mutex_iD        - ID of the mutex to be released
  *
  * RETURN:      Status
  *
@@ -295,10 +293,14 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 
 acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
 {
+        acpi_thread_id this_thread_id;
+
         ACPI_FUNCTION_NAME(ut_release_mutex);
 
+        this_thread_id = acpi_os_get_thread_id();
+
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n",
-                          (u32)acpi_os_get_thread_id(),
+                          (u32)this_thread_id,
                           acpi_ut_get_mutex_name(mutex_id)));
 
         if (mutex_id > ACPI_MAX_MUTEX) {
@@ -321,14 +323,13 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                 /*
                  * Mutex debug code, for internal debugging only.
                  *
-                 * Deadlock prevention. Check if this thread owns any mutexes of value
-                 * greater than this one. If so, the thread has violated the mutex
-                 * ordering rule. This indicates a coding error somewhere in
+                 * Deadlock prevention.  Check if this thread owns any mutexes of value
+                 * greater than this one.  If so, the thread has violated the mutex
+                 * ordering rule.  This indicates a coding error somewhere in
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
-                        if (acpi_gbl_mutex_info[i].thread_id ==
-                            acpi_os_get_thread_id()) {
+                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                 if (i == mutex_id) {
                                         continue;
                                 }
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 5c52ca78f6f..188340a017b 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@ acpi_ut_get_element_length(u8 object_type,
  * PARAMETERS:  module_name         - Source file name of caller
  *              line_number         - Line number of caller
  *              component_id        - Component type of caller
- *              type                - ACPI Type of the new object
+ *              Type                - ACPI Type of the new object
  *
  * RETURN:      A new internal object, null on failure
  *
@@ -77,7 +77,7 @@ acpi_ut_get_element_length(u8 object_type,
  *
  * NOTE:        We always allocate the worst-case object descriptor because
  *              these objects are cached, and we want them to be
- *              one-size-satisifies-any-request. This in itself may not be
+ *              one-size-satisifies-any-request.  This in itself may not be
  *              the most memory efficient, but the efficiency of the object
  *              cache should more than make up for this!
  *
@@ -150,7 +150,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char
  *
  * FUNCTION:    acpi_ut_create_package_object
  *
- * PARAMETERS:  count               - Number of package elements
+ * PARAMETERS:  Count               - Number of package elements
  *
  * RETURN:      Pointer to a new Package object, null on failure
  *
@@ -323,11 +323,11 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
  *
  * FUNCTION:    acpi_ut_valid_internal_object
  *
- * PARAMETERS:  object              - Object to be validated
+ * PARAMETERS:  Object              - Object to be validated
  *
  * RETURN:      TRUE if object is valid, FALSE otherwise
  *
- * DESCRIPTION: Validate a pointer to be of type union acpi_operand_object
+ * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
  *
  ******************************************************************************/
 
@@ -348,7 +348,7 @@ u8 acpi_ut_valid_internal_object(void *object)
         switch (ACPI_GET_DESCRIPTOR_TYPE(object)) {
         case ACPI_DESC_TYPE_OPERAND:
 
-                /* The object appears to be a valid union acpi_operand_object */
+                /* The object appears to be a valid union acpi_operand_object    */
 
                 return (TRUE);
 
@@ -370,9 +370,9 @@ u8 acpi_ut_valid_internal_object(void *object)
  *              line_number         - Caller's line number (for error output)
  *              component_id        - Caller's component ID (for error output)
  *
- * RETURN:      Pointer to newly allocated object descriptor. Null on error
+ * RETURN:      Pointer to newly allocated object descriptor.  Null on error
  *
- * DESCRIPTION: Allocate a new object descriptor. Gracefully handle
+ * DESCRIPTION: Allocate a new object descriptor.  Gracefully handle
  *              error conditions.
  *
  ******************************************************************************/
@@ -407,7 +407,7 @@ void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
  *
  * FUNCTION:    acpi_ut_delete_object_desc
  *
- * PARAMETERS:  object          - An Acpi internal object to be deleted
+ * PARAMETERS:  Object          - An Acpi internal object to be deleted
  *
  * RETURN:      None.
  *
@@ -419,7 +419,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
 {
         ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
 
-        /* Object must be a union acpi_operand_object */
+        /* Object must be a union acpi_operand_object    */
 
         if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
                 ACPI_ERROR((AE_INFO,
@@ -554,7 +554,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         /*
          * Account for the space required by the object rounded up to the next
-         * multiple of the machine word size. This keeps each object aligned
+         * multiple of the machine word size.  This keeps each object aligned
          * on a machine word boundary. (preventing alignment faults on some
          * machines.)
          */
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 676285d6116..1fb10cb8f11 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,12 +68,11 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
         {"Windows 2001.1", NULL, 0, ACPI_OSI_WINSRV_2003},      /* Windows Server 2003 */
         {"Windows 2001 SP2", NULL, 0, ACPI_OSI_WIN_XP_SP2},     /* Windows XP SP2 */
         {"Windows 2001.1 SP1", NULL, 0, ACPI_OSI_WINSRV_2003_SP1},      /* Windows Server 2003 SP1 - Added 03/2006 */
-        {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA},  /* Windows vista - Added 03/2006 */
+        {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA},  /* Windows Vista - Added 03/2006 */
         {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008},      /* Windows Server 2008 - Added 09/2009 */
         {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1},  /* Windows Vista SP1 - Added 09/2009 */
         {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2},  /* Windows Vista SP2 - Added 09/2010 */
         {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7},      /* Windows 7 and Server 2008 R2 - Added 09/2009 */
-        {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8},      /* Windows 8 and Server 2012 - Added 08/2012 */
 
         /* Feature Group Strings */
 
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index e38bef4980b..6ffd3a8bdaa 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acresrc.h"
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
@@ -154,138 +154,6 @@ const char *acpi_gbl_typ_decode[] = {
         "TypeF"
 };
 
-const char *acpi_gbl_ppc_decode[] = {
-        "PullDefault",
-        "PullUp",
-        "PullDown",
-        "PullNone"
-};
-
-const char *acpi_gbl_ior_decode[] = {
-        "IoRestrictionNone",
-        "IoRestrictionInputOnly",
-        "IoRestrictionOutputOnly",
-        "IoRestrictionNoneAndPreserve"
-};
-
-const char *acpi_gbl_dts_decode[] = {
-        "Width8bit",
-        "Width16bit",
-        "Width32bit",
-        "Width64bit",
-        "Width128bit",
-        "Width256bit",
-};
-
-/* GPIO connection type */
-
-const char *acpi_gbl_ct_decode[] = {
-        "Interrupt",
-        "I/O"
-};
-
-/* Serial bus type */
-
-const char *acpi_gbl_sbt_decode[] = {
-        "/* UNKNOWN serial bus type */",
-        "I2C",
-        "SPI",
-        "UART"
-};
-
-/* I2C serial bus access mode */
-
-const char *acpi_gbl_am_decode[] = {
-        "AddressingMode7Bit",
-        "AddressingMode10Bit"
-};
-
-/* I2C serial bus slave mode */
-
-const char *acpi_gbl_sm_decode[] = {
-        "ControllerInitiated",
-        "DeviceInitiated"
-};
-
-/* SPI serial bus wire mode */
-
-const char *acpi_gbl_wm_decode[] = {
-        "FourWireMode",
-        "ThreeWireMode"
-};
-
-/* SPI serial clock phase */
-
-const char *acpi_gbl_cph_decode[] = {
-        "ClockPhaseFirst",
-        "ClockPhaseSecond"
-};
-
-/* SPI serial bus clock polarity */
-
-const char *acpi_gbl_cpo_decode[] = {
-        "ClockPolarityLow",
-        "ClockPolarityHigh"
-};
-
-/* SPI serial bus device polarity */
-
-const char *acpi_gbl_dp_decode[] = {
-        "PolarityLow",
-        "PolarityHigh"
-};
-
-/* UART serial bus endian */
-
-const char *acpi_gbl_ed_decode[] = {
-        "LittleEndian",
-        "BigEndian"
-};
-
-/* UART serial bus bits per byte */
-
-const char *acpi_gbl_bpb_decode[] = {
-        "DataBitsFive",
-        "DataBitsSix",
-        "DataBitsSeven",
-        "DataBitsEight",
-        "DataBitsNine",
-        "/* UNKNOWN Bits per byte */",
-        "/* UNKNOWN Bits per byte */",
-        "/* UNKNOWN Bits per byte */"
-};
-
-/* UART serial bus stop bits */
-
-const char *acpi_gbl_sb_decode[] = {
-        "StopBitsNone",
-        "StopBitsOne",
-        "StopBitsOnePlusHalf",
-        "StopBitsTwo"
-};
-
-/* UART serial bus flow control */
-
-const char *acpi_gbl_fc_decode[] = {
-        "FlowControlNone",
-        "FlowControlHardware",
-        "FlowControlXON",
-        "/* UNKNOWN flow control keyword */"
-};
-
-/* UART serial bus parity type */
-
-const char *acpi_gbl_pt_decode[] = {
-        "ParityTypeNone",
-        "ParityTypeEven",
-        "ParityTypeOdd",
-        "ParityTypeMark",
-        "ParityTypeSpace",
-        "/* UNKNOWN parity keyword */",
-        "/* UNKNOWN parity keyword */",
-        "/* UNKNOWN parity keyword */"
-};
-
 #endif
 
 /*
@@ -305,7 +173,7 @@ const u8 acpi_gbl_resource_aml_sizes[] = {
         ACPI_AML_SIZE_SMALL(struct aml_resource_end_dependent),
         ACPI_AML_SIZE_SMALL(struct aml_resource_io),
         ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_io),
-        ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_dma),
+        0,
         0,
         0,
         0,
@@ -325,17 +193,7 @@ const u8 acpi_gbl_resource_aml_sizes[] = {
         ACPI_AML_SIZE_LARGE(struct aml_resource_address16),
         ACPI_AML_SIZE_LARGE(struct aml_resource_extended_irq),
         ACPI_AML_SIZE_LARGE(struct aml_resource_address64),
-        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64),
-        ACPI_AML_SIZE_LARGE(struct aml_resource_gpio),
-        0,
-        ACPI_AML_SIZE_LARGE(struct aml_resource_common_serialbus),
-};
-
-const u8 acpi_gbl_resource_aml_serial_bus_sizes[] = {
-        0,
-        ACPI_AML_SIZE_LARGE(struct aml_resource_i2c_serialbus),
-        ACPI_AML_SIZE_LARGE(struct aml_resource_spi_serialbus),
-        ACPI_AML_SIZE_LARGE(struct aml_resource_uart_serialbus),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64)
 };
 
 /*
@@ -351,58 +209,44 @@ static const u8 acpi_gbl_resource_types[] = {
         0,
         0,
         0,
-        ACPI_SMALL_VARIABLE_LENGTH,     /* 04 IRQ */
-        ACPI_FIXED_LENGTH,      /* 05 DMA */
-        ACPI_SMALL_VARIABLE_LENGTH,     /* 06 start_dependent_functions */
-        ACPI_FIXED_LENGTH,      /* 07 end_dependent_functions */
-        ACPI_FIXED_LENGTH,      /* 08 IO */
-        ACPI_FIXED_LENGTH,      /* 09 fixed_IO */
-        ACPI_FIXED_LENGTH,      /* 0A fixed_DMA */
+        ACPI_SMALL_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_SMALL_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        0,
         0,
         0,
         0,
-        ACPI_VARIABLE_LENGTH,   /* 0E vendor_short */
-        ACPI_FIXED_LENGTH,      /* 0F end_tag */
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
 
         /* Large descriptors */
 
         0,
-        ACPI_FIXED_LENGTH,      /* 01 Memory24 */
-        ACPI_FIXED_LENGTH,      /* 02 generic_register */
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
         0,
-        ACPI_VARIABLE_LENGTH,   /* 04 vendor_long */
-        ACPI_FIXED_LENGTH,      /* 05 Memory32 */
-        ACPI_FIXED_LENGTH,      /* 06 memory32_fixed */
-        ACPI_VARIABLE_LENGTH,   /* 07 Dword* address */
-        ACPI_VARIABLE_LENGTH,   /* 08 Word* address */
-        ACPI_VARIABLE_LENGTH,   /* 09 extended_IRQ */
-        ACPI_VARIABLE_LENGTH,   /* 0A Qword* address */
-        ACPI_FIXED_LENGTH,      /* 0B Extended* address */
-        ACPI_VARIABLE_LENGTH,   /* 0C Gpio* */
-        0,
-        ACPI_VARIABLE_LENGTH    /* 0E *serial_bus */
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH
 };
 
-/*
- * For the iASL compiler/disassembler, we don't want any error messages
- * because the disassembler uses the resource validation code to determine
- * if Buffer objects are actually Resource Templates.
- */
-#ifdef ACPI_ASL_COMPILER
-#define ACPI_RESOURCE_ERROR(plist)
-#else
-#define ACPI_RESOURCE_ERROR(plist)  ACPI_ERROR(plist)
-#endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_walk_aml_resources
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource template
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource template
  *              aml_length      - Length of the entire template
  *              user_function   - Called once for each descriptor found. If
  *                                NULL, a pointer to the end_tag is returned
- *              context         - Passed to user_function
+ *              Context         - Passed to user_function
  *
  * RETURN:      Status
  *
@@ -421,7 +265,6 @@ acpi_ut_walk_aml_resources(u8 * aml,
         u8 resource_index;
         u32 length;
         u32 offset = 0;
-        u8 end_tag[2] = { 0x79, 0x00 };
 
         ACPI_FUNCTION_TRACE(ut_walk_aml_resources);
 
@@ -443,10 +286,6 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
                 status = acpi_ut_validate_resource(aml, &resource_index);
                 if (ACPI_FAILURE(status)) {
-                        /*
-                         * Exit on failure. Cannot continue because the descriptor length
-                         * may be bogus also.
-                         */
                         return_ACPI_STATUS(status);
                 }
 
@@ -461,7 +300,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
                             user_function(aml, length, offset, resource_index,
                                           context);
                         if (ACPI_FAILURE(status)) {
-                                return_ACPI_STATUS(status);
+                                return (status);
                         }
                 }
 
@@ -494,26 +333,14 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
         /* Did not find an end_tag descriptor */
 
-        if (user_function) {
-
-                /* Insert an end_tag anyway. acpi_rs_get_list_length always leaves room */
-
-                (void)acpi_ut_validate_resource(end_tag, &resource_index);
-                status =
-                    user_function(end_tag, 2, offset, resource_index, context);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+        return (AE_AML_NO_RESOURCE_END_TAG);
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_validate_resource
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
  *              return_index    - Where the resource index is returned. NULL
  *                                if the index is not required.
  *
@@ -527,7 +354,6 @@ acpi_ut_walk_aml_resources(u8 * aml,
 
 acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 {
-        union aml_resource *aml_resource;
         u8 resource_type;
         u8 resource_index;
         acpi_rs_length resource_length;
@@ -549,7 +375,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Verify the large resource type (name) against the max */
 
                 if (resource_type > ACPI_RESOURCE_NAME_LARGE_MAX) {
-                        goto invalid_resource;
+                        return (AE_AML_INVALID_RESOURCE_TYPE);
                 }
 
                 /*
@@ -566,17 +392,15 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                     ((resource_type & ACPI_RESOURCE_NAME_SMALL_MASK) >> 3);
         }
 
-        /*
-         * Check validity of the resource type, via acpi_gbl_resource_types. Zero
-         * indicates an invalid resource.
-         */
+        /* Check validity of the resource type, zero indicates name is invalid */
+
         if (!acpi_gbl_resource_types[resource_index]) {
-                goto invalid_resource;
+                return (AE_AML_INVALID_RESOURCE_TYPE);
         }
 
         /*
-         * Validate the resource_length field. This ensures that the length
-         * is at least reasonable, and guarantees that it is non-zero.
+         * 2) Validate the resource_length field. This ensures that the length
+         *    is at least reasonable, and guarantees that it is non-zero.
          */
         resource_length = acpi_ut_get_resource_length(aml);
         minimum_resource_length = acpi_gbl_resource_aml_sizes[resource_index];
@@ -589,7 +413,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Fixed length resource, length must match exactly */
 
                 if (resource_length != minimum_resource_length) {
-                        goto bad_resource_length;
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
                 }
                 break;
 
@@ -598,7 +422,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
                 /* Variable length resource, length must be at least the minimum */
 
                 if (resource_length < minimum_resource_length) {
-                        goto bad_resource_length;
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
                 }
                 break;
 
@@ -608,7 +432,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 
                 if ((resource_length > minimum_resource_length) ||
                     (resource_length < (minimum_resource_length - 1))) {
-                        goto bad_resource_length;
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
                 }
                 break;
 
@@ -616,23 +440,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 
                 /* Shouldn't happen (because of validation earlier), but be sure */
 
-                goto invalid_resource;
-        }
-
-        aml_resource = ACPI_CAST_PTR(union aml_resource, aml);
-        if (resource_type == ACPI_RESOURCE_NAME_SERIAL_BUS) {
-
-                /* Validate the bus_type field */
-
-                if ((aml_resource->common_serial_bus.type == 0) ||
-                    (aml_resource->common_serial_bus.type >
-                     AML_RESOURCE_MAX_SERIALBUSTYPE)) {
-                        ACPI_RESOURCE_ERROR((AE_INFO,
-                                             "Invalid/unsupported SerialBus resource descriptor: BusType 0x%2.2X",
-                                             aml_resource->common_serial_bus.
-                                             type));
-                        return (AE_AML_INVALID_RESOURCE_TYPE);
-                }
+                return (AE_AML_INVALID_RESOURCE_TYPE);
         }
 
         /* Optionally return the resource table index */
@@ -642,29 +450,13 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
         }
 
         return (AE_OK);
-
-      invalid_resource:
-
-        ACPI_RESOURCE_ERROR((AE_INFO,
-                             "Invalid/unsupported resource descriptor: Type 0x%2.2X",
-                             resource_type));
-        return (AE_AML_INVALID_RESOURCE_TYPE);
-
-      bad_resource_length:
-
-        ACPI_RESOURCE_ERROR((AE_INFO,
-                             "Invalid resource descriptor length: Type "
-                             "0x%2.2X, Length 0x%4.4X, MinLength 0x%4.4X",
-                             resource_type, resource_length,
-                             minimum_resource_length));
-        return (AE_AML_BAD_RESOURCE_LENGTH);
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_get_resource_type
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
  *
  * RETURN:      The Resource Type with no extraneous bits (except the
  *              Large/Small descriptor bit -- this is left alone)
@@ -698,7 +490,7 @@ u8 acpi_ut_get_resource_type(void *aml)
  *
  * FUNCTION:    acpi_ut_get_resource_length
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
  *
  * RETURN:      Byte Length
  *
@@ -738,7 +530,7 @@ u16 acpi_ut_get_resource_length(void *aml)
  *
  * FUNCTION:    acpi_ut_get_resource_header_length
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
  *
  * RETURN:      Length of the AML header (depends on large/small descriptor)
  *
@@ -763,7 +555,7 @@ u8 acpi_ut_get_resource_header_length(void *aml)
  *
  * FUNCTION:    acpi_ut_get_descriptor_length
  *
- * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
  *
  * RETURN:      Byte length
  *
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index cee0473ba81..30c21e1a936 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,8 +51,8 @@ ACPI_MODULE_NAME("utstate")
  *
  * FUNCTION:    acpi_ut_create_pkg_state_and_push
  *
- * PARAMETERS:  object          - Object to be added to the new state
- *              action          - Increment/Decrement
+ * PARAMETERS:  Object          - Object to be added to the new state
+ *              Action          - Increment/Decrement
  *              state_list      - List the state will be added to
  *
  * RETURN:      Status
@@ -85,7 +85,7 @@ acpi_ut_create_pkg_state_and_push(void *internal_object,
  * FUNCTION:    acpi_ut_push_generic_state
  *
  * PARAMETERS:  list_head           - Head of the state stack
- *              state               - State object to push
+ *              State               - State object to push
  *
  * RETURN:      None
  *
@@ -147,7 +147,7 @@ union acpi_generic_state *acpi_ut_pop_generic_state(union acpi_generic_state
  *
  * RETURN:      The new state object. NULL on failure.
  *
- * DESCRIPTION: Create a generic state object. Attempt to obtain one from
+ * DESCRIPTION: Create a generic state object.  Attempt to obtain one from
  *              the global state cache;  If none available, create a new one.
  *
  ******************************************************************************/
@@ -214,8 +214,8 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void)
  *
  * FUNCTION:    acpi_ut_create_update_state
  *
- * PARAMETERS:  object          - Initial Object to be installed in the state
- *              action          - Update action to be performed
+ * PARAMETERS:  Object          - Initial Object to be installed in the state
+ *              Action          - Update action to be performed
  *
  * RETURN:      New state object, null on failure
  *
@@ -252,8 +252,8 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object
  *
  * FUNCTION:    acpi_ut_create_pkg_state
  *
- * PARAMETERS:  object          - Initial Object to be installed in the state
- *              action          - Update action to be performed
+ * PARAMETERS:  Object          - Initial Object to be installed in the state
+ *              Action          - Update action to be performed
  *
  * RETURN:      New state object, null on failure
  *
@@ -325,7 +325,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)
  *
  * FUNCTION:    acpi_ut_delete_generic_state
  *
- * PARAMETERS:  state               - The state object to be deleted
+ * PARAMETERS:  State               - The state object to be deleted
  *
  * RETURN:      None
  *
diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
deleted file mode 100644
index a424a9e3fea..00000000000
--- a/drivers/acpi/acpica/uttrack.c
+++ /dev/null
@@ -1,692 +0,0 @@
-/******************************************************************************
- *
- * Module Name: uttrack - Memory allocation tracking routines (debug only)
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
- * These procedures are used for tracking memory leaks in the subsystem, and
- * they get compiled out when the ACPI_DBG_TRACK_ALLOCATIONS is not set.
- *
- * Each memory allocation is tracked via a doubly linked list. Each
- * element contains the caller's component, module name, function name, and
- * line number. acpi_ut_allocate and acpi_ut_allocate_zeroed call
- * acpi_ut_track_allocation to add an element to the list; deletion
- * occurs in the body of acpi_ut_free.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("uttrack")
-
-/* Local prototypes */
-static struct acpi_debug_mem_block *acpi_ut_find_allocation(struct
-                                                            acpi_debug_mem_block
-                                                            *allocation);
-
-static acpi_status
-acpi_ut_track_allocation(struct acpi_debug_mem_block *address,
-                         acpi_size size,
-                         u8 alloc_type,
-                         u32 component, const char *module, u32 line);
-
-static acpi_status
-acpi_ut_remove_allocation(struct acpi_debug_mem_block *address,
-                          u32 component, const char *module, u32 line);
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_create_list
- *
- * PARAMETERS:  cache_name      - Ascii name for the cache
- *              object_size     - Size of each cached object
- *              return_cache    - Where the new cache object is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a local memory list for tracking purposed
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ut_create_list(char *list_name,
-                    u16 object_size, struct acpi_memory_list **return_cache)
-{
-        struct acpi_memory_list *cache;
-
-        cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
-        if (!cache) {
-                return (AE_NO_MEMORY);
-        }
-
-        ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
-
-        cache->list_name = list_name;
-        cache->object_size = object_size;
-
-        *return_cache = cache;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_allocate_and_track
- *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: The subsystem's equivalent of malloc.
- *
- ******************************************************************************/
-
-void *acpi_ut_allocate_and_track(acpi_size size,
-                                 u32 component, const char *module, u32 line)
-{
-        struct acpi_debug_mem_block *allocation;
-        acpi_status status;
-
-        allocation =
-            acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),
-                             component, module, line);
-        if (!allocation) {
-                return (NULL);
-        }
-
-        status = acpi_ut_track_allocation(allocation, size,
-                                          ACPI_MEM_MALLOC, component, module,
-                                          line);
-        if (ACPI_FAILURE(status)) {
-                acpi_os_free(allocation);
-                return (NULL);
-        }
-
-        acpi_gbl_global_list->total_allocated++;
-        acpi_gbl_global_list->total_size += (u32)size;
-        acpi_gbl_global_list->current_total_size += (u32)size;
-        if (acpi_gbl_global_list->current_total_size >
-            acpi_gbl_global_list->max_occupied) {
-                acpi_gbl_global_list->max_occupied =
-                    acpi_gbl_global_list->current_total_size;
-        }
-
-        return ((void *)&allocation->user_space);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_allocate_zeroed_and_track
- *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: Subsystem equivalent of calloc.
- *
- ******************************************************************************/
-
-void *acpi_ut_allocate_zeroed_and_track(acpi_size size,
-                                        u32 component,
-                                        const char *module, u32 line)
-{
-        struct acpi_debug_mem_block *allocation;
-        acpi_status status;
-
-        allocation =
-            acpi_ut_allocate_zeroed(size + sizeof(struct acpi_debug_mem_header),
-                                    component, module, line);
-        if (!allocation) {
-
-                /* Report allocation error */
-
-                ACPI_ERROR((module, line,
-                            "Could not allocate size %u", (u32)size));
-                return (NULL);
-        }
-
-        status = acpi_ut_track_allocation(allocation, size,
-                                          ACPI_MEM_CALLOC, component, module,
-                                          line);
-        if (ACPI_FAILURE(status)) {
-                acpi_os_free(allocation);
-                return (NULL);
-        }
-
-        acpi_gbl_global_list->total_allocated++;
-        acpi_gbl_global_list->total_size += (u32)size;
-        acpi_gbl_global_list->current_total_size += (u32)size;
-        if (acpi_gbl_global_list->current_total_size >
-            acpi_gbl_global_list->max_occupied) {
-                acpi_gbl_global_list->max_occupied =
-                    acpi_gbl_global_list->current_total_size;
-        }
-
-        return ((void *)&allocation->user_space);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_free_and_track
- *
- * PARAMETERS:  allocation          - Address of the memory to deallocate
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      None
- *
- * DESCRIPTION: Frees the memory at Allocation
- *
- ******************************************************************************/
-
-void
-acpi_ut_free_and_track(void *allocation,
-                       u32 component, const char *module, u32 line)
-{
-        struct acpi_debug_mem_block *debug_block;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE_PTR(ut_free, allocation);
-
-        if (NULL == allocation) {
-                ACPI_ERROR((module, line, "Attempt to delete a NULL address"));
-
-                return_VOID;
-        }
-
-        debug_block = ACPI_CAST_PTR(struct acpi_debug_mem_block,
-                                    (((char *)allocation) -
-                                     sizeof(struct acpi_debug_mem_header)));
-
-        acpi_gbl_global_list->total_freed++;
-        acpi_gbl_global_list->current_total_size -= debug_block->size;
-
-        status = acpi_ut_remove_allocation(debug_block,
-                                           component, module, line);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Could not free memory"));
-        }
-
-        acpi_os_free(debug_block);
-        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));
-        return_VOID;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_find_allocation
- *
- * PARAMETERS:  allocation              - Address of allocated memory
- *
- * RETURN:      Three cases:
- *              1) List is empty, NULL is returned.
- *              2) Element was found. Returns Allocation parameter.
- *              3) Element was not found. Returns position where it should be
- *                  inserted into the list.
- *
- * DESCRIPTION: Searches for an element in the global allocation tracking list.
- *              If the element is not found, returns the location within the
- *              list where the element should be inserted.
- *
- *              Note: The list is ordered by larger-to-smaller addresses.
- *
- *              This global list is used to detect memory leaks in ACPICA as
- *              well as other issues such as an attempt to release the same
- *              internal object more than once. Although expensive as far
- *              as cpu time, this list is much more helpful for finding these
- *              types of issues than using memory leak detectors outside of
- *              the ACPICA code.
- *
- ******************************************************************************/
-
-static struct acpi_debug_mem_block *acpi_ut_find_allocation(struct
-                                                            acpi_debug_mem_block
-                                                            *allocation)
-{
-        struct acpi_debug_mem_block *element;
-
-        element = acpi_gbl_global_list->list_head;
-        if (!element) {
-                return (NULL);
-        }
-
-        /*
-         * Search for the address.
-         *
-         * Note: List is ordered by larger-to-smaller addresses, on the
-         * assumption that a new allocation usually has a larger address
-         * than previous allocations.
-         */
-        while (element > allocation) {
-
-                /* Check for end-of-list */
-
-                if (!element->next) {
-                        return (element);
-                }
-
-                element = element->next;
-        }
-
-        if (element == allocation) {
-                return (element);
-        }
-
-        return (element->previous);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_track_allocation
- *
- * PARAMETERS:  allocation          - Address of allocated memory
- *              size                - Size of the allocation
- *              alloc_type          - MEM_MALLOC or MEM_CALLOC
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Inserts an element into the global allocation tracking list.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
-                         acpi_size size,
-                         u8 alloc_type,
-                         u32 component, const char *module, u32 line)
-{
-        struct acpi_memory_list *mem_list;
-        struct acpi_debug_mem_block *element;
-        acpi_status status = AE_OK;
-
-        ACPI_FUNCTION_TRACE_PTR(ut_track_allocation, allocation);
-
-        if (acpi_gbl_disable_mem_tracking) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        mem_list = acpi_gbl_global_list;
-        status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * Search the global list for this address to make sure it is not
-         * already present. This will catch several kinds of problems.
-         */
-        element = acpi_ut_find_allocation(allocation);
-        if (element == allocation) {
-                ACPI_ERROR((AE_INFO,
-                            "UtTrackAllocation: Allocation (%p) already present in global list!",
-                            allocation));
-                goto unlock_and_exit;
-        }
-
-        /* Fill in the instance data */
-
-        allocation->size = (u32)size;
-        allocation->alloc_type = alloc_type;
-        allocation->component = component;
-        allocation->line = line;
-
-        ACPI_STRNCPY(allocation->module, module, ACPI_MAX_MODULE_NAME);
-        allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
-
-        if (!element) {
-
-                /* Insert at list head */
-
-                if (mem_list->list_head) {
-                        ((struct acpi_debug_mem_block *)(mem_list->list_head))->
-                            previous = allocation;
-                }
-
-                allocation->next = mem_list->list_head;
-                allocation->previous = NULL;
-
-                mem_list->list_head = allocation;
-        } else {
-                /* Insert after element */
-
-                allocation->next = element->next;
-                allocation->previous = element;
-
-                if (element->next) {
-                        (element->next)->previous = allocation;
-                }
-
-                element->next = allocation;
-        }
-
-      unlock_and_exit:
-        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_remove_allocation
- *
- * PARAMETERS:  allocation          - Address of allocated memory
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Deletes an element from the global allocation tracking list.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
-                          u32 component, const char *module, u32 line)
-{
-        struct acpi_memory_list *mem_list;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(ut_remove_allocation);
-
-        if (acpi_gbl_disable_mem_tracking) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        mem_list = acpi_gbl_global_list;
-        if (NULL == mem_list->list_head) {
-
-                /* No allocations! */
-
-                ACPI_ERROR((module, line,
-                            "Empty allocation list, nothing to free!"));
-
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Unlink */
-
-        if (allocation->previous) {
-                (allocation->previous)->next = allocation->next;
-        } else {
-                mem_list->list_head = allocation->next;
-        }
-
-        if (allocation->next) {
-                (allocation->next)->previous = allocation->previous;
-        }
-
-        /* Mark the segment as deleted */
-
-        ACPI_MEMSET(&allocation->user_space, 0xEA, allocation->size);
-
-        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Freeing size 0%X\n",
-                          allocation->size));
-
-        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_dump_allocation_info
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print some info about the outstanding allocations.
- *
- ******************************************************************************/
-
-void acpi_ut_dump_allocation_info(void)
-{
-/*
-        struct acpi_memory_list         *mem_list;
-*/
-
-        ACPI_FUNCTION_TRACE(ut_dump_allocation_info);
-
-/*
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Current allocations",
-                          mem_list->current_count,
-                          ROUND_UP_TO_1K (mem_list->current_size)));
-
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Max concurrent allocations",
-                          mem_list->max_concurrent_count,
-                          ROUND_UP_TO_1K (mem_list->max_concurrent_size)));
-
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Total (all) internal objects",
-                          running_object_count,
-                          ROUND_UP_TO_1K (running_object_size)));
-
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Total (all) allocations",
-                          running_alloc_count,
-                          ROUND_UP_TO_1K (running_alloc_size)));
-
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Current Nodes",
-                          acpi_gbl_current_node_count,
-                          ROUND_UP_TO_1K (acpi_gbl_current_node_size)));
-
-        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
-                          ("%30s: %4d (%3d Kb)\n", "Max Nodes",
-                          acpi_gbl_max_concurrent_node_count,
-                          ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count *
-                                         sizeof (struct acpi_namespace_node)))));
-*/
-        return_VOID;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_dump_allocations
- *
- * PARAMETERS:  component           - Component(s) to dump info for.
- *              module              - Module to dump info for. NULL means all.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print a list of all outstanding allocations.
- *
- ******************************************************************************/
-
-void acpi_ut_dump_allocations(u32 component, const char *module)
-{
-        struct acpi_debug_mem_block *element;
-        union acpi_descriptor *descriptor;
-        u32 num_outstanding = 0;
-        u8 descriptor_type;
-
-        ACPI_FUNCTION_TRACE(ut_dump_allocations);
-
-        if (acpi_gbl_disable_mem_tracking) {
-                return_VOID;
-        }
-
-        /*
-         * Walk the allocation list.
-         */
-        if (ACPI_FAILURE(acpi_ut_acquire_mutex(ACPI_MTX_MEMORY))) {
-                return_VOID;
-        }
-
-        element = acpi_gbl_global_list->list_head;
-        while (element) {
-                if ((element->component & component) &&
-                    ((module == NULL)
-                     || (0 == ACPI_STRCMP(module, element->module)))) {
-                        descriptor =
-                            ACPI_CAST_PTR(union acpi_descriptor,
-                                          &element->user_space);
-
-                        if (element->size <
-                            sizeof(struct acpi_common_descriptor)) {
-                                acpi_os_printf("%p Length 0x%04X %9.9s-%u "
-                                               "[Not a Descriptor - too small]\n",
-                                               descriptor, element->size,
-                                               element->module, element->line);
-                        } else {
-                                /* Ignore allocated objects that are in a cache */
-
-                                if (ACPI_GET_DESCRIPTOR_TYPE(descriptor) !=
-                                    ACPI_DESC_TYPE_CACHED) {
-                                        acpi_os_printf
-                                            ("%p Length 0x%04X %9.9s-%u [%s] ",
-                                             descriptor, element->size,
-                                             element->module, element->line,
-                                             acpi_ut_get_descriptor_name
-                                             (descriptor));
-
-                                        /* Validate the descriptor type using Type field and length */
-
-                                        descriptor_type = 0;    /* Not a valid descriptor type */
-
-                                        switch (ACPI_GET_DESCRIPTOR_TYPE
-                                                (descriptor)) {
-                                        case ACPI_DESC_TYPE_OPERAND:
-                                                if (element->size ==
-                                                    sizeof(union
-                                                           acpi_operand_object))
-                                                {
-                                                        descriptor_type =
-                                                            ACPI_DESC_TYPE_OPERAND;
-                                                }
-                                                break;
-
-                                        case ACPI_DESC_TYPE_PARSER:
-                                                if (element->size ==
-                                                    sizeof(union
-                                                           acpi_parse_object)) {
-                                                        descriptor_type =
-                                                            ACPI_DESC_TYPE_PARSER;
-                                                }
-                                                break;
-
-                                        case ACPI_DESC_TYPE_NAMED:
-                                                if (element->size ==
-                                                    sizeof(struct
-                                                           acpi_namespace_node))
-                                                {
-                                                        descriptor_type =
-                                                            ACPI_DESC_TYPE_NAMED;
-                                                }
-                                                break;
-
-                                        default:
-                                                break;
-                                        }
-
-                                        /* Display additional info for the major descriptor types */
-
-                                        switch (descriptor_type) {
-                                        case ACPI_DESC_TYPE_OPERAND:
-                                                acpi_os_printf
-                                                    ("%12.12s RefCount 0x%04X\n",
-                                                     acpi_ut_get_type_name
-                                                     (descriptor->object.common.
-                                                      type),
-                                                     descriptor->object.common.
-                                                     reference_count);
-                                                break;
-
-                                        case ACPI_DESC_TYPE_PARSER:
-                                                acpi_os_printf
-                                                    ("AmlOpcode 0x%04hX\n",
-                                                     descriptor->op.asl.
-                                                     aml_opcode);
-                                                break;
-
-                                        case ACPI_DESC_TYPE_NAMED:
-                                                acpi_os_printf("%4.4s\n",
-                                                               acpi_ut_get_node_name
-                                                               (&descriptor->
-                                                                node));
-                                                break;
-
-                                        default:
-                                                acpi_os_printf("\n");
-                                                break;
-                                        }
-                                }
-                        }
-
-                        num_outstanding++;
-                }
-
-                element = element->next;
-        }
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_MEMORY);
-
-        /* Print summary */
-
-        if (!num_outstanding) {
-                ACPI_INFO((AE_INFO, "No outstanding allocations"));
-        } else {
-                ACPI_ERROR((AE_INFO, "%u(0x%X) Outstanding allocations",
-                            num_outstanding, num_outstanding));
-        }
-
-        return_VOID;
-}
-
-#endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 390db0ca5e2..98ad125e14f 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -1,11 +1,11 @@
 /******************************************************************************
  *
- * Module Name: utxface - External interfaces, miscellaneous utility functions
+ * Module Name: utxface - External interfaces for "global" ACPI functions
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,18 +41,277 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
 #include "acnamesp.h"
 #include "acdebug.h"
 #include "actables.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxface")
 
+#ifndef ACPI_ASL_COMPILER
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_initialize_subsystem
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initializes all global variables.  This is the first function
+ *              called, so any early initialization belongs here.
+ *
+ ******************************************************************************/
+acpi_status __init acpi_initialize_subsystem(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
+
+        acpi_gbl_startup_flags = ACPI_SUBSYSTEM_INITIALIZE;
+        ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
+
+        /* Initialize the OS-Dependent layer */
+
+        status = acpi_os_initialize();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "During OSL initialization"));
+                return_ACPI_STATUS(status);
+        }
+
+        /* Initialize all globals used by the subsystem */
+
+        status = acpi_ut_init_globals();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During initialization of globals"));
+                return_ACPI_STATUS(status);
+        }
+
+        /* Create the default mutex objects */
+
+        status = acpi_ut_mutex_initialize();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Global Mutex creation"));
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Initialize the namespace manager and
+         * the root of the namespace tree
+         */
+        status = acpi_ns_root_initialize();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Namespace initialization"));
+                return_ACPI_STATUS(status);
+        }
+
+        /* Initialize the global OSI interfaces list with the static names */
+
+        status = acpi_ut_initialize_interfaces();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During OSI interfaces initialization"));
+                return_ACPI_STATUS(status);
+        }
+
+        /* If configured, initialize the AML debugger */
+
+        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_subsystem
+ *
+ * PARAMETERS:  Flags           - Init/enable Options
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Completes the subsystem initialization including hardware.
+ *              Puts system into ACPI mode if it isn't already.
+ *
+ ******************************************************************************/
+acpi_status acpi_enable_subsystem(u32 flags)
+{
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
+
+        /* Enable ACPI mode */
+
+        if (!(flags & ACPI_NO_ACPI_ENABLE)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Going into ACPI mode\n"));
+
+                acpi_gbl_original_mode = acpi_hw_get_mode();
+
+                status = acpi_enable();
+                if (ACPI_FAILURE(status)) {
+                        ACPI_WARNING((AE_INFO, "AcpiEnable failed"));
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Obtain a permanent mapping for the FACS. This is required for the
+         * Global Lock and the Firmware Waking Vector
+         */
+        status = acpi_tb_initialize_facs();
+        if (ACPI_FAILURE(status)) {
+                ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Install the default op_region handlers. These are installed unless
+         * other handlers have already been installed via the
+         * install_address_space_handler interface.
+         */
+        if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Installing default address space handlers\n"));
+
+                status = acpi_ev_install_region_handlers();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Initialize ACPI Event handling (Fixed and General Purpose)
+         *
+         * Note1: We must have the hardware and events initialized before we can
+         * execute any control methods safely. Any control method can require
+         * ACPI hardware support, so the hardware must be fully initialized before
+         * any method execution!
+         *
+         * Note2: Fixed events are initialized and enabled here. GPEs are
+         * initialized, but cannot be enabled until after the hardware is
+         * completely initialized (SCI and global_lock activated)
+         */
+        if (!(flags & ACPI_NO_EVENT_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Initializing ACPI events\n"));
+
+                status = acpi_ev_initialize_events();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Install the SCI handler and Global Lock handler. This completes the
+         * hardware initialization.
+         */
+        if (!(flags & ACPI_NO_HANDLER_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Installing SCI/GL handlers\n"));
+
+                status = acpi_ev_install_xrupt_handlers();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_initialize_objects
+ *
+ * PARAMETERS:  Flags           - Init/enable Options
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Completes namespace initialization by initializing device
+ *              objects and executing AML code for Regions, buffers, etc.
+ *
+ ******************************************************************************/
+acpi_status acpi_initialize_objects(u32 flags)
+{
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE(acpi_initialize_objects);
+
+        /*
+         * Run all _REG methods
+         *
+         * Note: Any objects accessed by the _REG methods will be automatically
+         * initialized, even if they contain executable AML (see the call to
+         * acpi_ns_initialize_objects below).
+         */
+        if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Executing _REG OpRegion methods\n"));
+
+                status = acpi_ev_initialize_op_regions();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Execute any module-level code that was detected during the table load
+         * phase. Although illegal since ACPI 2.0, there are many machines that
+         * contain this type of code. Each block of detected executable AML code
+         * outside of any control method is wrapped with a temporary control
+         * method object and placed on a global list. The methods on this list
+         * are executed below.
+         */
+        acpi_ns_exec_module_code_list();
+
+        /*
+         * Initialize the objects that remain uninitialized. This runs the
+         * executable AML that may be part of the declaration of these objects:
+         * operation_regions, buffer_fields, Buffers, and Packages.
+         */
+        if (!(flags & ACPI_NO_OBJECT_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Completing Initialization of ACPI Objects\n"));
+
+                status = acpi_ns_initialize_objects();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Initialize all device objects in the namespace. This runs the device
+         * _STA and _INI methods.
+         */
+        if (!(flags & ACPI_NO_DEVICE_INIT)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "[Init] Initializing ACPI Devices\n"));
+
+                status = acpi_ns_initialize_devices();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Empty the caches (delete the cached objects) on the assumption that
+         * the table load filled them up more than they will be at runtime --
+         * thus wasting non-paged memory.
+         */
+        status = acpi_purge_cached_objects();
+
+        acpi_gbl_startup_flags |= ACPI_INITIALIZED_OK;
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
+
+#endif
 /*******************************************************************************
  *
  * FUNCTION:    acpi_terminate
@@ -144,10 +403,10 @@ ACPI_EXPORT_SYMBOL(acpi_subsystem_status)
  * PARAMETERS:  out_buffer      - A buffer to receive the resources for the
  *                                device
  *
- * RETURN:      status          - the status of the call
+ * RETURN:      Status          - the status of the call
  *
  * DESCRIPTION: This function is called to get information about the current
- *              state of the ACPI subsystem. It will return system information
+ *              state of the ACPI subsystem.  It will return system information
  *              in the out_buffer.
  *
  *              If the function fails an appropriate status will be returned
@@ -215,8 +474,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_system_info)
  *
  * FUNCTION:    acpi_install_initialization_handler
  *
- * PARAMETERS:  handler             - Callback procedure
- *              function            - Not (currently) used, see below
+ * PARAMETERS:  Handler             - Callback procedure
+ *              Function            - Not (currently) used, see below
  *
  * RETURN:      Status
  *
@@ -238,7 +497,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
         }
 
         acpi_gbl_init_handler = handler;
-        return (AE_OK);
+        return AE_OK;
 }
 
 ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
@@ -263,7 +522,6 @@ acpi_status acpi_purge_cached_objects(void)
         (void)acpi_os_purge_cache(acpi_gbl_operand_cache);
         (void)acpi_os_purge_cache(acpi_gbl_ps_node_cache);
         (void)acpi_os_purge_cache(acpi_gbl_ps_node_ext_cache);
-
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -354,7 +612,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_interface)
  *
  * FUNCTION:    acpi_install_interface_handler
  *
- * PARAMETERS:  handler             - The _OSI interface handler to install
+ * PARAMETERS:  Handler             - The _OSI interface handler to install
  *                                    NULL means "remove existing handler"
  *
  * RETURN:      Status
@@ -381,128 +639,4 @@ acpi_status acpi_install_interface_handler(acpi_interface_handler handler)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_install_interface_handler)
-
-/*****************************************************************************
- *
- * FUNCTION:    acpi_check_address_range
- *
- * PARAMETERS:  space_id            - Address space ID
- *              address             - Start address
- *              length              - Length
- *              warn                - TRUE if warning on overlap desired
- *
- * RETURN:      Count of the number of conflicts detected.
- *
- * DESCRIPTION: Check if the input address range overlaps any of the
- *              ASL operation region address ranges.
- *
- ****************************************************************************/
-u32
-acpi_check_address_range(acpi_adr_space_type space_id,
-                         acpi_physical_address address,
-                         acpi_size length, u8 warn)
-{
-        u32 overlaps;
-        acpi_status status;
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return (0);
-        }
-
-        overlaps = acpi_ut_check_address_range(space_id, address,
-                                               (u32)length, warn);
-
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return (overlaps);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_check_address_range)
 #endif                          /* !ACPI_ASL_COMPILER */
-/*******************************************************************************
- *
- * FUNCTION:    acpi_decode_pld_buffer
- *
- * PARAMETERS:  in_buffer           - Buffer returned by _PLD method
- *              length              - Length of the in_buffer
- *              return_buffer       - Where the decode buffer is returned
- *
- * RETURN:      Status and the decoded _PLD buffer. User must deallocate
- *              the buffer via ACPI_FREE.
- *
- * DESCRIPTION: Decode the bit-packed buffer returned by the _PLD method into
- *              a local struct that is much more useful to an ACPI driver.
- *
- ******************************************************************************/
-acpi_status
-acpi_decode_pld_buffer(u8 *in_buffer,
-                       acpi_size length, struct acpi_pld_info ** return_buffer)
-{
-        struct acpi_pld_info *pld_info;
-        u32 *buffer = ACPI_CAST_PTR(u32, in_buffer);
-        u32 dword;
-
-        /* Parameter validation */
-
-        if (!in_buffer || !return_buffer || (length < 16)) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        pld_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pld_info));
-        if (!pld_info) {
-                return (AE_NO_MEMORY);
-        }
-
-        /* First 32-bit DWord */
-
-        ACPI_MOVE_32_TO_32(&dword, &buffer[0]);
-        pld_info->revision = ACPI_PLD_GET_REVISION(&dword);
-        pld_info->ignore_color = ACPI_PLD_GET_IGNORE_COLOR(&dword);
-        pld_info->color = ACPI_PLD_GET_COLOR(&dword);
-
-        /* Second 32-bit DWord */
-
-        ACPI_MOVE_32_TO_32(&dword, &buffer[1]);
-        pld_info->width = ACPI_PLD_GET_WIDTH(&dword);
-        pld_info->height = ACPI_PLD_GET_HEIGHT(&dword);
-
-        /* Third 32-bit DWord */
-
-        ACPI_MOVE_32_TO_32(&dword, &buffer[2]);
-        pld_info->user_visible = ACPI_PLD_GET_USER_VISIBLE(&dword);
-        pld_info->dock = ACPI_PLD_GET_DOCK(&dword);
-        pld_info->lid = ACPI_PLD_GET_LID(&dword);
-        pld_info->panel = ACPI_PLD_GET_PANEL(&dword);
-        pld_info->vertical_position = ACPI_PLD_GET_VERTICAL(&dword);
-        pld_info->horizontal_position = ACPI_PLD_GET_HORIZONTAL(&dword);
-        pld_info->shape = ACPI_PLD_GET_SHAPE(&dword);
-        pld_info->group_orientation = ACPI_PLD_GET_ORIENTATION(&dword);
-        pld_info->group_token = ACPI_PLD_GET_TOKEN(&dword);
-        pld_info->group_position = ACPI_PLD_GET_POSITION(&dword);
-        pld_info->bay = ACPI_PLD_GET_BAY(&dword);
-
-        /* Fourth 32-bit DWord */
-
-        ACPI_MOVE_32_TO_32(&dword, &buffer[3]);
-        pld_info->ejectable = ACPI_PLD_GET_EJECTABLE(&dword);
-        pld_info->ospm_eject_required = ACPI_PLD_GET_OSPM_EJECT(&dword);
-        pld_info->cabinet_number = ACPI_PLD_GET_CABINET(&dword);
-        pld_info->card_cage_number = ACPI_PLD_GET_CARD_CAGE(&dword);
-        pld_info->reference = ACPI_PLD_GET_REFERENCE(&dword);
-        pld_info->rotation = ACPI_PLD_GET_ROTATION(&dword);
-        pld_info->order = ACPI_PLD_GET_ORDER(&dword);
-
-        if (length >= ACPI_PLD_BUFFER_SIZE) {
-
-                /* Fifth 32-bit DWord (Revision 2 of _PLD) */
-
-                ACPI_MOVE_32_TO_32(&dword, &buffer[4]);
-                pld_info->vertical_offset = ACPI_PLD_GET_VERT_OFFSET(&dword);
-                pld_info->horizontal_offset = ACPI_PLD_GET_HORIZ_OFFSET(&dword);
-        }
-
-        *return_buffer = pld_info;
-        return (AE_OK);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_decode_pld_buffer)
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index d4d3826140d..916ae097c43 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -53,7 +52,7 @@ ACPI_MODULE_NAME("utxferror")
  * This module is used for the in-kernel ACPICA as well as the ACPICA
  * tools/applications.
  *
- * For the iASL compiler case, the output is redirected to stderr so that
+ * For the i_aSL compiler case, the output is redirected to stderr so that
  * any of the various ACPI errors and warnings do not appear in the output
  * files, for either the compiler or disassembler portions of the tool.
  */
@@ -70,7 +69,7 @@ extern FILE *acpi_gbl_output_file;
 
 #else
 /*
- * non-iASL case - no redirection, nothing to do
+ * non-i_aSL case - no redirection, nothing to do
  */
 #define ACPI_MSG_REDIRECT_BEGIN
 #define ACPI_MSG_REDIRECT_END
@@ -82,8 +81,6 @@ extern FILE *acpi_gbl_output_file;
 #define ACPI_MSG_EXCEPTION      "ACPI Exception: "
 #define ACPI_MSG_WARNING        "ACPI Warning: "
 #define ACPI_MSG_INFO           "ACPI: "
-#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Bug: Error: "
-#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Bug: Warning: "
 /*
  * Common message suffix
  */
@@ -95,7 +92,7 @@ extern FILE *acpi_gbl_output_file;
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              format              - Printf format string + additional args
+ *              Format              - Printf format string + additional args
  *
  * RETURN:      None
  *
@@ -126,8 +123,8 @@ ACPI_EXPORT_SYMBOL(acpi_error)
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              status              - Status to be formatted
- *              format              - Printf format string + additional args
+ *              Status              - Status to be formatted
+ *              Format              - Printf format string + additional args
  *
  * RETURN:      None
  *
@@ -161,7 +158,7 @@ ACPI_EXPORT_SYMBOL(acpi_exception)
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              format              - Printf format string + additional args
+ *              Format              - Printf format string + additional args
  *
  * RETURN:      None
  *
@@ -192,7 +189,7 @@ ACPI_EXPORT_SYMBOL(acpi_warning)
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              format              - Printf format string + additional args
+ *              Format              - Printf format string + additional args
  *
  * RETURN:      None
  *
@@ -220,72 +217,6 @@ acpi_info(const char *module_name, u32 line_number, const char *format, ...)
 
 ACPI_EXPORT_SYMBOL(acpi_info)
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_bios_error
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              format              - Printf format string + additional args
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print "ACPI Firmware Error" message with module/line/version
- *              info
- *
- ******************************************************************************/
-void ACPI_INTERNAL_VAR_XFACE
-acpi_bios_error(const char *module_name,
-                u32 line_number, const char *format, ...)
-{
-        va_list arg_list;
-
-        ACPI_MSG_REDIRECT_BEGIN;
-        acpi_os_printf(ACPI_MSG_BIOS_ERROR);
-
-        va_start(arg_list, format);
-        acpi_os_vprintf(format, arg_list);
-        ACPI_MSG_SUFFIX;
-        va_end(arg_list);
-
-        ACPI_MSG_REDIRECT_END;
-}
-
-ACPI_EXPORT_SYMBOL(acpi_bios_error)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_bios_warning
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              format              - Printf format string + additional args
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print "ACPI Firmware Warning" message with module/line/version
- *              info
- *
- ******************************************************************************/
-void ACPI_INTERNAL_VAR_XFACE
-acpi_bios_warning(const char *module_name,
-                  u32 line_number, const char *format, ...)
-{
-        va_list arg_list;
-
-        ACPI_MSG_REDIRECT_BEGIN;
-        acpi_os_printf(ACPI_MSG_BIOS_WARNING);
-
-        va_start(arg_list, format);
-        acpi_os_vprintf(format, arg_list);
-        ACPI_MSG_SUFFIX;
-        va_end(arg_list);
-
-        ACPI_MSG_REDIRECT_END;
-}
-
-ACPI_EXPORT_SYMBOL(acpi_bios_warning)
-
 /*
  * The remainder of this module contains internal error functions that may
  * be configured out.
@@ -339,9 +270,9 @@ acpi_ut_predefined_warning(const char *module_name,
  *
  * PARAMETERS:  module_name     - Caller's module name (for error output)
  *              line_number     - Caller's line number (for error output)
- *              pathname        - Full pathname to the node
+ *              Pathname        - Full pathname to the node
  *              node_flags      - From Namespace node for the method/object
- *              format          - Printf format string + additional args
+ *              Format          - Printf format string + additional args
  *
  * RETURN:      None
  *
@@ -408,7 +339,7 @@ acpi_ut_namespace_error(const char *module_name,
 
                 ACPI_MOVE_32_TO_32(&bad_name,
                                    ACPI_CAST_PTR(u32, internal_name));
-                acpi_os_printf("[0x%.8X] (NON-ASCII)", bad_name);
+                acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);
         } else {
                 /* Convert path to external format */
 
@@ -441,9 +372,9 @@ acpi_ut_namespace_error(const char *module_name,
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              message             - Error message to use on failure
+ *              Message             - Error message to use on failure
  *              prefix_node         - Prefix relative to the path
- *              path                - Path to the node (optional)
+ *              Path                - Path to the node (optional)
  *              method_status       - Execution status
  *
  * RETURN:      None
diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
deleted file mode 100644
index 14f523627a5..00000000000
--- a/drivers/acpi/acpica/utxfinit.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/******************************************************************************
- *
- * Module Name: utxfinit - External interfaces for ACPICA initialization
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <linux/export.h>
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acdebug.h"
-#include "actables.h"
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utxfinit")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_initialize_subsystem
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Initializes all global variables. This is the first function
- *              called, so any early initialization belongs here.
- *
- ******************************************************************************/
-acpi_status acpi_initialize_subsystem(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
-
-        acpi_gbl_startup_flags = ACPI_SUBSYSTEM_INITIALIZE;
-        ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
-
-        /* Initialize the OS-Dependent layer */
-
-        status = acpi_os_initialize();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "During OSL initialization"));
-                return_ACPI_STATUS(status);
-        }
-
-        /* Initialize all globals used by the subsystem */
-
-        status = acpi_ut_init_globals();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "During initialization of globals"));
-                return_ACPI_STATUS(status);
-        }
-
-        /* Create the default mutex objects */
-
-        status = acpi_ut_mutex_initialize();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "During Global Mutex creation"));
-                return_ACPI_STATUS(status);
-        }
-
-        /*
-         * Initialize the namespace manager and
-         * the root of the namespace tree
-         */
-        status = acpi_ns_root_initialize();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "During Namespace initialization"));
-                return_ACPI_STATUS(status);
-        }
-
-        /* Initialize the global OSI interfaces list with the static names */
-
-        status = acpi_ut_initialize_interfaces();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "During OSI interfaces initialization"));
-                return_ACPI_STATUS(status);
-        }
-
-        /* If configured, initialize the AML debugger */
-
-        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enable_subsystem
- *
- * PARAMETERS:  flags               - Init/enable Options
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Completes the subsystem initialization including hardware.
- *              Puts system into ACPI mode if it isn't already.
- *
- ******************************************************************************/
-acpi_status acpi_enable_subsystem(u32 flags)
-{
-        acpi_status status = AE_OK;
-
-        ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
-
-#if (!ACPI_REDUCED_HARDWARE)
-
-        /* Enable ACPI mode */
-
-        if (!(flags & ACPI_NO_ACPI_ENABLE)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Going into ACPI mode\n"));
-
-                acpi_gbl_original_mode = acpi_hw_get_mode();
-
-                status = acpi_enable();
-                if (ACPI_FAILURE(status)) {
-                        ACPI_WARNING((AE_INFO, "AcpiEnable failed"));
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Obtain a permanent mapping for the FACS. This is required for the
-         * Global Lock and the Firmware Waking Vector
-         */
-        status = acpi_tb_initialize_facs();
-        if (ACPI_FAILURE(status)) {
-                ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
-                return_ACPI_STATUS(status);
-        }
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
-        /*
-         * Install the default op_region handlers. These are installed unless
-         * other handlers have already been installed via the
-         * install_address_space_handler interface.
-         */
-        if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Installing default address space handlers\n"));
-
-                status = acpi_ev_install_region_handlers();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-#if (!ACPI_REDUCED_HARDWARE)
-        /*
-         * Initialize ACPI Event handling (Fixed and General Purpose)
-         *
-         * Note1: We must have the hardware and events initialized before we can
-         * execute any control methods safely. Any control method can require
-         * ACPI hardware support, so the hardware must be fully initialized before
-         * any method execution!
-         *
-         * Note2: Fixed events are initialized and enabled here. GPEs are
-         * initialized, but cannot be enabled until after the hardware is
-         * completely initialized (SCI and global_lock activated) and the various
-         * initialization control methods are run (_REG, _STA, _INI) on the
-         * entire namespace.
-         */
-        if (!(flags & ACPI_NO_EVENT_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Initializing ACPI events\n"));
-
-                status = acpi_ev_initialize_events();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Install the SCI handler and Global Lock handler. This completes the
-         * hardware initialization.
-         */
-        if (!(flags & ACPI_NO_HANDLER_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Installing SCI/GL handlers\n"));
-
-                status = acpi_ev_install_xrupt_handlers();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-#endif                          /* !ACPI_REDUCED_HARDWARE */
-
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_initialize_objects
- *
- * PARAMETERS:  flags               - Init/enable Options
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Completes namespace initialization by initializing device
- *              objects and executing AML code for Regions, buffers, etc.
- *
- ******************************************************************************/
-acpi_status acpi_initialize_objects(u32 flags)
-{
-        acpi_status status = AE_OK;
-
-        ACPI_FUNCTION_TRACE(acpi_initialize_objects);
-
-        /*
-         * Run all _REG methods
-         *
-         * Note: Any objects accessed by the _REG methods will be automatically
-         * initialized, even if they contain executable AML (see the call to
-         * acpi_ns_initialize_objects below).
-         */
-        if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Executing _REG OpRegion methods\n"));
-
-                status = acpi_ev_initialize_op_regions();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Execute any module-level code that was detected during the table load
-         * phase. Although illegal since ACPI 2.0, there are many machines that
-         * contain this type of code. Each block of detected executable AML code
-         * outside of any control method is wrapped with a temporary control
-         * method object and placed on a global list. The methods on this list
-         * are executed below.
-         */
-        acpi_ns_exec_module_code_list();
-
-        /*
-         * Initialize the objects that remain uninitialized. This runs the
-         * executable AML that may be part of the declaration of these objects:
-         * operation_regions, buffer_fields, Buffers, and Packages.
-         */
-        if (!(flags & ACPI_NO_OBJECT_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Completing Initialization of ACPI Objects\n"));
-
-                status = acpi_ns_initialize_objects();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Initialize all device objects in the namespace. This runs the device
-         * _STA and _INI methods.
-         */
-        if (!(flags & ACPI_NO_DEVICE_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Initializing ACPI Devices\n"));
-
-                status = acpi_ns_initialize_devices();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Empty the caches (delete the cached objects) on the assumption that
-         * the table load filled them up more than they will be at runtime --
-         * thus wasting non-paged memory.
-         */
-        status = acpi_purge_cached_objects();
-
-        acpi_gbl_startup_flags |= ACPI_INITIALIZED_OK;
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
diff --git a/drivers/acpi/acpica/utxfmutex.c b/drivers/acpi/acpica/utxfmutex.c
deleted file mode 100644
index 0a40a851b35..00000000000
--- a/drivers/acpi/acpica/utxfmutex.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- *
- * Module Name: utxfmutex - external AML mutex access functions
- *
- ******************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2012, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include "accommon.h"
-#include "acnamesp.h"
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utxfmutex")
-
-/* Local prototypes */
-static acpi_status
-acpi_ut_get_mutex_object(acpi_handle handle,
-                         acpi_string pathname,
-                         union acpi_operand_object **ret_obj);
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_mutex_object
- *
- * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              pathname            - Mutex pathname (optional)
- *              ret_obj             - Where the mutex object is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an AML mutex object. The mutex node is pointed to by
- *              Handle:Pathname. Either Handle or Pathname can be NULL, but
- *              not both.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ut_get_mutex_object(acpi_handle handle,
-                         acpi_string pathname,
-                         union acpi_operand_object **ret_obj)
-{
-        struct acpi_namespace_node *mutex_node;
-        union acpi_operand_object *mutex_obj;
-        acpi_status status;
-
-        /* Parameter validation */
-
-        if (!ret_obj || (!handle && !pathname)) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* Get a the namespace node for the mutex */
-
-        mutex_node = handle;
-        if (pathname != NULL) {
-                status = acpi_get_handle(handle, pathname,
-                                         ACPI_CAST_PTR(acpi_handle,
-                                                       &mutex_node));
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-        }
-
-        /* Ensure that we actually have a Mutex object */
-
-        if (!mutex_node || (mutex_node->type != ACPI_TYPE_MUTEX)) {
-                return (AE_TYPE);
-        }
-
-        /* Get the low-level mutex object */
-
-        mutex_obj = acpi_ns_get_attached_object(mutex_node);
-        if (!mutex_obj) {
-                return (AE_NULL_OBJECT);
-        }
-
-        *ret_obj = mutex_obj;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_acquire_mutex
- *
- * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              pathname            - Mutex pathname (optional)
- *              timeout             - Max time to wait for the lock (millisec)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Acquire an AML mutex. This is a device driver interface to
- *              AML mutex objects, and allows for transaction locking between
- *              drivers and AML code. The mutex node is pointed to by
- *              Handle:Pathname. Either Handle or Pathname can be NULL, but
- *              not both.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout)
-{
-        acpi_status status;
-        union acpi_operand_object *mutex_obj;
-
-        /* Get the low-level mutex associated with Handle:Pathname */
-
-        status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Acquire the OS mutex */
-
-        status = acpi_os_acquire_mutex(mutex_obj->mutex.os_mutex, timeout);
-        return (status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_release_mutex
- *
- * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              pathname            - Mutex pathname (optional)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Release an AML mutex. This is a device driver interface to
- *              AML mutex objects, and allows for transaction locking between
- *              drivers and AML code. The mutex node is pointed to by
- *              Handle:Pathname. Either Handle or Pathname can be NULL, but
- *              not both.
- *
- ******************************************************************************/
-
-acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname)
-{
-        acpi_status status;
-        union acpi_operand_object *mutex_obj;
-
-        /* Get the low-level mutex associated with Handle:Pathname */
-
-        status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Release the OS mutex */
-
-        acpi_os_release_mutex(mutex_obj->mutex.os_mutex);
-        return (AE_OK);
-}
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index f0c1ce95a0e..e3f47872ec2 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -14,6 +14,7 @@ config ACPI_APEI_GHES
         depends on ACPI_APEI && X86
         select ACPI_HED
         select IRQ_WORK
+        select LLIST
         select GENERIC_ALLOCATOR
         help
           Generic Hardware Error Source provides a way to report
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 00a783661d0..61540360d5c 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -34,13 +34,13 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/kref.h>
 #include <linux/rculist.h>
 #include <linux/interrupt.h>
 #include <linux/debugfs.h>
+#include <acpi/atomicio.h>
 
 #include "apei-internal.h"
 
@@ -70,7 +70,7 @@ int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val)
 {
         int rc;
 
-        rc = apei_read(val, &entry->register_region);
+        rc = acpi_atomic_read(val, &entry->register_region);
         if (rc)
                 return rc;
         *val >>= entry->register_region.bit_offset;
@@ -116,13 +116,13 @@ int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val)
         val <<= entry->register_region.bit_offset;
         if (entry->flags & APEI_EXEC_PRESERVE_REGISTER) {
                 u64 valr = 0;
-                rc = apei_read(&valr, &entry->register_region);
+                rc = acpi_atomic_read(&valr, &entry->register_region);
                 if (rc)
                         return rc;
                 valr &= ~(entry->mask << entry->register_region.bit_offset);
                 val |= valr;
         }
-        rc = apei_write(val, &entry->register_region);
+        rc = acpi_atomic_write(val, &entry->register_region);
 
         return rc;
 }
@@ -243,7 +243,7 @@ static int pre_map_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                return apei_map_generic_address(&entry->register_region);
+                return acpi_pre_map_gar(&entry->register_region);
 
         return 0;
 }
@@ -276,7 +276,7 @@ static int post_unmap_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                apei_unmap_generic_address(&entry->register_region);
+                acpi_post_unmap_gar(&entry->register_region);
 
         return 0;
 }
@@ -421,17 +421,6 @@ static int apei_resources_merge(struct apei_resources *resources1,
         return 0;
 }
 
-int apei_resources_add(struct apei_resources *resources,
-                       unsigned long start, unsigned long size,
-                       bool iomem)
-{
-        if (iomem)
-                return apei_res_add(&resources->iomem, start, size);
-        else
-                return apei_res_add(&resources->ioport, start, size);
-}
-EXPORT_SYMBOL_GPL(apei_resources_add);
-
 /*
  * EINJ has two groups of GARs (EINJ table entry and trigger table
  * entry), so common resources are subtracted from the trigger table
@@ -449,19 +438,8 @@ int apei_resources_sub(struct apei_resources *resources1,
 }
 EXPORT_SYMBOL_GPL(apei_resources_sub);
 
-static int apei_get_nvs_callback(__u64 start, __u64 size, void *data)
-{
-        struct apei_resources *resources = data;
-        return apei_res_add(&resources->iomem, start, size);
-}
-
-static int apei_get_nvs_resources(struct apei_resources *resources)
-{
-        return acpi_nvs_for_each_region(apei_get_nvs_callback, resources);
-}
-
 /*
- * IO memory/port resource management mechanism is used to check
+ * IO memory/port rersource management mechanism is used to check
  * whether memory/port area used by GARs conflicts with normal memory
  * or IO memory/port of devices.
  */
@@ -470,35 +448,21 @@ int apei_resources_request(struct apei_resources *resources,
 {
         struct apei_res *res, *res_bak = NULL;
         struct resource *r;
-        struct apei_resources nvs_resources;
         int rc;
 
         rc = apei_resources_sub(resources, &apei_resources_all);
         if (rc)
                 return rc;
 
-        /*
-         * Some firmware uses ACPI NVS region, that has been marked as
-         * busy, so exclude it from APEI resources to avoid false
-         * conflict.
-         */
-        apei_resources_init(&nvs_resources);
-        rc = apei_get_nvs_resources(&nvs_resources);
-        if (rc)
-                goto res_fini;
-        rc = apei_resources_sub(resources, &nvs_resources);
-        if (rc)
-                goto res_fini;
-
         rc = -EINVAL;
         list_for_each_entry(res, &resources->iomem, list) {
                 r = request_mem_region(res->start, res->end - res->start,
                                        desc);
                 if (!r) {
                         pr_err(APEI_PFX
-                "Can not request [mem %#010llx-%#010llx] for %s registers\n",
+                "Can not request iomem region <%016llx-%016llx> for GARs.\n",
                                (unsigned long long)res->start,
-                               (unsigned long long)res->end - 1, desc);
+                               (unsigned long long)res->end);
                         res_bak = res;
                         goto err_unmap_iomem;
                 }
@@ -508,9 +472,9 @@ int apei_resources_request(struct apei_resources *resources,
                 r = request_region(res->start, res->end - res->start, desc);
                 if (!r) {
                         pr_err(APEI_PFX
-                "Can not request [io  %#06llx-%#06llx] for %s registers\n",
+                "Can not request ioport region <%016llx-%016llx> for GARs.\n",
                                (unsigned long long)res->start,
-                               (unsigned long long)res->end - 1, desc);
+                               (unsigned long long)res->end);
                         res_bak = res;
                         goto err_unmap_ioport;
                 }
@@ -536,8 +500,6 @@ err_unmap_iomem:
                         break;
                 release_mem_region(res->start, res->end - res->start);
         }
-res_fini:
-        apei_resources_fini(&nvs_resources);
         return rc;
 }
 EXPORT_SYMBOL_GPL(apei_resources_request);
@@ -558,137 +520,38 @@ void apei_resources_release(struct apei_resources *resources)
 }
 EXPORT_SYMBOL_GPL(apei_resources_release);
 
-static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
-                                u32 *access_bit_width)
+static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr)
 {
-        u32 bit_width, bit_offset, access_size_code, space_id;
+        u32 width, space_id;
 
-        bit_width = reg->bit_width;
-        bit_offset = reg->bit_offset;
-        access_size_code = reg->access_width;
+        width = reg->bit_width;
         space_id = reg->space_id;
         /* Handle possible alignment issues */
         memcpy(paddr, &reg->address, sizeof(*paddr));
         if (!*paddr) {
                 pr_warning(FW_BUG APEI_PFX
-                           "Invalid physical address in GAR [0x%llx/%u/%u/%u/%u]\n",
-                           *paddr, bit_width, bit_offset, access_size_code,
-                           space_id);
+                           "Invalid physical address in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
                 return -EINVAL;
         }
 
-        if (access_size_code < 1 || access_size_code > 4) {
+        if ((width != 8) && (width != 16) && (width != 32) && (width != 64)) {
                 pr_warning(FW_BUG APEI_PFX
-                           "Invalid access size code in GAR [0x%llx/%u/%u/%u/%u]\n",
-                           *paddr, bit_width, bit_offset, access_size_code,
-                           space_id);
-                return -EINVAL;
-        }
-        *access_bit_width = 1UL << (access_size_code + 2);
-
-        /* Fixup common BIOS bug */
-        if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 &&
-            *access_bit_width < 32)
-                *access_bit_width = 32;
-
-        if ((bit_width + bit_offset) > *access_bit_width) {
-                pr_warning(FW_BUG APEI_PFX
-                           "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",
-                           *paddr, bit_width, bit_offset, access_size_code,
-                           space_id);
+                           "Invalid bit width in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
                 return -EINVAL;
         }
 
         if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
             space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
                 pr_warning(FW_BUG APEI_PFX
-                           "Invalid address space type in GAR [0x%llx/%u/%u/%u/%u]\n",
-                           *paddr, bit_width, bit_offset, access_size_code,
-                           space_id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-int apei_map_generic_address(struct acpi_generic_address *reg)
-{
-        int rc;
-        u32 access_bit_width;
-        u64 address;
-
-        rc = apei_check_gar(reg, &address, &access_bit_width);
-        if (rc)
-                return rc;
-        return acpi_os_map_generic_address(reg);
-}
-EXPORT_SYMBOL_GPL(apei_map_generic_address);
-
-/* read GAR in interrupt (including NMI) or process context */
-int apei_read(u64 *val, struct acpi_generic_address *reg)
-{
-        int rc;
-        u32 access_bit_width;
-        u64 address;
-        acpi_status status;
-
-        rc = apei_check_gar(reg, &address, &access_bit_width);
-        if (rc)
-                return rc;
-
-        *val = 0;
-        switch(reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                status = acpi_os_read_memory((acpi_physical_address) address,
-                                               val, access_bit_width);
-                if (ACPI_FAILURE(status))
-                        return -EIO;
-                break;
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                status = acpi_os_read_port(address, (u32 *)val,
-                                           access_bit_width);
-                if (ACPI_FAILURE(status))
-                        return -EIO;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(apei_read);
-
-/* write GAR in interrupt (including NMI) or process context */
-int apei_write(u64 val, struct acpi_generic_address *reg)
-{
-        int rc;
-        u32 access_bit_width;
-        u64 address;
-        acpi_status status;
-
-        rc = apei_check_gar(reg, &address, &access_bit_width);
-        if (rc)
-                return rc;
-
-        switch (reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                status = acpi_os_write_memory((acpi_physical_address) address,
-                                                val, access_bit_width);
-                if (ACPI_FAILURE(status))
-                        return -EIO;
-                break;
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                status = acpi_os_write_port(address, val, access_bit_width);
-                if (ACPI_FAILURE(status))
-                        return -EIO;
-                break;
-        default:
+                           "Invalid address space type in GAR [0x%llx/%u/%u]\n",
+                           *paddr, width, space_id);
                 return -EINVAL;
         }
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(apei_write);
 
 static int collect_res_callback(struct apei_exec_context *ctx,
                                 struct acpi_whea_header *entry,
@@ -697,24 +560,23 @@ static int collect_res_callback(struct apei_exec_context *ctx,
         struct apei_resources *resources = data;
         struct acpi_generic_address *reg = &entry->register_region;
         u8 ins = entry->instruction;
-        u32 access_bit_width;
         u64 paddr;
         int rc;
 
         if (!(ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER))
                 return 0;
 
-        rc = apei_check_gar(reg, &paddr, &access_bit_width);
+        rc = apei_check_gar(reg, &paddr);
         if (rc)
                 return rc;
 
         switch (reg->space_id) {
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                 return apei_res_add(&resources->iomem, paddr,
-                                    access_bit_width / 8);
+                                    reg->bit_width / 8);
         case ACPI_ADR_SPACE_SYSTEM_IO:
                 return apei_res_add(&resources->ioport, paddr,
-                                    access_bit_width / 8);
+                                    reg->bit_width / 8);
         default:
                 return -EINVAL;
         }
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index f220d642136..f57050e7a5e 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -7,8 +7,6 @@
 #define APEI_INTERNAL_H
 
 #include <linux/cper.h>
-#include <linux/acpi.h>
-#include <linux/acpi_io.h>
 
 struct apei_exec_context;
 
@@ -70,16 +68,6 @@ static inline int apei_exec_run_optional(struct apei_exec_context *ctx, u8 actio
 /* IP has been set in instruction function */
 #define APEI_EXEC_SET_IP        1
 
-int apei_map_generic_address(struct acpi_generic_address *reg);
-
-static inline void apei_unmap_generic_address(struct acpi_generic_address *reg)
-{
-        acpi_os_unmap_generic_address(reg);
-}
-
-int apei_read(u64 *val, struct acpi_generic_address *reg);
-int apei_write(u64 val, struct acpi_generic_address *reg);
-
 int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val);
 int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val);
 int apei_exec_read_register(struct apei_exec_context *ctx,
@@ -107,9 +95,6 @@ static inline void apei_resources_init(struct apei_resources *resources)
 }
 
 void apei_resources_fini(struct apei_resources *resources);
-int apei_resources_add(struct apei_resources *resources,
-                       unsigned long start, unsigned long size,
-                       bool iomem);
 int apei_resources_sub(struct apei_resources *resources1,
                        struct apei_resources *resources2);
 int apei_resources_request(struct apei_resources *resources,
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index e6defd86b42..5d4189464d6 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -362,7 +362,6 @@ void apei_estatus_print(const char *pfx,
                 gedata_len = gdata->error_data_length;
                 apei_estatus_print_section(pfx, gdata, sec_no);
                 data_len -= gedata_len + sizeof(*gdata);
-                gdata = (void *)(gdata + 1) + gedata_len;
                 sec_no++;
         }
 }
@@ -397,7 +396,6 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus)
                 if (gedata_len > data_len - sizeof(*gdata))
                         return -EINVAL;
                 data_len -= gedata_len + sizeof(*gdata);
-                gdata = (void *)(gdata + 1) + gedata_len;
         }
         if (data_len)
                 return -EINVAL;
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 8d457b55c55..589b96c3870 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -43,44 +43,6 @@
 #define FIRMWARE_TIMEOUT        (1 * NSEC_PER_MSEC)
 
 /*
- * ACPI version 5 provides a SET_ERROR_TYPE_WITH_ADDRESS action.
- */
-static int acpi5;
-
-struct set_error_type_with_address {
-        u32     type;
-        u32     vendor_extension;
-        u32     flags;
-        u32     apicid;
-        u64     memory_address;
-        u64     memory_address_range;
-        u32     pcie_sbdf;
-};
-enum {
-        SETWA_FLAGS_APICID = 1,
-        SETWA_FLAGS_MEM = 2,
-        SETWA_FLAGS_PCIE_SBDF = 4,
-};
-
-/*
- * Vendor extensions for platform specific operations
- */
-struct vendor_error_type_extension {
-        u32     length;
-        u32     pcie_sbdf;
-        u16     vendor_id;
-        u16     device_id;
-        u8      rev_id;
-        u8      reserved[3];
-};
-
-static u32 notrigger;
-
-static u32 vendor_flags;
-static struct debugfs_blob_wrapper vendor_blob;
-static char vendor_dev[64];
-
-/*
  * Some BIOSes allow parameters to the SET_ERROR_TYPE entries in the
  * EINJ table through an unpublished extension. Use with caution as
  * most will ignore the parameter and make their own choice of address
@@ -141,7 +103,15 @@ static struct apei_exec_ins_type einj_ins_type[] = {
  */
 static DEFINE_MUTEX(einj_mutex);
 
-static void *einj_param;
+static struct einj_parameter *einj_param;
+
+#ifndef writeq
+static inline void writeq(__u64 val, volatile void __iomem *addr)
+{
+        writel(val, addr);
+        writel(val >> 32, addr+4);
+}
+#endif
 
 static void einj_exec_ctx_init(struct apei_exec_context *ctx)
 {
@@ -188,30 +158,10 @@ static int einj_timedout(u64 *t)
         return 0;
 }
 
-static void check_vendor_extension(u64 paddr,
-                                   struct set_error_type_with_address *v5param)
-{
-        int     offset = v5param->vendor_extension;
-        struct  vendor_error_type_extension *v;
-        u32     sbdf;
-
-        if (!offset)
-                return;
-        v = acpi_os_map_memory(paddr + offset, sizeof(*v));
-        if (!v)
-                return;
-        sbdf = v->pcie_sbdf;
-        sprintf(vendor_dev, "%x:%x:%x.%x vendor_id=%x device_id=%x rev_id=%x\n",
-                sbdf >> 24, (sbdf >> 16) & 0xff,
-                (sbdf >> 11) & 0x1f, (sbdf >> 8) & 0x7,
-                 v->vendor_id, v->device_id, v->rev_id);
-        acpi_os_unmap_memory(v, sizeof(*v));
-}
-
-static void *einj_get_parameter_address(void)
+static u64 einj_get_parameter_address(void)
 {
         int i;
-        u64 paddrv4 = 0, paddrv5 = 0;
+        u64 paddr = 0;
         struct acpi_whea_header *entry;
 
         entry = EINJ_TAB_ENTRY(einj_tab);
@@ -220,40 +170,12 @@ static void *einj_get_parameter_address(void)
                     entry->instruction == ACPI_EINJ_WRITE_REGISTER &&
                     entry->register_region.space_id ==
                     ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                        memcpy(&paddrv4, &entry->register_region.address,
-                               sizeof(paddrv4));
-                if (entry->action == ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS &&
-                    entry->instruction == ACPI_EINJ_WRITE_REGISTER &&
-                    entry->register_region.space_id ==
-                    ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                        memcpy(&paddrv5, &entry->register_region.address,
-                               sizeof(paddrv5));
+                        memcpy(&paddr, &entry->register_region.address,
+                               sizeof(paddr));
                 entry++;
         }
-        if (paddrv5) {
-                struct set_error_type_with_address *v5param;
-
-                v5param = acpi_os_map_memory(paddrv5, sizeof(*v5param));
-                if (v5param) {
-                        acpi5 = 1;
-                        check_vendor_extension(paddrv5, v5param);
-                        return v5param;
-                }
-        }
-        if (param_extension && paddrv4) {
-                struct einj_parameter *v4param;
-
-                v4param = acpi_os_map_memory(paddrv4, sizeof(*v4param));
-                if (!v4param)
-                        return NULL;
-                if (v4param->reserved1 || v4param->reserved2) {
-                        acpi_os_unmap_memory(v4param, sizeof(*v4param));
-                        return NULL;
-                }
-                return v4param;
-        }
 
-        return NULL;
+        return paddr;
 }
 
 /* do sanity check to trigger table */
@@ -262,7 +184,7 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
         if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger))
                 return -EINVAL;
         if (trigger_tab->table_size > PAGE_SIZE ||
-            trigger_tab->table_size < trigger_tab->header_size)
+            trigger_tab->table_size <= trigger_tab->header_size)
                 return -EINVAL;
         if (trigger_tab->entry_count !=
             (trigger_tab->table_size - trigger_tab->header_size) /
@@ -272,29 +194,8 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
         return 0;
 }
 
-static struct acpi_generic_address *einj_get_trigger_parameter_region(
-        struct acpi_einj_trigger *trigger_tab, u64 param1, u64 param2)
-{
-        int i;
-        struct acpi_whea_header *entry;
-
-        entry = (struct acpi_whea_header *)
-                ((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
-        for (i = 0; i < trigger_tab->entry_count; i++) {
-                if (entry->action == ACPI_EINJ_TRIGGER_ERROR &&
-                entry->instruction == ACPI_EINJ_WRITE_REGISTER_VALUE &&
-                entry->register_region.space_id ==
-                        ACPI_ADR_SPACE_SYSTEM_MEMORY &&
-                (entry->register_region.address & param2) == (param1 & param2))
-                        return &entry->register_region;
-                entry++;
-        }
-
-        return NULL;
-}
 /* Execute instructions in trigger error action table */
-static int __einj_error_trigger(u64 trigger_paddr, u32 type,
-                                u64 param1, u64 param2)
+static int __einj_error_trigger(u64 trigger_paddr)
 {
         struct acpi_einj_trigger *trigger_tab = NULL;
         struct apei_exec_context trigger_ctx;
@@ -303,16 +204,14 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
         struct resource *r;
         u32 table_size;
         int rc = -EIO;
-        struct acpi_generic_address *trigger_param_region = NULL;
 
         r = request_mem_region(trigger_paddr, sizeof(*trigger_tab),
                                "APEI EINJ Trigger Table");
         if (!r) {
                 pr_err(EINJ_PFX
-        "Can not request [mem %#010llx-%#010llx] for Trigger table\n",
+        "Can not request iomem region <%016llx-%016llx> for Trigger table.\n",
                        (unsigned long long)trigger_paddr,
-                       (unsigned long long)trigger_paddr +
-                            sizeof(*trigger_tab) - 1);
+                       (unsigned long long)trigger_paddr+sizeof(*trigger_tab));
                 goto out;
         }
         trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
@@ -326,11 +225,6 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
                            "The trigger error action table is invalid\n");
                 goto out_rel_header;
         }
-
-        /* No action structures in the TRIGGER_ERROR table, nothing to do */
-        if (!trigger_tab->entry_count)
-                goto out_rel_header;
-
         rc = -EIO;
         table_size = trigger_tab->table_size;
         r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),
@@ -338,9 +232,9 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
                                "APEI EINJ Trigger Table");
         if (!r) {
                 pr_err(EINJ_PFX
-"Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n",
-                       (unsigned long long)trigger_paddr + sizeof(*trigger_tab),
-                       (unsigned long long)trigger_paddr + table_size - 1);
+"Can not request iomem region <%016llx-%016llx> for Trigger Table Entry.\n",
+                       (unsigned long long)trigger_paddr+sizeof(*trigger_tab),
+                       (unsigned long long)trigger_paddr + table_size);
                 goto out_rel_header;
         }
         iounmap(trigger_tab);
@@ -361,30 +255,6 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
         rc = apei_resources_sub(&trigger_resources, &einj_resources);
         if (rc)
                 goto out_fini;
-        /*
-         * Some firmware will access target address specified in
-         * param1 to trigger the error when injecting memory error.
-         * This will cause resource conflict with regular memory.  So
-         * remove it from trigger table resources.
-         */
-        if ((param_extension || acpi5) && (type & 0x0038) && param2) {
-                struct apei_resources addr_resources;
-                apei_resources_init(&addr_resources);
-                trigger_param_region = einj_get_trigger_parameter_region(
-                        trigger_tab, param1, param2);
-                if (trigger_param_region) {
-                        rc = apei_resources_add(&addr_resources,
-                                trigger_param_region->address,
-                                trigger_param_region->bit_width/8, true);
-                        if (rc)
-                                goto out_fini;
-                        rc = apei_resources_sub(&trigger_resources,
-                                        &addr_resources);
-                }
-                apei_resources_fini(&addr_resources);
-                if (rc)
-                        goto out_fini;
-        }
         rc = apei_resources_request(&trigger_resources, "APEI EINJ Trigger");
         if (rc)
                 goto out_fini;
@@ -423,56 +293,12 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
         if (rc)
                 return rc;
         apei_exec_ctx_set_input(&ctx, type);
-        if (acpi5) {
-                struct set_error_type_with_address *v5param = einj_param;
-
-                v5param->type = type;
-                if (type & 0x80000000) {
-                        switch (vendor_flags) {
-                        case SETWA_FLAGS_APICID:
-                                v5param->apicid = param1;
-                                break;
-                        case SETWA_FLAGS_MEM:
-                                v5param->memory_address = param1;
-                                v5param->memory_address_range = param2;
-                                break;
-                        case SETWA_FLAGS_PCIE_SBDF:
-                                v5param->pcie_sbdf = param1;
-                                break;
-                        }
-                        v5param->flags = vendor_flags;
-                } else {
-                        switch (type) {
-                        case ACPI_EINJ_PROCESSOR_CORRECTABLE:
-                        case ACPI_EINJ_PROCESSOR_UNCORRECTABLE:
-                        case ACPI_EINJ_PROCESSOR_FATAL:
-                                v5param->apicid = param1;
-                                v5param->flags = SETWA_FLAGS_APICID;
-                                break;
-                        case ACPI_EINJ_MEMORY_CORRECTABLE:
-                        case ACPI_EINJ_MEMORY_UNCORRECTABLE:
-                        case ACPI_EINJ_MEMORY_FATAL:
-                                v5param->memory_address = param1;
-                                v5param->memory_address_range = param2;
-                                v5param->flags = SETWA_FLAGS_MEM;
-                                break;
-                        case ACPI_EINJ_PCIX_CORRECTABLE:
-                        case ACPI_EINJ_PCIX_UNCORRECTABLE:
-                        case ACPI_EINJ_PCIX_FATAL:
-                                v5param->pcie_sbdf = param1;
-                                v5param->flags = SETWA_FLAGS_PCIE_SBDF;
-                                break;
-                        }
-                }
-        } else {
-                rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
-                if (rc)
-                        return rc;
-                if (einj_param) {
-                        struct einj_parameter *v4param = einj_param;
-                        v4param->param1 = param1;
-                        v4param->param2 = param2;
-                }
+        rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
+        if (rc)
+                return rc;
+        if (einj_param) {
+                writeq(param1, &einj_param->param1);
+                writeq(param2, &einj_param->param2);
         }
         rc = apei_exec_run(&ctx, ACPI_EINJ_EXECUTE_OPERATION);
         if (rc)
@@ -498,11 +324,9 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
         if (rc)
                 return rc;
         trigger_paddr = apei_exec_ctx_get_output(&ctx);
-        if (notrigger == 0) {
-                rc = __einj_error_trigger(trigger_paddr, type, param1, param2);
-                if (rc)
-                        return rc;
-        }
+        rc = __einj_error_trigger(trigger_paddr);
+        if (rc)
+                return rc;
         rc = apei_exec_run_optional(&ctx, ACPI_EINJ_END_OPERATION);
 
         return rc;
@@ -584,25 +408,15 @@ static int error_type_set(void *data, u64 val)
 {
         int rc;
         u32 available_error_type = 0;
-        u32 tval, vendor;
-
-        /*
-         * Vendor defined types have 0x80000000 bit set, and
-         * are not enumerated by ACPI_EINJ_GET_ERROR_TYPE
-         */
-        vendor = val & 0x80000000;
-        tval = val & 0x7fffffff;
 
         /* Only one error type can be specified */
-        if (tval & (tval - 1))
+        if (val & (val - 1))
+                return -EINVAL;
+        rc = einj_get_available_error_type(&available_error_type);
+        if (rc)
+                return rc;
+        if (!(val & available_error_type))
                 return -EINVAL;
-        if (!vendor) {
-                rc = einj_get_available_error_type(&available_error_type);
-                if (rc)
-                        return rc;
-                if (!(val & available_error_type))
-                        return -EINVAL;
-        }
         error_type = val;
 
         return 0;
@@ -641,6 +455,7 @@ static int einj_check_table(struct acpi_table_einj *einj_tab)
 static int __init einj_init(void)
 {
         int rc;
+        u64 param_paddr;
         acpi_status status;
         struct dentry *fentry;
         struct apei_exec_context ctx;
@@ -650,9 +465,10 @@ static int __init einj_init(void)
 
         status = acpi_get_table(ACPI_SIG_EINJ, 0,
                                 (struct acpi_table_header **)&einj_tab);
-        if (status == AE_NOT_FOUND)
+        if (status == AE_NOT_FOUND) {
+                pr_info(EINJ_PFX "Table is not found!\n");
                 return -ENODEV;
-        else if (ACPI_FAILURE(status)) {
+        } else if (ACPI_FAILURE(status)) {
                 const char *msg = acpi_format_exception(status);
                 pr_err(EINJ_PFX "Failed to get table, %s\n", msg);
                 return -EINVAL;
@@ -693,35 +509,23 @@ static int __init einj_init(void)
         rc = apei_exec_pre_map_gars(&ctx);
         if (rc)
                 goto err_release;
-
-        einj_param = einj_get_parameter_address();
-        if ((param_extension || acpi5) && einj_param) {
-                fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param1);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &error_param2);
-                if (!fentry)
-                        goto err_unmap;
-
-                fentry = debugfs_create_x32("notrigger", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &notrigger);
-                if (!fentry)
-                        goto err_unmap;
-        }
-
-        if (vendor_dev[0]) {
-                vendor_blob.data = vendor_dev;
-                vendor_blob.size = strlen(vendor_dev);
-                fentry = debugfs_create_blob("vendor", S_IRUSR,
-                                             einj_debug_dir, &vendor_blob);
-                if (!fentry)
-                        goto err_unmap;
-                fentry = debugfs_create_x32("vendor_flags", S_IRUSR | S_IWUSR,
-                                            einj_debug_dir, &vendor_flags);
-                if (!fentry)
-                        goto err_unmap;
+        if (param_extension) {
+                param_paddr = einj_get_parameter_address();
+                if (param_paddr) {
+                        einj_param = ioremap(param_paddr, sizeof(*einj_param));
+                        rc = -ENOMEM;
+                        if (!einj_param)
+                                goto err_unmap;
+                        fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,
+                                                    einj_debug_dir, &error_param1);
+                        if (!fentry)
+                                goto err_unmap;
+                        fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,
+                                                    einj_debug_dir, &error_param2);
+                        if (!fentry)
+                                goto err_unmap;
+                } else
+                        pr_warn(EINJ_PFX "Parameter extension is not supported.\n");
         }
 
         pr_info(EINJ_PFX "Error INJection is initialized.\n");
@@ -729,13 +533,8 @@ static int __init einj_init(void)
         return 0;
 
 err_unmap:
-        if (einj_param) {
-                acpi_size size = (acpi5) ?
-                        sizeof(struct set_error_type_with_address) :
-                        sizeof(struct einj_parameter);
-
-                acpi_os_unmap_memory(einj_param, size);
-        }
+        if (einj_param)
+                iounmap(einj_param);
         apei_exec_post_unmap_gars(&ctx);
 err_release:
         apei_resources_release(&einj_resources);
@@ -751,13 +550,8 @@ static void __exit einj_exit(void)
 {
         struct apei_exec_context ctx;
 
-        if (einj_param) {
-                acpi_size size = (acpi5) ?
-                        sizeof(struct set_error_type_with_address) :
-                        sizeof(struct einj_parameter);
-
-                acpi_os_unmap_memory(einj_param, size);
-        }
+        if (einj_param)
+                iounmap(einj_param);
         einj_exec_ctx_init(&ctx);
         apei_exec_post_unmap_gars(&ctx);
         apei_resources_release(&einj_resources);
diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index 04ab5c9d3ce..903549df809 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -111,17 +111,8 @@ retry_next:
         if (rc)
                 goto out;
         /* no more record */
-        if (id == APEI_ERST_INVALID_RECORD_ID) {
-                /*
-                 * If the persistent store is empty initially, the function
-                 * 'erst_read' below will return "-ENOENT" value. This causes
-                 * 'retry_next' label is entered again. The returned value
-                 * should be zero indicating the read operation is EOF.
-                 */
-                len = 0;
-
+        if (id == APEI_ERST_INVALID_RECORD_ID)
                 goto out;
-        }
 retry:
         rc = len = erst_read(id, erst_dbg_buf, erst_dbg_buf_len);
         /* The record may be cleared by others, try read next record */
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 6d894bfd8b8..2ca59dc69f7 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -917,7 +917,7 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
 {
         if ((erst_tab->header_length !=
              (sizeof(struct acpi_table_erst) - sizeof(erst_tab->header)))
-            && (erst_tab->header_length != sizeof(struct acpi_table_erst)))
+            && (erst_tab->header_length != sizeof(struct acpi_table_einj)))
                 return -EINVAL;
         if (erst_tab->header.length < sizeof(struct acpi_table_erst))
                 return -EINVAL;
@@ -931,14 +931,12 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
 
 static int erst_open_pstore(struct pstore_info *psi);
 static int erst_close_pstore(struct pstore_info *psi);
-static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
-                           struct timespec *time, char **buf,
-                           struct pstore_info *psi);
-static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
-                       u64 *id, unsigned int part, int count,
+static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
+                           struct timespec *time, struct pstore_info *psi);
+static u64 erst_writer(enum pstore_type_id type, unsigned int part,
                        size_t size, struct pstore_info *psi);
-static int erst_clearer(enum pstore_type_id type, u64 id, int count,
-                        struct timespec time, struct pstore_info *psi);
+static int erst_clearer(enum pstore_type_id type, u64 id,
+                        struct pstore_info *psi);
 
 static struct pstore_info erst_info = {
         .owner          = THIS_MODULE,
@@ -987,24 +985,18 @@ static int erst_close_pstore(struct pstore_info *psi)
         return 0;
 }
 
-static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
-                           struct timespec *time, char **buf,
-                           struct pstore_info *psi)
+static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
+                           struct timespec *time, struct pstore_info *psi)
 {
         int rc;
         ssize_t len = 0;
         u64 record_id;
-        struct cper_pstore_record *rcd;
-        size_t rcd_len = sizeof(*rcd) + erst_info.bufsize;
+        struct cper_pstore_record *rcd = (struct cper_pstore_record *)
+                                        (erst_info.buf - sizeof(*rcd));
 
         if (erst_disable)
                 return -ENODEV;
 
-        rcd = kmalloc(rcd_len, GFP_KERNEL);
-        if (!rcd) {
-                rc = -ENOMEM;
-                goto out;
-        }
 skip:
         rc = erst_get_record_id_next(&reader_pos, &record_id);
         if (rc)
@@ -1012,27 +1004,22 @@ skip:
 
         /* no more record */
         if (record_id == APEI_ERST_INVALID_RECORD_ID) {
-                rc = -EINVAL;
+                rc = -1;
                 goto out;
         }
 
-        len = erst_read(record_id, &rcd->hdr, rcd_len);
+        len = erst_read(record_id, &rcd->hdr, sizeof(*rcd) +
+                        erst_info.bufsize);
         /* The record may be cleared by others, try read next record */
         if (len == -ENOENT)
                 goto skip;
-        else if (len < sizeof(*rcd)) {
-                rc = -EIO;
+        else if (len < 0) {
+                rc = -1;
                 goto out;
         }
         if (uuid_le_cmp(rcd->hdr.creator_id, CPER_CREATOR_PSTORE) != 0)
                 goto skip;
 
-        *buf = kmalloc(len, GFP_KERNEL);
-        if (*buf == NULL) {
-                rc = -ENOMEM;
-                goto out;
-        }
-        memcpy(*buf, rcd->data, len - sizeof(*rcd));
         *id = record_id;
         if (uuid_le_cmp(rcd->sec_hdr.section_type,
                         CPER_SECTION_TYPE_DMESG) == 0)
@@ -1050,17 +1037,14 @@ skip:
         time->tv_nsec = 0;
 
 out:
-        kfree(rcd);
         return (rc < 0) ? rc : (len - sizeof(*rcd));
 }
 
-static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
-                       u64 *id, unsigned int part, int count,
+static u64 erst_writer(enum pstore_type_id type, unsigned int part,
                        size_t size, struct pstore_info *psi)
 {
         struct cper_pstore_record *rcd = (struct cper_pstore_record *)
                                         (erst_info.buf - sizeof(*rcd));
-        int ret;
 
         memset(rcd, 0, sizeof(*rcd));
         memcpy(rcd->hdr.signature, CPER_SIG_RECORD, CPER_SIG_SIZE);
@@ -1095,14 +1079,13 @@ static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
         }
         rcd->sec_hdr.section_severity = CPER_SEV_FATAL;
 
-        ret = erst_write(&rcd->hdr);
-        *id = rcd->hdr.record_id;
+        erst_write(&rcd->hdr);
 
-        return ret;
+        return rcd->hdr.record_id;
 }
 
-static int erst_clearer(enum pstore_type_id type, u64 id, int count,
-                        struct timespec time, struct pstore_info *psi)
+static int erst_clearer(enum pstore_type_id type, u64 id,
+                        struct pstore_info *psi)
 {
         return erst_clear(id);
 }
@@ -1127,9 +1110,10 @@ static int __init erst_init(void)
 
         status = acpi_get_table(ACPI_SIG_ERST, 0,
                                 (struct acpi_table_header **)&erst_tab);
-        if (status == AE_NOT_FOUND)
+        if (status == AE_NOT_FOUND) {
+                pr_info(ERST_PFX "Table is not found!\n");
                 goto err;
-        else if (ACPI_FAILURE(status)) {
+        } else if (ACPI_FAILURE(status)) {
                 const char *msg = acpi_format_exception(status);
                 pr_err(ERST_PFX "Failed to get table, %s\n", msg);
                 rc = -EINVAL;
@@ -1181,7 +1165,7 @@ static int __init erst_init(void)
                 goto err_release_erange;
 
         buf = kmalloc(erst_erange.size, GFP_KERNEL);
-        spin_lock_init(&erst_info.buf_lock);
+        mutex_init(&erst_info.buf_mutex);
         if (buf) {
                 erst_info.buf = buf + sizeof(struct cper_pstore_record);
                 erst_info.bufsize = erst_erange.size -
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 7ae2750bb45..0784f99a466 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
@@ -46,13 +45,11 @@
 #include <linux/irq_work.h>
 #include <linux/llist.h>
 #include <linux/genalloc.h>
-#include <linux/pci.h>
-#include <linux/aer.h>
 #include <acpi/apei.h>
+#include <acpi/atomicio.h>
 #include <acpi/hed.h>
 #include <asm/mce.h>
 #include <asm/tlbflush.h>
-#include <asm/nmi.h>
 
 #include "apei-internal.h"
 
@@ -120,7 +117,7 @@ struct ghes_estatus_cache {
         struct rcu_head rcu;
 };
 
-bool ghes_disable;
+int ghes_disable;
 module_param_named(disable, ghes_disable, bool, 0);
 
 static int ghes_panic_timeout   __read_mostly = 30;
@@ -301,7 +298,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         if (!ghes)
                 return ERR_PTR(-ENOMEM);
         ghes->generic = generic;
-        rc = apei_map_generic_address(&generic->error_status_address);
+        rc = acpi_pre_map_gar(&generic->error_status_address);
         if (rc)
                 goto err_free;
         error_block_length = generic->error_block_length;
@@ -321,7 +318,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         return ghes;
 
 err_unmap:
-        apei_unmap_generic_address(&generic->error_status_address);
+        acpi_post_unmap_gar(&generic->error_status_address);
 err_free:
         kfree(ghes);
         return ERR_PTR(rc);
@@ -330,7 +327,7 @@ err_free:
 static void ghes_fini(struct ghes *ghes)
 {
         kfree(ghes->estatus);
-        apei_unmap_generic_address(&ghes->generic->error_status_address);
+        acpi_post_unmap_gar(&ghes->generic->error_status_address);
 }
 
 enum {
@@ -401,7 +398,7 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
         u32 len;
         int rc;
 
-        rc = apei_read(&buf_paddr, &g->error_status_address);
+        rc = acpi_atomic_read(&buf_paddr, &g->error_status_address);
         if (rc) {
                 if (!silent && printk_ratelimit())
                         pr_warning(FW_WARN GHES_PFX
@@ -478,27 +475,6 @@ static void ghes_do_proc(const struct acpi_hest_generic_status *estatus)
                         }
 #endif
                 }
-#ifdef CONFIG_ACPI_APEI_PCIEAER
-                else if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
-                                      CPER_SEC_PCIE)) {
-                        struct cper_sec_pcie *pcie_err;
-                        pcie_err = (struct cper_sec_pcie *)(gdata+1);
-                        if (sev == GHES_SEV_RECOVERABLE &&
-                            sec_sev == GHES_SEV_RECOVERABLE &&
-                            pcie_err->validation_bits & CPER_PCIE_VALID_DEVICE_ID &&
-                            pcie_err->validation_bits & CPER_PCIE_VALID_AER_INFO) {
-                                unsigned int devfn;
-                                int aer_severity;
-                                devfn = PCI_DEVFN(pcie_err->device_id.device,
-                                                  pcie_err->device_id.function);
-                                aer_severity = cper_severity_to_aer(sev);
-                                aer_recover_queue(pcie_err->device_id.segment,
-                                                  pcie_err->device_id.bus,
-                                                  devfn, aer_severity);
-                        }
-
-                }
-#endif
         }
 }
 
@@ -506,22 +482,16 @@ static void __ghes_print_estatus(const char *pfx,
                                  const struct acpi_hest_generic *generic,
                                  const struct acpi_hest_generic_status *estatus)
 {
-        static atomic_t seqno;
-        unsigned int curr_seqno;
-        char pfx_seq[64];
-
         if (pfx == NULL) {
                 if (ghes_severity(estatus->error_severity) <=
                     GHES_SEV_CORRECTED)
-                        pfx = KERN_WARNING;
+                        pfx = KERN_WARNING HW_ERR;
                 else
-                        pfx = KERN_ERR;
+                        pfx = KERN_ERR HW_ERR;
         }
-        curr_seqno = atomic_inc_return(&seqno);
-        snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
         printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
-               pfx_seq, generic->header.source_id);
-        apei_estatus_print(pfx_seq, estatus);
+               pfx, generic->header.source_id);
+        apei_estatus_print(pfx, estatus);
 }
 
 static int ghes_print_estatus(const char *pfx,
@@ -740,34 +710,26 @@ static int ghes_notify_sci(struct notifier_block *this,
         return ret;
 }
 
-static struct llist_node *llist_nodes_reverse(struct llist_node *llnode)
-{
-        struct llist_node *next, *tail = NULL;
-
-        while (llnode) {
-                next = llnode->next;
-                llnode->next = tail;
-                tail = llnode;
-                llnode = next;
-        }
-
-        return tail;
-}
-
 static void ghes_proc_in_irq(struct irq_work *irq_work)
 {
-        struct llist_node *llnode, *next;
+        struct llist_node *llnode, *next, *tail = NULL;
         struct ghes_estatus_node *estatus_node;
         struct acpi_hest_generic *generic;
         struct acpi_hest_generic_status *estatus;
         u32 len, node_len;
 
-        llnode = llist_del_all(&ghes_estatus_llist);
         /*
          * Because the time order of estatus in list is reversed,
          * revert it back to proper order.
          */
-        llnode = llist_nodes_reverse(llnode);
+        llnode = llist_del_all(&ghes_estatus_llist);
+        while (llnode) {
+                next = llnode->next;
+                llnode->next = tail;
+                tail = llnode;
+                llnode = next;
+        }
+        llnode = tail;
         while (llnode) {
                 next = llnode->next;
                 estatus_node = llist_entry(llnode, struct ghes_estatus_node,
@@ -787,37 +749,15 @@ static void ghes_proc_in_irq(struct irq_work *irq_work)
         }
 }
 
-static void ghes_print_queued_estatus(void)
-{
-        struct llist_node *llnode;
-        struct ghes_estatus_node *estatus_node;
-        struct acpi_hest_generic *generic;
-        struct acpi_hest_generic_status *estatus;
-        u32 len, node_len;
-
-        llnode = llist_del_all(&ghes_estatus_llist);
-        /*
-         * Because the time order of estatus in list is reversed,
-         * revert it back to proper order.
-         */
-        llnode = llist_nodes_reverse(llnode);
-        while (llnode) {
-                estatus_node = llist_entry(llnode, struct ghes_estatus_node,
-                                           llnode);
-                estatus = GHES_ESTATUS_FROM_NODE(estatus_node);
-                len = apei_estatus_len(estatus);
-                node_len = GHES_ESTATUS_NODE_LEN(len);
-                generic = estatus_node->generic;
-                ghes_print_estatus(NULL, generic, estatus);
-                llnode = llnode->next;
-        }
-}
-
-static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
+static int ghes_notify_nmi(struct notifier_block *this,
+                                  unsigned long cmd, void *data)
 {
         struct ghes *ghes, *ghes_global = NULL;
         int sev, sev_global = -1;
-        int ret = NMI_DONE;
+        int ret = NOTIFY_DONE;
+
+        if (cmd != DIE_NMI)
+                return ret;
 
         raw_spin_lock(&ghes_nmi_lock);
         list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
@@ -830,16 +770,15 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
                         sev_global = sev;
                         ghes_global = ghes;
                 }
-                ret = NMI_HANDLED;
+                ret = NOTIFY_STOP;
         }
 
-        if (ret == NMI_DONE)
+        if (ret == NOTIFY_DONE)
                 goto out;
 
         if (sev_global >= GHES_SEV_PANIC) {
                 oops_begin();
-                ghes_print_queued_estatus();
-                __ghes_print_estatus(KERN_EMERG, ghes_global->generic,
+                __ghes_print_estatus(KERN_EMERG HW_ERR, ghes_global->generic,
                                      ghes_global->estatus);
                 /* reboot to log the error! */
                 if (panic_timeout == 0)
@@ -886,6 +825,10 @@ static struct notifier_block ghes_notifier_sci = {
         .notifier_call = ghes_notify_sci,
 };
 
+static struct notifier_block ghes_notifier_nmi = {
+        .notifier_call = ghes_notify_nmi,
+};
+
 static unsigned long ghes_esource_prealloc_size(
         const struct acpi_hest_generic *generic)
 {
@@ -901,7 +844,7 @@ static unsigned long ghes_esource_prealloc_size(
         return prealloc_size;
 }
 
-static int ghes_probe(struct platform_device *ghes_dev)
+static int __devinit ghes_probe(struct platform_device *ghes_dev)
 {
         struct acpi_hest_generic *generic;
         struct ghes *ghes = NULL;
@@ -975,8 +918,7 @@ static int ghes_probe(struct platform_device *ghes_dev)
                 ghes_estatus_pool_expand(len);
                 mutex_lock(&ghes_list_mutex);
                 if (list_empty(&ghes_nmi))
-                        register_nmi_handler(NMI_LOCAL, ghes_notify_nmi, 0,
-                                                "ghes");
+                        register_die_notifier(&ghes_notifier_nmi);
                 list_add_rcu(&ghes->list, &ghes_nmi);
                 mutex_unlock(&ghes_list_mutex);
                 break;
@@ -994,7 +936,7 @@ err:
         return rc;
 }
 
-static int ghes_remove(struct platform_device *ghes_dev)
+static int __devexit ghes_remove(struct platform_device *ghes_dev)
 {
         struct ghes *ghes;
         struct acpi_hest_generic *generic;
@@ -1022,7 +964,7 @@ static int ghes_remove(struct platform_device *ghes_dev)
                 mutex_lock(&ghes_list_mutex);
                 list_del_rcu(&ghes->list);
                 if (list_empty(&ghes_nmi))
-                        unregister_nmi_handler(NMI_LOCAL, "ghes");
+                        unregister_die_notifier(&ghes_notifier_nmi);
                 mutex_unlock(&ghes_list_mutex);
                 /*
                  * To synchronize with NMI handler, ghes can only be
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 7f00cf38098..05fee06f4d6 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -41,7 +41,7 @@
 
 #define HEST_PFX "HEST: "
 
-bool hest_disable;
+int hest_disable;
 EXPORT_SYMBOL_GPL(hest_disable);
 
 /* HEST table parsing */
@@ -221,9 +221,10 @@ void __init acpi_hest_init(void)
 
         status = acpi_get_table(ACPI_SIG_HEST, 0,
                                 (struct acpi_table_header **)&hest_tab);
-        if (status == AE_NOT_FOUND)
+        if (status == AE_NOT_FOUND) {
+                pr_info(HEST_PFX "Table not found.\n");
                 goto err;
-        else if (ACPI_FAILURE(status)) {
+        } else if (ACPI_FAILURE(status)) {
                 const char *msg = acpi_format_exception(status);
                 pr_err(HEST_PFX "Failed to get table, %s\n", msg);
                 rc = -EINVAL;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7efaeaa53b8..7711d94a040 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -34,7 +34,6 @@
 #include <linux/dmi.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
-#include <asm/unaligned.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
@@ -96,18 +95,6 @@ enum {
         ACPI_BATTERY_ALARM_PRESENT,
         ACPI_BATTERY_XINFO_PRESENT,
         ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
-        /* On Lenovo Thinkpad models from 2010 and 2011, the power unit
-           switches between mWh and mAh depending on whether the system
-           is running on battery or not.  When mAh is the unit, most
-           reported values are incorrect and need to be adjusted by
-           10000/design_voltage.  Verified on x201, t410, t410s, and x220.
-           Pre-2010 and 2012 models appear to always report in mWh and
-           are thus unaffected (tested with t42, t61, t500, x200, x300,
-           and x230).  Also, in mid-2012 Lenovo issued a BIOS update for
-           the 2011 models that fixes the issue (tested on x220 with a
-           post-1.29 BIOS), but as of Nov. 2012, no such update is
-           available for the 2010 models.  */
-        ACPI_BATTERY_QUIRK_THINKPAD_MAH,
 };
 
 struct acpi_battery {
@@ -263,13 +250,6 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 else
                         val->intval = battery->capacity_now * 1000;
                 break;
-        case POWER_SUPPLY_PROP_CAPACITY:
-                if (battery->capacity_now && battery->full_charge_capacity)
-                        val->intval = battery->capacity_now * 100/
-                                        battery->full_charge_capacity;
-                else
-                        val->intval = 0;
-                break;
         case POWER_SUPPLY_PROP_MODEL_NAME:
                 val->strval = battery->model_number;
                 break;
@@ -296,7 +276,6 @@ static enum power_supply_property charge_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_CHARGE_FULL,
         POWER_SUPPLY_PROP_CHARGE_NOW,
-        POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -313,7 +292,6 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
         POWER_SUPPLY_PROP_ENERGY_NOW,
-        POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -451,21 +429,6 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
         kfree(buffer.pointer);
         if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
                 battery->full_charge_capacity = battery->design_capacity;
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
-            battery->power_unit && battery->design_voltage) {
-                battery->design_capacity = battery->design_capacity *
-                    10000 / battery->design_voltage;
-                battery->full_charge_capacity = battery->full_charge_capacity *
-                    10000 / battery->design_voltage;
-                battery->design_capacity_warning =
-                    battery->design_capacity_warning *
-                    10000 / battery->design_voltage;
-                /* Curiously, design_capacity_low, unlike the rest of them,
-                   is correct.  */
-                /* capacity_granularity_* equal 1 on the systems tested, so
-                   it's impossible to tell if they would need an adjustment
-                   or not if their values were higher.  */
-        }
         return result;
 }
 
@@ -514,11 +477,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
             && battery->capacity_now >= 0 && battery->capacity_now <= 100)
                 battery->capacity_now = (battery->capacity_now *
                                 battery->full_charge_capacity) / 100;
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
-            battery->power_unit && battery->design_voltage) {
-                battery->capacity_now = battery->capacity_now *
-                    10000 / battery->design_voltage;
-        }
         return result;
 }
 
@@ -628,24 +586,6 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
         mutex_unlock(&battery->sysfs_lock);
 }
 
-static void find_battery(const struct dmi_header *dm, void *private)
-{
-        struct acpi_battery *battery = (struct acpi_battery *)private;
-        /* Note: the hardcoded offsets below have been extracted from
-           the source code of dmidecode.  */
-        if (dm->type == DMI_ENTRY_PORTABLE_BATTERY && dm->length >= 8) {
-                const u8 *dmi_data = (const u8 *)(dm + 1);
-                int dmi_capacity = get_unaligned((const u16 *)(dmi_data + 6));
-                if (dm->length >= 18)
-                        dmi_capacity *= dmi_data[17];
-                if (battery->design_capacity * battery->design_voltage / 1000
-                    != dmi_capacity &&
-                    battery->design_capacity * 10 == dmi_capacity)
-                        set_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
-                                &battery->flags);
-        }
-}
-
 /*
  * According to the ACPI spec, some kinds of primary batteries can
  * report percentage battery remaining capacity directly to OS.
@@ -671,32 +611,6 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
                 battery->capacity_now = (battery->capacity_now *
                                 battery->full_charge_capacity) / 100;
         }
-
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
-                return ;
-
-        if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
-                const char *s;
-                s = dmi_get_system_info(DMI_PRODUCT_VERSION);
-                if (s && !strnicmp(s, "ThinkPad", 8)) {
-                        dmi_walk(find_battery, battery);
-                        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
-                                     &battery->flags) &&
-                            battery->design_voltage) {
-                                battery->design_capacity =
-                                    battery->design_capacity *
-                                    10000 / battery->design_voltage;
-                                battery->full_charge_capacity =
-                                    battery->full_charge_capacity *
-                                    10000 / battery->design_voltage;
-                                battery->design_capacity_warning =
-                                    battery->design_capacity_warning *
-                                    10000 / battery->design_voltage;
-                                battery->capacity_now = battery->capacity_now *
-                                    10000 / battery->design_voltage;
-                        }
-                }
-        }
 }
 
 static int acpi_battery_update(struct acpi_battery *battery)
@@ -729,19 +643,11 @@ static int acpi_battery_update(struct acpi_battery *battery)
 
 static void acpi_battery_refresh(struct acpi_battery *battery)
 {
-        int power_unit;
-
         if (!battery->bat.dev)
                 return;
 
-        power_unit = battery->power_unit;
-
         acpi_battery_get_info(battery);
-
-        if (power_unit == battery->power_unit)
-                return;
-
-        /* The battery has changed its reporting units. */
+        /* The battery may have changed its reporting units. */
         sysfs_remove_battery(battery);
         sysfs_add_battery(battery);
 }
@@ -967,7 +873,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
 
 static const struct battery_file {
         struct file_operations ops;
-        umode_t mode;
+        mode_t mode;
         const char *name;
 } acpi_battery_file[] = {
         FILE_DESCRIPTION_RO(info),
@@ -1129,26 +1035,17 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 /* this is needed to learn about changes made in suspended state */
-static int acpi_battery_resume(struct device *dev)
+static int acpi_battery_resume(struct acpi_device *device)
 {
         struct acpi_battery *battery;
-
-        if (!dev)
-                return -EINVAL;
-
-        battery = acpi_driver_data(to_acpi_device(dev));
-        if (!battery)
+        if (!device)
                 return -EINVAL;
-
+        battery = acpi_driver_data(device);
         battery->update_time = 0;
         acpi_battery_update(battery);
         return 0;
 }
-#endif
-
-static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);
 
 static struct acpi_driver acpi_battery_driver = {
         .name = "battery",
@@ -1157,10 +1054,10 @@ static struct acpi_driver acpi_battery_driver = {
         .flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
         .ops = {
                 .add = acpi_battery_add,
+                .resume = acpi_battery_resume,
                 .remove = acpi_battery_remove,
                 .notify = acpi_battery_notify,
                 },
-        .drv.pm = &acpi_battery_pm,
 };
 
 static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
deleted file mode 100644
index be603995854..00000000000
--- a/drivers/acpi/bgrt.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc <mjg@redhat.com>
- * Copyright 2012 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/sysfs.h>
-#include <linux/efi-bgrt.h>
-
-static struct kobject *bgrt_kobj;
-
-static ssize_t show_version(struct device *dev,
-                            struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->version);
-}
-static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
-
-static ssize_t show_status(struct device *dev,
-                           struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->status);
-}
-static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
-
-static ssize_t show_type(struct device *dev,
-                         struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_type);
-}
-static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
-
-static ssize_t show_xoffset(struct device *dev,
-                            struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_x);
-}
-static DEVICE_ATTR(xoffset, S_IRUGO, show_xoffset, NULL);
-
-static ssize_t show_yoffset(struct device *dev,
-                            struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_y);
-}
-static DEVICE_ATTR(yoffset, S_IRUGO, show_yoffset, NULL);
-
-static ssize_t show_image(struct file *file, struct kobject *kobj,
-               struct bin_attribute *attr, char *buf, loff_t off, size_t count)
-{
-        memcpy(buf, attr->private + off, count);
-        return count;
-}
-
-static struct bin_attribute image_attr = {
-        .attr = {
-                .name = "image",
-                .mode = S_IRUGO,
-        },
-        .read = show_image,
-};
-
-static struct attribute *bgrt_attributes[] = {
-        &dev_attr_version.attr,
-        &dev_attr_status.attr,
-        &dev_attr_type.attr,
-        &dev_attr_xoffset.attr,
-        &dev_attr_yoffset.attr,
-        NULL,
-};
-
-static struct attribute_group bgrt_attribute_group = {
-        .attrs = bgrt_attributes,
-};
-
-static int __init bgrt_init(void)
-{
-        int ret;
-
-        if (!bgrt_image)
-                return -ENODEV;
-
-        sysfs_bin_attr_init(&image_attr);
-        image_attr.private = bgrt_image;
-        image_attr.size = bgrt_image_size;
-
-        bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
-        if (!bgrt_kobj)
-                return -EINVAL;
-
-        ret = sysfs_create_group(bgrt_kobj, &bgrt_attribute_group);
-        if (ret)
-                goto out_kobject;
-
-        ret = sysfs_create_bin_file(bgrt_kobj, &image_attr);
-        if (ret)
-                goto out_group;
-
-        return 0;
-
-out_group:
-        sysfs_remove_group(bgrt_kobj, &bgrt_attribute_group);
-out_kobject:
-        kobject_put(bgrt_kobj);
-        return ret;
-}
-
-module_init(bgrt_init);
-
-MODULE_AUTHOR("Matthew Garrett, Josh Triplett <josh@joshtriplett.org>");
-MODULE_DESCRIPTION("BGRT boot graphic support");
-MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index cb9629638de..af308d03f49 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -28,6 +28,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 1f0d457ecbc..437ddbf0c49 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -182,90 +182,47 @@ EXPORT_SYMBOL(acpi_bus_get_private_data);
                                  Power Management
    -------------------------------------------------------------------------- */
 
-static const char *state_string(int state)
-{
-        switch (state) {
-        case ACPI_STATE_D0:
-                return "D0";
-        case ACPI_STATE_D1:
-                return "D1";
-        case ACPI_STATE_D2:
-                return "D2";
-        case ACPI_STATE_D3_HOT:
-                return "D3hot";
-        case ACPI_STATE_D3_COLD:
-                return "D3";
-        default:
-                return "(unknown)";
-        }
-}
-
 static int __acpi_bus_get_power(struct acpi_device *device, int *state)
 {
-        int result = ACPI_STATE_UNKNOWN;
+        int result = 0;
+        acpi_status status = 0;
+        unsigned long long psc = 0;
 
         if (!device || !state)
                 return -EINVAL;
 
-        if (!device->flags.power_manageable) {
+        *state = ACPI_STATE_UNKNOWN;
+
+        if (device->flags.power_manageable) {
+                /*
+                 * Get the device's power state either directly (via _PSC) or
+                 * indirectly (via power resources).
+                 */
+                if (device->power.flags.power_resources) {
+                        result = acpi_power_get_inferred_state(device, state);
+                        if (result)
+                                return result;
+                } else if (device->power.flags.explicit_get) {
+                        status = acpi_evaluate_integer(device->handle, "_PSC",
+                                                       NULL, &psc);
+                        if (ACPI_FAILURE(status))
+                                return -ENODEV;
+                        *state = (int)psc;
+                }
+        } else {
                 /* TBD: Non-recursive algorithm for walking up hierarchy. */
                 *state = device->parent ?
                         device->parent->power.state : ACPI_STATE_D0;
-                goto out;
-        }
-
-        /*
-         * Get the device's power state either directly (via _PSC) or
-         * indirectly (via power resources).
-         */
-        if (device->power.flags.explicit_get) {
-                unsigned long long psc;
-                acpi_status status = acpi_evaluate_integer(device->handle,
-                                                           "_PSC", NULL, &psc);
-                if (ACPI_FAILURE(status))
-                        return -ENODEV;
-
-                result = psc;
-        }
-        /* The test below covers ACPI_STATE_UNKNOWN too. */
-        if (result <= ACPI_STATE_D2) {
-          ; /* Do nothing. */
-        } else if (device->power.flags.power_resources) {
-                int error = acpi_power_get_inferred_state(device, &result);
-                if (error)
-                        return error;
-        } else if (result == ACPI_STATE_D3_HOT) {
-                result = ACPI_STATE_D3;
         }
 
-        /*
-         * If we were unsure about the device parent's power state up to this
-         * point, the fact that the device is in D0 implies that the parent has
-         * to be in D0 too.
-         */
-        if (device->parent && device->parent->power.state == ACPI_STATE_UNKNOWN
-            && result == ACPI_STATE_D0)
-                device->parent->power.state = ACPI_STATE_D0;
-
-        *state = result;
-
- out:
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n",
-                          device->pnp.bus_id, state_string(*state)));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
+                          device->pnp.bus_id, *state));
 
         return 0;
 }
 
 
-/**
- * acpi_device_set_power - Set power state of an ACPI device.
- * @device: Device to set the power state of.
- * @state: New power state to set.
- *
- * Callers must ensure that the device is power manageable before using this
- * function.
- */
-int acpi_device_set_power(struct acpi_device *device, int state)
+static int __acpi_bus_set_power(struct acpi_device *device, int state)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -277,14 +234,13 @@ int acpi_device_set_power(struct acpi_device *device, int state)
         /* Make sure this is a valid target state */
 
         if (state == device->power.state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n",
-                                  state_string(state)));
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
+                                  state));
                 return 0;
         }
 
         if (!device->power.states[state].flags.valid) {
-                printk(KERN_WARNING PREFIX "Device does not support %s\n",
-                       state_string(state));
+                printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
                 return -ENODEV;
         }
         if (device->parent && (state < device->parent->power.state)) {
@@ -294,10 +250,6 @@ int acpi_device_set_power(struct acpi_device *device, int state)
                 return -ENODEV;
         }
 
-        /* For D3cold we should execute _PS3, not _PS4. */
-        if (state == ACPI_STATE_D3_COLD)
-                object_name[3] = '3';
-
         /*
          * Transition Power
          * ----------------
@@ -306,12 +258,6 @@ int acpi_device_set_power(struct acpi_device *device, int state)
          * a lower-powered state.
          */
         if (state < device->power.state) {
-                if (device->power.state >= ACPI_STATE_D3_HOT &&
-                    state != ACPI_STATE_D0) {
-                        printk(KERN_WARNING PREFIX
-                              "Cannot transition to non-D0 state from D3\n");
-                        return -ENODEV;
-                }
                 if (device->power.flags.power_resources) {
                         result = acpi_power_transition(device, state);
                         if (result)
@@ -344,18 +290,17 @@ int acpi_device_set_power(struct acpi_device *device, int state)
       end:
         if (result)
                 printk(KERN_WARNING PREFIX
-                              "Device [%s] failed to transition to %s\n",
-                              device->pnp.bus_id, state_string(state));
+                              "Device [%s] failed to transition to D%d\n",
+                              device->pnp.bus_id, state);
         else {
                 device->power.state = state;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Device [%s] transitioned to %s\n",
-                                  device->pnp.bus_id, state_string(state)));
+                                  "Device [%s] transitioned to D%d\n",
+                                  device->pnp.bus_id, state));
         }
 
         return result;
 }
-EXPORT_SYMBOL(acpi_device_set_power);
 
 
 int acpi_bus_set_power(acpi_handle handle, int state)
@@ -374,7 +319,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
                 return -ENODEV;
         }
 
-        return acpi_device_set_power(device, state);
+        return __acpi_bus_set_power(device, state);
 }
 EXPORT_SYMBOL(acpi_bus_set_power);
 
@@ -417,7 +362,7 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)
         if (result)
                 return result;
 
-        result = acpi_device_set_power(device, state);
+        result = __acpi_bus_set_power(device, state);
         if (!result && state_p)
                 *state_p = state;
 
@@ -599,10 +544,6 @@ static void acpi_bus_osc_support(void)
         capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
 #endif
 
-#ifdef ACPI_HOTPLUG_OST
-        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_HOTPLUG_OST_SUPPORT;
-#endif
-
         if (!ghes_disable)
                 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
         if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
@@ -970,7 +911,10 @@ void __init acpi_early_init(void)
         }
 #endif
 
-        status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE);
+        status =
+            acpi_enable_subsystem(~
+                                  (ACPI_NO_HARDWARE_INIT |
+                                   ACPI_NO_ACPI_ENABLE));
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX "Unable to enable ACPI\n");
                 goto error0;
@@ -991,7 +935,8 @@ static int __init acpi_bus_init(void)
 
         acpi_os_initialize1();
 
-        status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
+        status =
+            acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX
                        "Unable to start the ACPI Interpreter\n");
@@ -1009,6 +954,8 @@ static int __init acpi_bus_init(void)
         status = acpi_ec_ecdt_probe();
         /* Ignore result. Not having an ECDT is not fatal. */
 
+        acpi_bus_osc_support();
+
         status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");
@@ -1016,12 +963,6 @@ static int __init acpi_bus_init(void)
         }
 
         /*
-         * _OSC method may exist in module level code,
-         * so it must be run after ACPI_FULL_INITIALIZATION
-         */
-        acpi_bus_osc_support();
-
-        /*
          * _PDC control method may load dynamic SSDT tables,
          * and we need to install the table handler before that.
          */
@@ -1073,7 +1014,6 @@ static int __init acpi_bus_init(void)
 }
 
 struct kobject *acpi_kobj;
-EXPORT_SYMBOL_GPL(acpi_kobj);
 
 static int __init acpi_init(void)
 {
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index f0d936b65e3..d27d072472f 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -76,23 +76,19 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);
 
 static int acpi_button_add(struct acpi_device *device);
 static int acpi_button_remove(struct acpi_device *device, int type);
+static int acpi_button_resume(struct acpi_device *device);
 static void acpi_button_notify(struct acpi_device *device, u32 event);
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_button_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);
-
 static struct acpi_driver acpi_button_driver = {
         .name = "button",
         .class = ACPI_BUTTON_CLASS,
         .ids = button_device_ids,
         .ops = {
                 .add = acpi_button_add,
+                .resume = acpi_button_resume,
                 .remove = acpi_button_remove,
                 .notify = acpi_button_notify,
         },
-        .drv.pm = &acpi_button_pm,
 };
 
 struct acpi_button {
@@ -312,17 +308,14 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
         }
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_button_resume(struct device *dev)
+static int acpi_button_resume(struct acpi_device *device)
 {
-        struct acpi_device *device = to_acpi_device(dev);
         struct acpi_button *button = acpi_driver_data(device);
 
         if (button->type == ACPI_BUTTON_TYPE_LID)
                 return acpi_lid_send_state(device);
         return 0;
 }
-#endif
 
 static int acpi_button_add(struct acpi_device *device)
 {
@@ -450,4 +443,15 @@ static int acpi_button_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-module_acpi_driver(acpi_button_driver);
+static int __init acpi_button_init(void)
+{
+        return acpi_bus_register_driver(&acpi_button_driver);
+}
+
+static void __exit acpi_button_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_button_driver);
+}
+
+module_init(acpi_button_init);
+module_exit(acpi_button_exit);
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 811910b50b7..45cd03b4630 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -92,24 +92,17 @@ static int is_device_present(acpi_handle handle)
         return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
 }
 
-static bool is_container_device(const char *hid)
-{
-        const struct acpi_device_id *container_id;
-
-        for (container_id = container_device_ids;
-             container_id->id[0]; container_id++) {
-                if (!strcmp((char *)container_id->id, hid))
-                        return true;
-        }
-
-        return false;
-}
-
 /*******************************************************************/
 static int acpi_container_add(struct acpi_device *device)
 {
         struct acpi_container *container;
 
+
+        if (!device) {
+                printk(KERN_ERR PREFIX "device is NULL\n");
+                return -EINVAL;
+        }
+
         container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL);
         if (!container)
                 return -ENOMEM;
@@ -165,56 +158,43 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
         int result;
         int present;
         acpi_status status;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
+
+
+        present = is_device_present(handle);
 
         switch (type) {
         case ACPI_NOTIFY_BUS_CHECK:
                 /* Fall through */
         case ACPI_NOTIFY_DEVICE_CHECK:
-                pr_debug("Container driver received %s event\n",
+                printk(KERN_WARNING "Container driver received %s event\n",
                        (type == ACPI_NOTIFY_BUS_CHECK) ?
                        "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
-
-                present = is_device_present(handle);
                 status = acpi_bus_get_device(handle, &device);
-                if (!present) {
+                if (present) {
+                        if (ACPI_FAILURE(status) || !device) {
+                                result = container_device_add(&device, handle);
+                                if (!result)
+                                        kobject_uevent(&device->dev.kobj,
+                                                       KOBJ_ONLINE);
+                                else
+                                        printk(KERN_WARNING
+                                               "Failed to add container\n");
+                        }
+                } else {
                         if (ACPI_SUCCESS(status)) {
                                 /* device exist and this is a remove request */
-                                device->flags.eject_pending = 1;
                                 kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-                                return;
                         }
-                        break;
-                }
-
-                if (!ACPI_FAILURE(status) || device)
-                        break;
-
-                result = container_device_add(&device, handle);
-                if (result) {
-                        acpi_handle_warn(handle, "Failed to add container\n");
-                        break;
                 }
-
-                kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
-                ost_code = ACPI_OST_SC_SUCCESS;
                 break;
-
         case ACPI_NOTIFY_EJECT_REQUEST:
                 if (!acpi_bus_get_device(handle, &device) && device) {
-                        device->flags.eject_pending = 1;
                         kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-                        return;
                 }
                 break;
-
         default:
-                /* non-hotplug event; possibly handled by other handler */
-                return;
+                break;
         }
-
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
         return;
 }
 
@@ -239,8 +219,10 @@ container_walk_namespace_cb(acpi_handle handle,
                 goto end;
         }
 
-        if (!is_container_device(hid))
+        if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") &&
+            strcmp(hid, "PNP0A06")) {
                 goto end;
+        }
 
         switch (*action) {
         case INSTALL_NOTIFY_HANDLER:
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index b55d6a20dc0..182a9fc3635 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -2,7 +2,6 @@
  * debugfs.c - ACPI debugfs interface to userspace.
  */
 
-#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
 #include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
deleted file mode 100644
index c6ff606c6d5..00000000000
--- a/drivers/acpi/device_pm.c
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
- * drivers/acpi/device_pm.c - ACPI device power management routines.
- *
- * Copyright (C) 2012, Intel Corp.
- * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#include <linux/device.h>
-#include <linux/export.h>
-#include <linux/mutex.h>
-#include <linux/pm_qos.h>
-#include <linux/pm_runtime.h>
-
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-
-static DEFINE_MUTEX(acpi_pm_notifier_lock);
-
-/**
- * acpi_add_pm_notifier - Register PM notifier for given ACPI device.
- * @adev: ACPI device to add the notifier for.
- * @context: Context information to pass to the notifier routine.
- *
- * NOTE: @adev need not be a run-wake or wakeup device to be a valid source of
- * PM wakeup events.  For example, wakeup events may be generated for bridges
- * if one of the devices below the bridge is signaling wakeup, even if the
- * bridge itself doesn't have a wakeup GPE associated with it.
- */
-acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
-                                 acpi_notify_handler handler, void *context)
-{
-        acpi_status status = AE_ALREADY_EXISTS;
-
-        mutex_lock(&acpi_pm_notifier_lock);
-
-        if (adev->wakeup.flags.notifier_present)
-                goto out;
-
-        status = acpi_install_notify_handler(adev->handle,
-                                             ACPI_SYSTEM_NOTIFY,
-                                             handler, context);
-        if (ACPI_FAILURE(status))
-                goto out;
-
-        adev->wakeup.flags.notifier_present = true;
-
- out:
-        mutex_unlock(&acpi_pm_notifier_lock);
-        return status;
-}
-
-/**
- * acpi_remove_pm_notifier - Unregister PM notifier from given ACPI device.
- * @adev: ACPI device to remove the notifier from.
- */
-acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
-                                    acpi_notify_handler handler)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-
-        mutex_lock(&acpi_pm_notifier_lock);
-
-        if (!adev->wakeup.flags.notifier_present)
-                goto out;
-
-        status = acpi_remove_notify_handler(adev->handle,
-                                            ACPI_SYSTEM_NOTIFY,
-                                            handler);
-        if (ACPI_FAILURE(status))
-                goto out;
-
-        adev->wakeup.flags.notifier_present = false;
-
- out:
-        mutex_unlock(&acpi_pm_notifier_lock);
-        return status;
-}
-
-/**
- * acpi_device_power_state - Get preferred power state of ACPI device.
- * @dev: Device whose preferred target power state to return.
- * @adev: ACPI device node corresponding to @dev.
- * @target_state: System state to match the resultant device state.
- * @d_max_in: Deepest low-power state to take into consideration.
- * @d_min_p: Location to store the upper limit of the allowed states range.
- * Return value: Preferred power state of the device on success, -ENODEV
- * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
- *
- * Find the lowest power (highest number) ACPI device power state that the
- * device can be in while the system is in the state represented by
- * @target_state.  If @d_min_p is set, the highest power (lowest number) device
- * power state that @dev can be in for the given system sleep state is stored
- * at the location pointed to by it.
- *
- * Callers must ensure that @dev and @adev are valid pointers and that @adev
- * actually corresponds to @dev before using this function.
- */
-int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
-                            u32 target_state, int d_max_in, int *d_min_p)
-{
-        char acpi_method[] = "_SxD";
-        unsigned long long d_min, d_max;
-        bool wakeup = false;
-
-        if (d_max_in < ACPI_STATE_D0 || d_max_in > ACPI_STATE_D3)
-                return -EINVAL;
-
-        if (d_max_in > ACPI_STATE_D3_HOT) {
-                enum pm_qos_flags_status stat;
-
-                stat = dev_pm_qos_flags(dev, PM_QOS_FLAG_NO_POWER_OFF);
-                if (stat == PM_QOS_FLAGS_ALL)
-                        d_max_in = ACPI_STATE_D3_HOT;
-        }
-
-        acpi_method[2] = '0' + target_state;
-        /*
-         * If the sleep state is S0, the lowest limit from ACPI is D3,
-         * but if the device has _S0W, we will use the value from _S0W
-         * as the lowest limit from ACPI.  Finally, we will constrain
-         * the lowest limit with the specified one.
-         */
-        d_min = ACPI_STATE_D0;
-        d_max = ACPI_STATE_D3;
-
-        /*
-         * If present, _SxD methods return the minimum D-state (highest power
-         * state) we can use for the corresponding S-states.  Otherwise, the
-         * minimum D-state is D0 (ACPI 3.x).
-         *
-         * NOTE: We rely on acpi_evaluate_integer() not clobbering the integer
-         * provided -- that's our fault recovery, we ignore retval.
-         */
-        if (target_state > ACPI_STATE_S0) {
-                acpi_evaluate_integer(adev->handle, acpi_method, NULL, &d_min);
-                wakeup = device_may_wakeup(dev) && adev->wakeup.flags.valid
-                        && adev->wakeup.sleep_state >= target_state;
-        } else if (dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) !=
-                        PM_QOS_FLAGS_NONE) {
-                wakeup = adev->wakeup.flags.valid;
-        }
-
-        /*
-         * If _PRW says we can wake up the system from the target sleep state,
-         * the D-state returned by _SxD is sufficient for that (we assume a
-         * wakeup-aware driver if wake is set).  Still, if _SxW exists
-         * (ACPI 3.x), it should return the maximum (lowest power) D-state that
-         * can wake the system.  _S0W may be valid, too.
-         */
-        if (wakeup) {
-                acpi_status status;
-
-                acpi_method[3] = 'W';
-                status = acpi_evaluate_integer(adev->handle, acpi_method, NULL,
-                                                &d_max);
-                if (ACPI_FAILURE(status)) {
-                        if (target_state != ACPI_STATE_S0 ||
-                            status != AE_NOT_FOUND)
-                                d_max = d_min;
-                } else if (d_max < d_min) {
-                        /* Warn the user of the broken DSDT */
-                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
-                                acpi_method);
-                        /* Sanitize it */
-                        d_min = d_max;
-                }
-        }
-
-        if (d_max_in < d_min)
-                return -EINVAL;
-        if (d_min_p)
-                *d_min_p = d_min;
-        /* constrain d_max with specified lowest limit (max number) */
-        if (d_max > d_max_in) {
-                for (d_max = d_max_in; d_max > d_min; d_max--) {
-                        if (adev->power.states[d_max].flags.valid)
-                                break;
-                }
-        }
-        return d_max;
-}
-EXPORT_SYMBOL_GPL(acpi_device_power_state);
-
-/**
- * acpi_pm_device_sleep_state - Get preferred power state of ACPI device.
- * @dev: Device whose preferred target power state to return.
- * @d_min_p: Location to store the upper limit of the allowed states range.
- * @d_max_in: Deepest low-power state to take into consideration.
- * Return value: Preferred power state of the device on success, -ENODEV
- * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
- *
- * The caller must ensure that @dev is valid before using this function.
- */
-int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
-{
-        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
-        struct acpi_device *adev;
-
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
-                return -ENODEV;
-        }
-
-        return acpi_device_power_state(dev, adev, acpi_target_system_state(),
-                                       d_max_in, d_min_p);
-}
-EXPORT_SYMBOL(acpi_pm_device_sleep_state);
-
-#ifdef CONFIG_PM_RUNTIME
-/**
- * acpi_wakeup_device - Wakeup notification handler for ACPI devices.
- * @handle: ACPI handle of the device the notification is for.
- * @event: Type of the signaled event.
- * @context: Device corresponding to @handle.
- */
-static void acpi_wakeup_device(acpi_handle handle, u32 event, void *context)
-{
-        struct device *dev = context;
-
-        if (event == ACPI_NOTIFY_DEVICE_WAKE && dev) {
-                pm_wakeup_event(dev, 0);
-                pm_runtime_resume(dev);
-        }
-}
-
-/**
- * __acpi_device_run_wake - Enable/disable runtime remote wakeup for device.
- * @adev: ACPI device to enable/disable the remote wakeup for.
- * @enable: Whether to enable or disable the wakeup functionality.
- *
- * Enable/disable the GPE associated with @adev so that it can generate
- * wakeup signals for the device in response to external (remote) events and
- * enable/disable device wakeup power.
- *
- * Callers must ensure that @adev is a valid ACPI device node before executing
- * this function.
- */
-int __acpi_device_run_wake(struct acpi_device *adev, bool enable)
-{
-        struct acpi_device_wakeup *wakeup = &adev->wakeup;
-
-        if (enable) {
-                acpi_status res;
-                int error;
-
-                error = acpi_enable_wakeup_device_power(adev, ACPI_STATE_S0);
-                if (error)
-                        return error;
-
-                res = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);
-                if (ACPI_FAILURE(res)) {
-                        acpi_disable_wakeup_device_power(adev);
-                        return -EIO;
-                }
-        } else {
-                acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
-                acpi_disable_wakeup_device_power(adev);
-        }
-        return 0;
-}
-
-/**
- * acpi_pm_device_run_wake - Enable/disable remote wakeup for given device.
- * @dev: Device to enable/disable the platform to wake up.
- * @enable: Whether to enable or disable the wakeup functionality.
- */
-int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
-{
-        struct acpi_device *adev;
-        acpi_handle handle;
-
-        if (!device_run_wake(phys_dev))
-                return -EINVAL;
-
-        handle = DEVICE_ACPI_HANDLE(phys_dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                dev_dbg(phys_dev, "ACPI handle without context in %s!\n",
-                        __func__);
-                return -ENODEV;
-        }
-
-        return __acpi_device_run_wake(adev, enable);
-}
-EXPORT_SYMBOL(acpi_pm_device_run_wake);
-#else
-static inline void acpi_wakeup_device(acpi_handle handle, u32 event,
-                                      void *context) {}
-#endif /* CONFIG_PM_RUNTIME */
-
- #ifdef CONFIG_PM_SLEEP
-/**
- * __acpi_device_sleep_wake - Enable or disable device to wake up the system.
- * @dev: Device to enable/desible to wake up the system.
- * @target_state: System state the device is supposed to wake up from.
- * @enable: Whether to enable or disable @dev to wake up the system.
- */
-int __acpi_device_sleep_wake(struct acpi_device *adev, u32 target_state,
-                             bool enable)
-{
-        return enable ?
-                acpi_enable_wakeup_device_power(adev, target_state) :
-                acpi_disable_wakeup_device_power(adev);
-}
-
-/**
- * acpi_pm_device_sleep_wake - Enable or disable device to wake up the system.
- * @dev: Device to enable/desible to wake up the system from sleep states.
- * @enable: Whether to enable or disable @dev to wake up the system.
- */
-int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
-{
-        acpi_handle handle;
-        struct acpi_device *adev;
-        int error;
-
-        if (!device_can_wakeup(dev))
-                return -EINVAL;
-
-        handle = DEVICE_ACPI_HANDLE(dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
-                return -ENODEV;
-        }
-
-        error = __acpi_device_sleep_wake(adev, acpi_target_system_state(),
-                                         enable);
-        if (!error)
-                dev_info(dev, "System wakeup %s by ACPI\n",
-                                enable ? "enabled" : "disabled");
-
-        return error;
-}
-#endif /* CONFIG_PM_SLEEP */
-
-/**
- * acpi_dev_pm_get_node - Get ACPI device node for the given physical device.
- * @dev: Device to get the ACPI node for.
- */
-static struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
-{
-        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
-        struct acpi_device *adev;
-
-        return handle && !acpi_bus_get_device(handle, &adev) ? adev : NULL;
-}
-
-/**
- * acpi_dev_pm_low_power - Put ACPI device into a low-power state.
- * @dev: Device to put into a low-power state.
- * @adev: ACPI device node corresponding to @dev.
- * @system_state: System state to choose the device state for.
- */
-static int acpi_dev_pm_low_power(struct device *dev, struct acpi_device *adev,
-                                 u32 system_state)
-{
-        int power_state;
-
-        if (!acpi_device_power_manageable(adev))
-                return 0;
-
-        power_state = acpi_device_power_state(dev, adev, system_state,
-                                              ACPI_STATE_D3, NULL);
-        if (power_state < ACPI_STATE_D0 || power_state > ACPI_STATE_D3)
-                return -EIO;
-
-        return acpi_device_set_power(adev, power_state);
-}
-
-/**
- * acpi_dev_pm_full_power - Put ACPI device into the full-power state.
- * @adev: ACPI device node to put into the full-power state.
- */
-static int acpi_dev_pm_full_power(struct acpi_device *adev)
-{
-        return acpi_device_power_manageable(adev) ?
-                acpi_device_set_power(adev, ACPI_STATE_D0) : 0;
-}
-
-#ifdef CONFIG_PM_RUNTIME
-/**
- * acpi_dev_runtime_suspend - Put device into a low-power state using ACPI.
- * @dev: Device to put into a low-power state.
- *
- * Put the given device into a runtime low-power state using the standard ACPI
- * mechanism.  Set up remote wakeup if desired, choose the state to put the
- * device into (this checks if remote wakeup is expected to work too), and set
- * the power state of the device.
- */
-int acpi_dev_runtime_suspend(struct device *dev)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-        bool remote_wakeup;
-        int error;
-
-        if (!adev)
-                return 0;
-
-        remote_wakeup = dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) >
-                                PM_QOS_FLAGS_NONE;
-        error = __acpi_device_run_wake(adev, remote_wakeup);
-        if (remote_wakeup && error)
-                return -EAGAIN;
-
-        error = acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
-        if (error)
-                __acpi_device_run_wake(adev, false);
-
-        return error;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_runtime_suspend);
-
-/**
- * acpi_dev_runtime_resume - Put device into the full-power state using ACPI.
- * @dev: Device to put into the full-power state.
- *
- * Put the given device into the full-power state using the standard ACPI
- * mechanism at run time.  Set the power state of the device to ACPI D0 and
- * disable remote wakeup.
- */
-int acpi_dev_runtime_resume(struct device *dev)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-        int error;
-
-        if (!adev)
-                return 0;
-
-        error = acpi_dev_pm_full_power(adev);
-        __acpi_device_run_wake(adev, false);
-        return error;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_runtime_resume);
-
-/**
- * acpi_subsys_runtime_suspend - Suspend device using ACPI.
- * @dev: Device to suspend.
- *
- * Carry out the generic runtime suspend procedure for @dev and use ACPI to put
- * it into a runtime low-power state.
- */
-int acpi_subsys_runtime_suspend(struct device *dev)
-{
-        int ret = pm_generic_runtime_suspend(dev);
-        return ret ? ret : acpi_dev_runtime_suspend(dev);
-}
-EXPORT_SYMBOL_GPL(acpi_subsys_runtime_suspend);
-
-/**
- * acpi_subsys_runtime_resume - Resume device using ACPI.
- * @dev: Device to Resume.
- *
- * Use ACPI to put the given device into the full-power state and carry out the
- * generic runtime resume procedure for it.
- */
-int acpi_subsys_runtime_resume(struct device *dev)
-{
-        int ret = acpi_dev_runtime_resume(dev);
-        return ret ? ret : pm_generic_runtime_resume(dev);
-}
-EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume);
-#endif /* CONFIG_PM_RUNTIME */
-
-#ifdef CONFIG_PM_SLEEP
-/**
- * acpi_dev_suspend_late - Put device into a low-power state using ACPI.
- * @dev: Device to put into a low-power state.
- *
- * Put the given device into a low-power state during system transition to a
- * sleep state using the standard ACPI mechanism.  Set up system wakeup if
- * desired, choose the state to put the device into (this checks if system
- * wakeup is expected to work too), and set the power state of the device.
- */
-int acpi_dev_suspend_late(struct device *dev)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-        u32 target_state;
-        bool wakeup;
-        int error;
-
-        if (!adev)
-                return 0;
-
-        target_state = acpi_target_system_state();
-        wakeup = device_may_wakeup(dev);
-        error = __acpi_device_sleep_wake(adev, target_state, wakeup);
-        if (wakeup && error)
-                return error;
-
-        error = acpi_dev_pm_low_power(dev, adev, target_state);
-        if (error)
-                __acpi_device_sleep_wake(adev, ACPI_STATE_UNKNOWN, false);
-
-        return error;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_suspend_late);
-
-/**
- * acpi_dev_resume_early - Put device into the full-power state using ACPI.
- * @dev: Device to put into the full-power state.
- *
- * Put the given device into the full-power state using the standard ACPI
- * mechanism during system transition to the working state.  Set the power
- * state of the device to ACPI D0 and disable remote wakeup.
- */
-int acpi_dev_resume_early(struct device *dev)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-        int error;
-
-        if (!adev)
-                return 0;
-
-        error = acpi_dev_pm_full_power(adev);
-        __acpi_device_sleep_wake(adev, ACPI_STATE_UNKNOWN, false);
-        return error;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resume_early);
-
-/**
- * acpi_subsys_prepare - Prepare device for system transition to a sleep state.
- * @dev: Device to prepare.
- */
-int acpi_subsys_prepare(struct device *dev)
-{
-        /*
-         * Follow PCI and resume devices suspended at run time before running
-         * their system suspend callbacks.
-         */
-        pm_runtime_resume(dev);
-        return pm_generic_prepare(dev);
-}
-EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
-
-/**
- * acpi_subsys_suspend_late - Suspend device using ACPI.
- * @dev: Device to suspend.
- *
- * Carry out the generic late suspend procedure for @dev and use ACPI to put
- * it into a low-power state during system transition into a sleep state.
- */
-int acpi_subsys_suspend_late(struct device *dev)
-{
-        int ret = pm_generic_suspend_late(dev);
-        return ret ? ret : acpi_dev_suspend_late(dev);
-}
-EXPORT_SYMBOL_GPL(acpi_subsys_suspend_late);
-
-/**
- * acpi_subsys_resume_early - Resume device using ACPI.
- * @dev: Device to Resume.
- *
- * Use ACPI to put the given device into the full-power state and carry out the
- * generic early resume procedure for it during system transition into the
- * working state.
- */
-int acpi_subsys_resume_early(struct device *dev)
-{
-        int ret = acpi_dev_resume_early(dev);
-        return ret ? ret : pm_generic_resume_early(dev);
-}
-EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);
-#endif /* CONFIG_PM_SLEEP */
-
-static struct dev_pm_domain acpi_general_pm_domain = {
-        .ops = {
-#ifdef CONFIG_PM_RUNTIME
-                .runtime_suspend = acpi_subsys_runtime_suspend,
-                .runtime_resume = acpi_subsys_runtime_resume,
-                .runtime_idle = pm_generic_runtime_idle,
-#endif
-#ifdef CONFIG_PM_SLEEP
-                .prepare = acpi_subsys_prepare,
-                .suspend_late = acpi_subsys_suspend_late,
-                .resume_early = acpi_subsys_resume_early,
-                .poweroff_late = acpi_subsys_suspend_late,
-                .restore_early = acpi_subsys_resume_early,
-#endif
-        },
-};
-
-/**
- * acpi_dev_pm_attach - Prepare device for ACPI power management.
- * @dev: Device to prepare.
- * @power_on: Whether or not to power on the device.
- *
- * If @dev has a valid ACPI handle that has a valid struct acpi_device object
- * attached to it, install a wakeup notification handler for the device and
- * add it to the general ACPI PM domain.  If @power_on is set, the device will
- * be put into the ACPI D0 state before the function returns.
- *
- * This assumes that the @dev's bus type uses generic power management callbacks
- * (or doesn't use any power management callbacks at all).
- *
- * Callers must ensure proper synchronization of this function with power
- * management callbacks.
- */
-int acpi_dev_pm_attach(struct device *dev, bool power_on)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-
-        if (!adev)
-                return -ENODEV;
-
-        if (dev->pm_domain)
-                return -EEXIST;
-
-        acpi_add_pm_notifier(adev, acpi_wakeup_device, dev);
-        dev->pm_domain = &acpi_general_pm_domain;
-        if (power_on) {
-                acpi_dev_pm_full_power(adev);
-                __acpi_device_run_wake(adev, false);
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
-
-/**
- * acpi_dev_pm_detach - Remove ACPI power management from the device.
- * @dev: Device to take care of.
- * @power_off: Whether or not to try to remove power from the device.
- *
- * Remove the device from the general ACPI PM domain and remove its wakeup
- * notifier.  If @power_off is set, additionally remove power from the device if
- * possible.
- *
- * Callers must ensure proper synchronization of this function with power
- * management callbacks.
- */
-void acpi_dev_pm_detach(struct device *dev, bool power_off)
-{
-        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
-
-        if (adev && dev->pm_domain == &acpi_general_pm_domain) {
-                dev->pm_domain = NULL;
-                acpi_remove_pm_notifier(adev, acpi_wakeup_device);
-                if (power_off) {
-                        /*
-                         * If the device's PM QoS resume latency limit or flags
-                         * have been exposed to user space, they have to be
-                         * hidden at this point, so that they don't affect the
-                         * choice of the low-power state to put the device into.
-                         */
-                        dev_pm_qos_hide_latency_limit(dev);
-                        dev_pm_qos_hide_flags(dev);
-                        __acpi_device_run_wake(adev, false);
-                        acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
-                }
-        }
-}
-EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f32bd47b35e..19a61136d84 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -31,7 +31,6 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>
 #include <linux/stddef.h>
-#include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -44,7 +43,7 @@ MODULE_AUTHOR("Kristen Carlson Accardi");
 MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION);
 MODULE_LICENSE("GPL");
 
-static bool immediate_undock = 1;
+static int immediate_undock = 1;
 module_param(immediate_undock, bool, 0644);
 MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "
         "undock immediately when the undock button is pressed, 0 will cause"
@@ -461,8 +460,12 @@ static void handle_dock(struct dock_station *ds, int dock)
         struct acpi_object_list arg_list;
         union acpi_object arg;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-        acpi_handle_info(ds->handle, "%s\n", dock ? "docking" : "undocking");
+        acpi_get_name(ds->handle, ACPI_FULL_PATHNAME, &name_buffer);
+
+        printk(KERN_INFO PREFIX "%s - %s\n",
+                (char *)name_buffer.pointer, dock ? "docking" : "undocking");
 
         /* _DCK method has one argument */
         arg_list.count = 1;
@@ -471,10 +474,11 @@ static void handle_dock(struct dock_station *ds, int dock)
         arg.integer.value = dock;
         status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
-                acpi_handle_err(ds->handle, "Failed to execute _DCK (0x%x)\n",
-                                status);
+                ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute"
+                        " _DCK\n", (char *)name_buffer.pointer));
 
         kfree(buffer.pointer);
+        kfree(name_buffer.pointer);
 }
 
 static inline void dock(struct dock_station *ds)
@@ -521,11 +525,9 @@ static void dock_lock(struct dock_station *ds, int lock)
         status = acpi_evaluate_object(ds->handle, "_LCK", &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
                 if (lock)
-                        acpi_handle_warn(ds->handle,
-                                "Locking device failed (0x%x)\n", status);
+                        printk(KERN_WARNING PREFIX "Locking device failed\n");
                 else
-                        acpi_handle_warn(ds->handle,
-                                "Unlocking device failed (0x%x)\n", status);
+                        printk(KERN_WARNING PREFIX "Unlocking device failed\n");
         }
 }
 
@@ -665,7 +667,7 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
         dock_lock(ds, 0);
         eject_dock(ds);
         if (dock_present(ds)) {
-                acpi_handle_err(ds->handle, "Unable to undock!\n");
+                printk(KERN_ERR PREFIX "Unable to undock!\n");
                 return -EBUSY;
         }
         complete_undock(ds);
@@ -713,7 +715,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
                         begin_dock(ds);
                         dock(ds);
                         if (!dock_present(ds)) {
-                                acpi_handle_err(handle, "Unable to dock!\n");
+                                printk(KERN_ERR PREFIX "Unable to dock!\n");
                                 complete_dock(ds);
                                 break;
                         }
@@ -741,7 +743,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
                         dock_event(ds, event, UNDOCK_EVENT);
                 break;
         default:
-                acpi_handle_err(handle, "Unknown dock event %d\n", event);
+                printk(KERN_ERR PREFIX "Unknown dock event %d\n", event);
         }
 }
 
@@ -985,7 +987,7 @@ err_rmgroup:
         sysfs_remove_group(&dd->dev.kobj, &dock_attribute_group);
 err_unregister:
         platform_device_unregister(dd);
-        acpi_handle_err(handle, "%s encountered error %d\n", __func__, ret);
+        printk(KERN_ERR "%s encountered error %d\n", __func__, ret);
         return ret;
 }
 
@@ -1014,39 +1016,51 @@ static int dock_remove(struct dock_station *ds)
 }
 
 /**
- * find_dock_and_bay - look for dock stations and bays
+ * find_dock - look for a dock station
  * @handle: acpi handle of a device
  * @lvl: unused
- * @context: unused
+ * @context: counter of dock stations found
  * @rv: unused
  *
- * This is called by acpi_walk_namespace to look for dock stations and bays.
+ * This is called by acpi_walk_namespace to look for dock stations.
  */
 static __init acpi_status
-find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
+find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-        if (is_dock(handle) || is_ejectable_bay(handle))
+        if (is_dock(handle))
                 dock_add(handle);
 
         return AE_OK;
 }
 
+static __init acpi_status
+find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        /* If bay is a dock, it's already handled */
+        if (is_ejectable_bay(handle) && !is_dock(handle))
+                dock_add(handle);
+        return AE_OK;
+}
+
 static int __init dock_init(void)
 {
         if (acpi_disabled)
                 return 0;
 
-        /* look for dock stations and bays */
+        /* look for a dock station */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);
+                            ACPI_UINT32_MAX, find_dock, NULL, NULL, NULL);
 
+        /* look for bay */
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                        ACPI_UINT32_MAX, find_bay, NULL, NULL, NULL);
         if (!dock_station_count) {
-                pr_info(PREFIX "No dock devices found.\n");
+                printk(KERN_INFO PREFIX "No dock devices found.\n");
                 return 0;
         }
 
         register_acpi_bus_notifier(&dock_acpi_notifier);
-        pr_info(PREFIX "%s: %d docks/bays found\n",
+        printk(KERN_INFO PREFIX "%s: %d docks/bays found\n",
                 ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count);
         return 0;
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 354007d490d..b19a18dd994 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -71,6 +71,9 @@ enum ec_command {
 #define ACPI_EC_UDELAY_GLK      1000    /* Wait 1ms max. to get global lock */
 #define ACPI_EC_MSI_UDELAY      550     /* Wait 550us for MSI EC */
 
+#define ACPI_EC_STORM_THRESHOLD 8       /* number of false interrupts
+                                           per one transaction */
+
 enum {
         EC_FLAGS_QUERY_PENDING,         /* Query is pending */
         EC_FLAGS_GPE_STORM,             /* GPE storm detected */
@@ -84,15 +87,6 @@ static unsigned int ec_delay __read_mostly = ACPI_EC_DELAY;
 module_param(ec_delay, uint, 0644);
 MODULE_PARM_DESC(ec_delay, "Timeout(ms) waited until an EC command completes");
 
-/*
- * If the number of false interrupts per one transaction exceeds
- * this threshold, will think there is a GPE storm happened and
- * will disable the GPE for normal transaction.
- */
-static unsigned int ec_storm_threshold  __read_mostly = 8;
-module_param(ec_storm_threshold, uint, 0644);
-MODULE_PARM_DESC(ec_storm_threshold, "Maxim false GPE numbers not considered as GPE storm");
-
 /* 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);
@@ -158,10 +152,10 @@ static int ec_transaction_done(struct acpi_ec *ec)
 {
         unsigned long flags;
         int ret = 0;
-        spin_lock_irqsave(&ec->lock, flags);
+        spin_lock_irqsave(&ec->curr_lock, flags);
         if (!ec->curr || ec->curr->done)
                 ret = 1;
-        spin_unlock_irqrestore(&ec->lock, flags);
+        spin_unlock_irqrestore(&ec->curr_lock, flags);
         return ret;
 }
 
@@ -175,38 +169,32 @@ static void start_transaction(struct acpi_ec *ec)
 static void advance_transaction(struct acpi_ec *ec, u8 status)
 {
         unsigned long flags;
-        struct transaction *t = ec->curr;
-
-        spin_lock_irqsave(&ec->lock, flags);
-        if (!t)
+        spin_lock_irqsave(&ec->curr_lock, flags);
+        if (!ec->curr)
                 goto unlock;
-        if (t->wlen > t->wi) {
+        if (ec->curr->wlen > ec->curr->wi) {
                 if ((status & ACPI_EC_FLAG_IBF) == 0)
                         acpi_ec_write_data(ec,
-                                t->wdata[t->wi++]);
+                                ec->curr->wdata[ec->curr->wi++]);
                 else
                         goto err;
-        } else if (t->rlen > t->ri) {
+        } else if (ec->curr->rlen > ec->curr->ri) {
                 if ((status & ACPI_EC_FLAG_OBF) == 1) {
-                        t->rdata[t->ri++] = acpi_ec_read_data(ec);
-                        if (t->rlen == t->ri)
-                                t->done = true;
+                        ec->curr->rdata[ec->curr->ri++] = acpi_ec_read_data(ec);
+                        if (ec->curr->rlen == ec->curr->ri)
+                                ec->curr->done = true;
                 } else
                         goto err;
-        } else if (t->wlen == t->wi &&
+        } else if (ec->curr->wlen == ec->curr->wi &&
                    (status & ACPI_EC_FLAG_IBF) == 0)
-                t->done = true;
+                ec->curr->done = true;
         goto unlock;
 err:
-        /*
-         * If SCI bit is set, then don't think it's a false IRQ
-         * otherwise will take a not handled IRQ as a false one.
-         */
-        if (in_interrupt() && !(status & ACPI_EC_FLAG_SCI))
-                ++t->irq_count;
-
+        /* false interrupt, state didn't change */
+        if (in_interrupt())
+                ++ec->curr->irq_count;
 unlock:
-        spin_unlock_irqrestore(&ec->lock, flags);
+        spin_unlock_irqrestore(&ec->curr_lock, flags);
 }
 
 static int acpi_ec_sync_query(struct acpi_ec *ec);
@@ -244,9 +232,9 @@ static int ec_poll(struct acpi_ec *ec)
                 if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)
                         break;
                 pr_debug(PREFIX "controller reset, restart transaction\n");
-                spin_lock_irqsave(&ec->lock, flags);
+                spin_lock_irqsave(&ec->curr_lock, flags);
                 start_transaction(ec);
-                spin_unlock_irqrestore(&ec->lock, flags);
+                spin_unlock_irqrestore(&ec->curr_lock, flags);
         }
         return -ETIME;
 }
@@ -259,17 +247,17 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
         if (EC_FLAGS_MSI)
                 udelay(ACPI_EC_MSI_UDELAY);
         /* start transaction */
-        spin_lock_irqsave(&ec->lock, tmp);
+        spin_lock_irqsave(&ec->curr_lock, tmp);
         /* following two actions should be kept atomic */
         ec->curr = t;
         start_transaction(ec);
         if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
                 clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
-        spin_unlock_irqrestore(&ec->lock, tmp);
+        spin_unlock_irqrestore(&ec->curr_lock, tmp);
         ret = ec_poll(ec);
-        spin_lock_irqsave(&ec->lock, tmp);
+        spin_lock_irqsave(&ec->curr_lock, tmp);
         ec->curr = NULL;
-        spin_unlock_irqrestore(&ec->lock, tmp);
+        spin_unlock_irqrestore(&ec->curr_lock, tmp);
         return ret;
 }
 
@@ -298,7 +286,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                 return -EINVAL;
         if (t->rdata)
                 memset(t->rdata, 0, t->rlen);
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         if (test_bit(EC_FLAGS_BLOCKED, &ec->flags)) {
                 status = -EINVAL;
                 goto unlock;
@@ -316,8 +304,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                 status = -ETIME;
                 goto end;
         }
-        pr_debug(PREFIX "transaction start (cmd=0x%02x, addr=0x%02x)\n",
-                        t->command, t->wdata ? t->wdata[0] : 0);
+        pr_debug(PREFIX "transaction start\n");
         /* disable GPE during transaction if storm is detected */
         if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
                 /* It has to be disabled, so that it doesn't trigger. */
@@ -332,10 +319,9 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                 msleep(1);
                 /* It is safe to enable the GPE outside of the transaction. */
                 acpi_enable_gpe(NULL, ec->gpe);
-        } else if (t->irq_count > ec_storm_threshold) {
-                pr_info(PREFIX "GPE storm detected(%d GPEs), "
-                        "transactions will use polling mode\n",
-                        t->irq_count);
+        } else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
+                pr_info(PREFIX "GPE storm detected, "
+                        "transactions will use polling mode\n");
                 set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
         }
         pr_debug(PREFIX "transaction end\n");
@@ -343,7 +329,7 @@ end:
         if (ec->global_lock)
                 acpi_release_global_lock(glk);
 unlock:
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
         return status;
 }
 
@@ -411,7 +397,7 @@ int ec_burst_disable(void)
 
 EXPORT_SYMBOL(ec_burst_disable);
 
-int ec_read(u8 addr, u8 *val)
+int ec_read(u8 addr, u8 * val)
 {
         int err;
         u8 temp_data;
@@ -459,16 +445,6 @@ int ec_transaction(u8 command,
 
 EXPORT_SYMBOL(ec_transaction);
 
-/* Get the handle to the EC device */
-acpi_handle ec_get_handle(void)
-{
-        if (!first_ec)
-                return NULL;
-        return first_ec->handle;
-}
-
-EXPORT_SYMBOL(ec_get_handle);
-
 void acpi_ec_block_transactions(void)
 {
         struct acpi_ec *ec = first_ec;
@@ -476,10 +452,10 @@ void acpi_ec_block_transactions(void)
         if (!ec)
                 return;
 
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         /* Prevent transactions from being carried out */
         set_bit(EC_FLAGS_BLOCKED, &ec->flags);
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
 }
 
 void acpi_ec_unblock_transactions(void)
@@ -489,10 +465,10 @@ void acpi_ec_unblock_transactions(void)
         if (!ec)
                 return;
 
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         /* Allow transactions to be carried out again */
         clear_bit(EC_FLAGS_BLOCKED, &ec->flags);
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
 }
 
 void acpi_ec_unblock_transactions_early(void)
@@ -544,9 +520,9 @@ int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
         handler->handle = handle;
         handler->func = func;
         handler->data = data;
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         list_add(&handler->node, &ec->list);
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
         return 0;
 }
 
@@ -555,14 +531,14 @@ 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, *tmp;
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         list_for_each_entry_safe(handler, tmp, &ec->list, node) {
                 if (query_bit == handler->query_bit) {
                         list_del(&handler->node);
                         kfree(handler);
                 }
         }
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
 }
 
 EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler);
@@ -609,9 +585,9 @@ static void acpi_ec_gpe_query(void *ec_cxt)
         struct acpi_ec *ec = ec_cxt;
         if (!ec)
                 return;
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         acpi_ec_sync_query(ec);
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
 }
 
 static int ec_check_sci(struct acpi_ec *ec, u8 state)
@@ -630,11 +606,10 @@ static u32 acpi_ec_gpe_handler(acpi_handle gpe_device,
         u32 gpe_number, void *data)
 {
         struct acpi_ec *ec = data;
-        u8 status = acpi_ec_read_status(ec);
 
-        pr_debug(PREFIX "~~~> interrupt, status:0x%02x\n", status);
+        pr_debug(PREFIX "~~~> interrupt\n");
 
-        advance_transaction(ec, status);
+        advance_transaction(ec, acpi_ec_read_status(ec));
         if (ec_transaction_done(ec) &&
             (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) == 0) {
                 wake_up(&ec->wait);
@@ -700,10 +675,10 @@ static struct acpi_ec *make_acpi_ec(void)
         if (!ec)
                 return NULL;
         ec->flags = 1 << EC_FLAGS_QUERY_PENDING;
-        mutex_init(&ec->mutex);
+        mutex_init(&ec->lock);
         init_waitqueue_head(&ec->wait);
         INIT_LIST_HEAD(&ec->list);
-        spin_lock_init(&ec->lock);
+        spin_lock_init(&ec->curr_lock);
         return ec;
 }
 
@@ -837,10 +812,10 @@ static int acpi_ec_add(struct acpi_device *device)
                 first_ec = ec;
         device->driver_data = ec;
 
-        ret = !!request_region(ec->data_addr, 1, "EC data");
-        WARN(!ret, "Could not request EC data io port 0x%lx", ec->data_addr);
-        ret = !!request_region(ec->command_addr, 1, "EC cmd");
-        WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr);
+        WARN(!request_region(ec->data_addr, 1, "EC data"),
+             "Could not request EC data io port 0x%lx", ec->data_addr);
+        WARN(!request_region(ec->command_addr, 1, "EC cmd"),
+             "Could not request EC cmd io port 0x%lx", ec->command_addr);
 
         pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                           ec->gpe, ec->command_addr, ec->data_addr);
@@ -862,12 +837,12 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
 
         ec = acpi_driver_data(device);
         ec_remove_handlers(ec);
-        mutex_lock(&ec->mutex);
+        mutex_lock(&ec->lock);
         list_for_each_entry_safe(handler, tmp, &ec->list, node) {
                 list_del(&handler->node);
                 kfree(handler);
         }
-        mutex_unlock(&ec->mutex);
+        mutex_unlock(&ec->lock);
         release_region(ec->data_addr, 1);
         release_region(ec->command_addr, 1);
         device->driver_data = NULL;
@@ -939,17 +914,6 @@ static int ec_flag_msi(const struct dmi_system_id *id)
         return 0;
 }
 
-/*
- * Clevo M720 notebook actually works ok with IRQ mode, if we lifted
- * the GPE storm threshold back to 20
- */
-static int ec_enlarge_storm_threshold(const struct dmi_system_id *id)
-{
-        pr_debug("Setting the EC GPE storm threshold to 20\n");
-        ec_storm_threshold  = 20;
-        return 0;
-}
-
 static struct dmi_system_id __initdata ec_dmi_table[] = {
         {
         ec_skip_dsdt_scan, "Compal JFL92", {
@@ -981,13 +945,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = {
         {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc.") }, NULL},
-        {
-        ec_enlarge_storm_threshold, "CLEVO hardware", {
-        DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."),
-        DMI_MATCH(DMI_PRODUCT_NAME, "M720T/M730T"),}, NULL},
         {},
 };
 
+
 int __init acpi_ec_ecdt_probe(void)
 {
         acpi_status status;
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 7586544fddb..22f918bacd3 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -11,7 +11,6 @@
 #include <linux/kernel.h>
 #include <linux/acpi.h>
 #include <linux/debugfs.h>
-#include <linux/module.h>
 #include "internal.h"
 
 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
@@ -27,6 +26,12 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
 
 static struct dentry *acpi_ec_debugfs_dir;
 
+static int acpi_ec_open_io(struct inode *i, struct file *f)
+{
+        f->private_data = i->i_private;
+        return 0;
+}
+
 static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
                                size_t count, loff_t *off)
 {
@@ -89,7 +94,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
 
 static const struct file_operations acpi_ec_io_ops = {
         .owner = THIS_MODULE,
-        .open  = simple_open,
+        .open  = acpi_ec_open_io,
         .read  = acpi_ec_read_io,
         .write = acpi_ec_write_io,
         .llseek = default_llseek,
@@ -99,7 +104,7 @@ int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
 {
         struct dentry *dev_dir;
         char name[64];
-        umode_t mode = 0400;
+        mode_t mode = 0400;
 
         if (ec_device_count == 0) {
                 acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL);
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 1442737cede..85d90899380 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/spinlock.h>
-#include <linux/export.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/poll.h>
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 3bd6a54702d..0f0356ca1a9 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -46,6 +46,8 @@ MODULE_LICENSE("GPL");
 
 static int acpi_fan_add(struct acpi_device *device);
 static int acpi_fan_remove(struct acpi_device *device, int type);
+static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);
+static int acpi_fan_resume(struct acpi_device *device);
 
 static const struct acpi_device_id fan_device_ids[] = {
         {"PNP0C0B", 0},
@@ -53,12 +55,6 @@ static const struct acpi_device_id fan_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, fan_device_ids);
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_fan_suspend(struct device *dev);
-static int acpi_fan_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);
-
 static struct acpi_driver acpi_fan_driver = {
         .name = "fan",
         .class = ACPI_FAN_CLASS,
@@ -66,8 +62,9 @@ static struct acpi_driver acpi_fan_driver = {
         .ops = {
                 .add = acpi_fan_add,
                 .remove = acpi_fan_remove,
+                .suspend = acpi_fan_suspend,
+                .resume = acpi_fan_resume,
                 },
-        .drv.pm = &acpi_fan_pm,
 };
 
 /* thermal cooling device callbacks */
@@ -186,30 +183,48 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_fan_suspend(struct device *dev)
+static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
 {
-        if (!dev)
+        if (!device)
                 return -EINVAL;
 
-        acpi_bus_set_power(to_acpi_device(dev)->handle, ACPI_STATE_D0);
+        acpi_bus_set_power(device->handle, ACPI_STATE_D0);
 
         return AE_OK;
 }
 
-static int acpi_fan_resume(struct device *dev)
+static int acpi_fan_resume(struct acpi_device *device)
 {
         int result;
 
-        if (!dev)
+        if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);
+        result = acpi_bus_update_power(device->handle, NULL);
         if (result)
                 printk(KERN_ERR PREFIX "Error updating fan power state\n");
 
         return result;
 }
-#endif
 
-module_acpi_driver(acpi_fan_driver);
+static int __init acpi_fan_init(void)
+{
+        int result = 0;
+
+        result = acpi_bus_register_driver(&acpi_fan_driver);
+        if (result < 0)
+                return -ENODEV;
+
+        return 0;
+}
+
+static void __exit acpi_fan_exit(void)
+{
+
+        acpi_bus_unregister_driver(&acpi_fan_driver);
+
+        return;
+}
+
+module_init(acpi_fan_init);
+module_exit(acpi_fan_exit);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 95af6f674a6..7c47ed55e52 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -6,7 +6,6 @@
  *
  * This file is released under the GPLv2.
  */
-#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/device.h>
@@ -18,20 +17,13 @@
 
 #define ACPI_GLUE_DEBUG 0
 #if ACPI_GLUE_DEBUG
-#define DBG(fmt, ...)                                           \
-        printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__)
+#define DBG(x...) printk(PREFIX x)
 #else
-#define DBG(fmt, ...)                                           \
-do {                                                            \
-        if (0)                                                  \
-                printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__);   \
-} while (0)
+#define DBG(x...) do { } while(0)
 #endif
 static LIST_HEAD(bus_type_list);
 static DECLARE_RWSEM(bus_type_sem);
 
-#define PHYSICAL_NODE_STRING "physical_node"
-
 int register_acpi_bus_type(struct acpi_bus_type *type)
 {
         if (acpi_disabled)
@@ -46,7 +38,6 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
         }
         return -ENODEV;
 }
-EXPORT_SYMBOL_GPL(register_acpi_bus_type);
 
 int unregister_acpi_bus_type(struct acpi_bus_type *type)
 {
@@ -62,7 +53,6 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type)
         }
         return -ENODEV;
 }
-EXPORT_SYMBOL_GPL(unregister_acpi_bus_type);
 
 static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)
 {
@@ -131,138 +121,84 @@ acpi_handle acpi_get_child(acpi_handle parent, u64 address)
 
 EXPORT_SYMBOL(acpi_get_child);
 
+/* Link ACPI devices with physical devices */
+static void acpi_glue_data_handler(acpi_handle handle,
+                                   void *context)
+{
+        /* we provide an empty handler */
+}
+
+/* Note: a success call will increase reference count by one */
+struct device *acpi_get_physical_device(acpi_handle handle)
+{
+        acpi_status status;
+        struct device *dev;
+
+        status = acpi_get_data(handle, acpi_glue_data_handler, (void **)&dev);
+        if (ACPI_SUCCESS(status))
+                return get_device(dev);
+        return NULL;
+}
+
+EXPORT_SYMBOL(acpi_get_physical_device);
+
 static int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
         struct acpi_device *acpi_dev;
         acpi_status status;
-        struct acpi_device_physical_node *physical_node, *pn;
-        char physical_node_name[sizeof(PHYSICAL_NODE_STRING) + 2];
-        int retval = -EINVAL;
-
-        if (ACPI_HANDLE(dev)) {
-                if (handle) {
-                        dev_warn(dev, "ACPI handle is already set\n");
-                        return -EINVAL;
-                } else {
-                        handle = ACPI_HANDLE(dev);
-                }
-        }
-        if (!handle)
-                return -EINVAL;
 
+        if (dev->archdata.acpi_handle) {
+                dev_warn(dev, "Drivers changed 'acpi_handle'\n");
+                return -EINVAL;
+        }
         get_device(dev);
-        status = acpi_bus_get_device(handle, &acpi_dev);
-        if (ACPI_FAILURE(status))
-                goto err;
-
-        physical_node = kzalloc(sizeof(*physical_node), GFP_KERNEL);
-        if (!physical_node) {
-                retval = -ENOMEM;
-                goto err;
+        status = acpi_attach_data(handle, acpi_glue_data_handler, dev);
+        if (ACPI_FAILURE(status)) {
+                put_device(dev);
+                return -EINVAL;
         }
+        dev->archdata.acpi_handle = handle;
 
-        mutex_lock(&acpi_dev->physical_node_lock);
-
-        /* Sanity check. */
-        list_for_each_entry(pn, &acpi_dev->physical_node_list, node)
-                if (pn->dev == dev) {
-                        dev_warn(dev, "Already associated with ACPI node\n");
-                        goto err_free;
-                }
-
-        /* allocate physical node id according to physical_node_id_bitmap */
-        physical_node->node_id =
-                find_first_zero_bit(acpi_dev->physical_node_id_bitmap,
-                ACPI_MAX_PHYSICAL_NODE);
-        if (physical_node->node_id >= ACPI_MAX_PHYSICAL_NODE) {
-                retval = -ENOSPC;
-                goto err_free;
+        status = acpi_bus_get_device(handle, &acpi_dev);
+        if (!ACPI_FAILURE(status)) {
+                int ret;
+
+                ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
+                                "firmware_node");
+                ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
+                                "physical_node");
+                if (acpi_dev->wakeup.flags.valid)
+                        device_set_wakeup_capable(dev, true);
         }
 
-        set_bit(physical_node->node_id, acpi_dev->physical_node_id_bitmap);
-        physical_node->dev = dev;
-        list_add_tail(&physical_node->node, &acpi_dev->physical_node_list);
-        acpi_dev->physical_node_count++;
-
-        mutex_unlock(&acpi_dev->physical_node_lock);
-
-        if (!ACPI_HANDLE(dev))
-                ACPI_HANDLE_SET(dev, acpi_dev->handle);
-
-        if (!physical_node->node_id)
-                strcpy(physical_node_name, PHYSICAL_NODE_STRING);
-        else
-                sprintf(physical_node_name,
-                        "physical_node%d", physical_node->node_id);
-        retval = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
-                        physical_node_name);
-        retval = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
-                "firmware_node");
-
-        if (acpi_dev->wakeup.flags.valid)
-                device_set_wakeup_capable(dev, true);
-
         return 0;
-
- err:
-        ACPI_HANDLE_SET(dev, NULL);
-        put_device(dev);
-        return retval;
-
- err_free:
-        mutex_unlock(&acpi_dev->physical_node_lock);
-        kfree(physical_node);
-        goto err;
 }
 
 static int acpi_unbind_one(struct device *dev)
 {
-        struct acpi_device_physical_node *entry;
-        struct acpi_device *acpi_dev;
-        acpi_status status;
-        struct list_head *node, *next;
-
-        if (!ACPI_HANDLE(dev))
+        if (!dev->archdata.acpi_handle)
                 return 0;
+        if (dev == acpi_get_physical_device(dev->archdata.acpi_handle)) {
+                struct acpi_device *acpi_dev;
 
-        status = acpi_bus_get_device(ACPI_HANDLE(dev), &acpi_dev);
-        if (ACPI_FAILURE(status))
-                goto err;
-
-        mutex_lock(&acpi_dev->physical_node_lock);
-        list_for_each_safe(node, next, &acpi_dev->physical_node_list) {
-                char physical_node_name[sizeof(PHYSICAL_NODE_STRING) + 2];
-
-                entry = list_entry(node, struct acpi_device_physical_node,
-                        node);
-                if (entry->dev != dev)
-                        continue;
-
-                list_del(node);
-                clear_bit(entry->node_id, acpi_dev->physical_node_id_bitmap);
-
-                acpi_dev->physical_node_count--;
+                /* acpi_get_physical_device increase refcnt by one */
+                put_device(dev);
 
-                if (!entry->node_id)
-                        strcpy(physical_node_name, PHYSICAL_NODE_STRING);
-                else
-                        sprintf(physical_node_name,
-                                "physical_node%d", entry->node_id);
+                if (!acpi_bus_get_device(dev->archdata.acpi_handle,
+                                        &acpi_dev)) {
+                        sysfs_remove_link(&dev->kobj, "firmware_node");
+                        sysfs_remove_link(&acpi_dev->dev.kobj, "physical_node");
+                }
 
-                sysfs_remove_link(&acpi_dev->dev.kobj, physical_node_name);
-                sysfs_remove_link(&dev->kobj, "firmware_node");
-                ACPI_HANDLE_SET(dev, NULL);
+                acpi_detach_data(dev->archdata.acpi_handle,
+                                 acpi_glue_data_handler);
+                dev->archdata.acpi_handle = NULL;
                 /* acpi_bind_one increase refcnt by one */
                 put_device(dev);
-                kfree(entry);
+        } else {
+                dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
         }
-        mutex_unlock(&acpi_dev->physical_node_lock);
-
         return 0;
-
-err:
-        dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
-        return -EINVAL;
 }
 
 static int acpi_platform_notify(struct device *dev)
@@ -271,10 +207,6 @@ static int acpi_platform_notify(struct device *dev)
         acpi_handle handle;
         int ret = -EINVAL;
 
-        ret = acpi_bind_one(dev, NULL);
-        if (!ret)
-                goto out;
-
         if (!dev->bus || !dev->parent) {
                 /* bridge devices genernally haven't bus or parent */
                 ret = acpi_find_bridge_device(dev, &handle);
@@ -288,16 +220,16 @@ static int acpi_platform_notify(struct device *dev)
         }
         if ((ret = type->find_device(dev, &handle)) != 0)
                 DBG("Can't get handler for %s\n", dev_name(dev));
- end:
+      end:
         if (!ret)
                 acpi_bind_one(dev, handle);
 
- out:
 #if ACPI_GLUE_DEBUG
         if (!ret) {
                 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-                acpi_get_name(dev->acpi_handle, ACPI_FULL_PATHNAME, &buffer);
+                acpi_get_name(dev->archdata.acpi_handle,
+                              ACPI_FULL_PATHNAME, &buffer);
                 DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                 kfree(buffer.pointer);
         } else
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index a0cc796932f..d0c1967f759 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event)
         blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);
 }
 
-static int acpi_hed_add(struct acpi_device *device)
+static int __devinit acpi_hed_add(struct acpi_device *device)
 {
         /* Only one hardware error device */
         if (hed_handle)
@@ -70,7 +70,7 @@ static int acpi_hed_add(struct acpi_device *device)
         return 0;
 }
 
-static int acpi_hed_remove(struct acpi_device *device, int type)
+static int __devexit acpi_hed_remove(struct acpi_device *device, int type)
 {
         hed_handle = NULL;
         return 0;
@@ -86,7 +86,25 @@ static struct acpi_driver acpi_hed_driver = {
                 .notify = acpi_hed_notify,
         },
 };
-module_acpi_driver(acpi_hed_driver);
+
+static int __init acpi_hed_init(void)
+{
+        if (acpi_disabled)
+                return -ENODEV;
+
+        if (acpi_bus_register_driver(&acpi_hed_driver) < 0)
+                return -ENODEV;
+
+        return 0;
+}
+
+static void __exit acpi_hed_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_hed_driver);
+}
+
+module_init(acpi_hed_init);
+module_exit(acpi_hed_exit);
 
 ACPI_MODULE_NAME("hed");
 MODULE_AUTHOR("Huang Ying");
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 3c407cdc1ec..ca75b9ce048 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -58,11 +58,11 @@ struct acpi_ec {
         unsigned long data_addr;
         unsigned long global_lock;
         unsigned long flags;
-        struct mutex mutex;
+        struct mutex lock;
         wait_queue_head_t wait;
         struct list_head list;
         struct transaction *curr;
-        spinlock_t lock;
+        spinlock_t curr_lock;
 };
 
 extern struct acpi_ec *first_ec;
@@ -93,11 +93,4 @@ static inline int suspend_nvs_save(void) { return 0; }
 static inline void suspend_nvs_restore(void) {}
 #endif
 
-/*--------------------------------------------------------------------------
-                                Platform bus support
-  -------------------------------------------------------------------------- */
-struct platform_device;
-
-struct platform_device *acpi_create_platform_device(struct acpi_device *adev);
-
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index cb31298ca68..3b5c3189fd9 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -45,8 +45,6 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]
 static int node_to_pxm_map[MAX_NUMNODES]
                         = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
-unsigned char acpi_srat_revision __initdata;
-
 int pxm_to_node(int pxm)
 {
         if (pxm < 0)
@@ -237,8 +235,6 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header,
         return 0;
 }
 
-static int __initdata parsed_numa_memblks;
-
 static int __init
 acpi_parse_memory_affinity(struct acpi_subtable_header * header,
                            const unsigned long end)
@@ -252,20 +248,16 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
         acpi_table_print_srat_entry(header);
 
         /* let architecture-dependent part to do it */
-        if (!acpi_numa_memory_affinity_init(memory_affinity))
-                parsed_numa_memblks++;
+        acpi_numa_memory_affinity_init(memory_affinity);
+
         return 0;
 }
 
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
-        struct acpi_table_srat *srat;
         if (!table)
                 return -EINVAL;
 
-        srat = (struct acpi_table_srat *)table;
-        acpi_srat_revision = srat->header.revision;
-
         /* Real work done in acpi_table_parse_srat below. */
 
         return 0;
@@ -306,10 +298,8 @@ int __init acpi_numa_init(void)
 
         acpi_numa_arch_fixup();
 
-        if (cnt < 0)
-                return cnt;
-        else if (!parsed_numa_memblks)
-                return -ENOENT;
+        if (cnt <= 0)
+                return cnt ?: -ENOENT;
         return 0;
 }
 
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
index 266bc58ce0c..096787b43c9 100644
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
@@ -15,56 +15,6 @@
 #include <linux/acpi_io.h>
 #include <acpi/acpiosxf.h>
 
-/* ACPI NVS regions, APEI may use it */
-
-struct nvs_region {
-        __u64 phys_start;
-        __u64 size;
-        struct list_head node;
-};
-
-static LIST_HEAD(nvs_region_list);
-
-#ifdef CONFIG_ACPI_SLEEP
-static int suspend_nvs_register(unsigned long start, unsigned long size);
-#else
-static inline int suspend_nvs_register(unsigned long a, unsigned long b)
-{
-        return 0;
-}
-#endif
-
-int acpi_nvs_register(__u64 start, __u64 size)
-{
-        struct nvs_region *region;
-
-        region = kmalloc(sizeof(*region), GFP_KERNEL);
-        if (!region)
-                return -ENOMEM;
-        region->phys_start = start;
-        region->size = size;
-        list_add_tail(&region->node, &nvs_region_list);
-
-        return suspend_nvs_register(start, size);
-}
-
-int acpi_nvs_for_each_region(int (*func)(__u64 start, __u64 size, void *data),
-                             void *data)
-{
-        int rc;
-        struct nvs_region *region;
-
-        list_for_each_entry(region, &nvs_region_list, node) {
-                rc = func(region->phys_start, region->size, data);
-                if (rc)
-                        return rc;
-        }
-
-        return 0;
-}
-
-
-#ifdef CONFIG_ACPI_SLEEP
 /*
  * Platforms, like ACPI, may want us to save some memory used by them during
  * suspend and to restore the contents of this memory during the subsequent
@@ -91,12 +41,12 @@ static LIST_HEAD(nvs_list);
  *      things so that the data from page-aligned addresses in this region will
  *      be copied into separate RAM pages.
  */
-static int suspend_nvs_register(unsigned long start, unsigned long size)
+int suspend_nvs_register(unsigned long start, unsigned long size)
 {
         struct nvs_page *entry, *next;
 
-        pr_info("PM: Registering ACPI NVS region [mem %#010lx-%#010lx] (%ld bytes)\n",
-                start, start + size - 1, size);
+        pr_info("PM: Registering ACPI NVS region at %lx (%ld bytes)\n",
+                start, size);
 
         while (size > 0) {
                 unsigned int nr_bytes;
@@ -209,4 +159,3 @@ void suspend_nvs_restore(void)
                 if (entry->data)
                         memcpy(entry->kaddr, entry->data, entry->size);
 }
-#endif
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 3ff26786154..fa32f584229 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/highmem.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
@@ -77,15 +76,24 @@ EXPORT_SYMBOL(acpi_in_debugger);
 extern char line_buf[80];
 #endif                          /*ENABLE_DEBUGGER */
 
-static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl,
-                                      u32 pm1b_ctrl);
-
 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;
-struct workqueue_struct *kacpi_hotplug_wq;
-EXPORT_SYMBOL(kacpi_hotplug_wq);
+static struct workqueue_struct *kacpi_hotplug_wq;
+
+struct acpi_res_list {
+        resource_size_t start;
+        resource_size_t end;
+        acpi_adr_space_type resource_type; /* IO port, System memory, ...*/
+        char name[5];   /* only can have a length of 4 chars, make use of this
+                           one instead of res->name, no need to kalloc then */
+        struct list_head resource_list;
+        int count;
+};
+
+static LIST_HEAD(resource_list_head);
+static DEFINE_SPINLOCK(acpi_res_lock);
 
 /*
  * This list of permanent mappings is for memory that may be accessed from
@@ -157,21 +165,17 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported)
         return supported;
 }
 
-static void __init acpi_request_region (struct acpi_generic_address *gas,
+static void __init acpi_request_region (struct acpi_generic_address *addr,
         unsigned int length, char *desc)
 {
-        u64 addr;
-
-        /* Handle possible alignment issues */
-        memcpy(&addr, &gas->address, sizeof(addr));
-        if (!addr || !length)
+        if (!addr->address || !length)
                 return;
 
         /* Resources are never freed */
-        if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
-                request_region(addr, length, desc);
-        else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                request_mem_region(addr, length, desc);
+        if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+                request_region(addr->address, length, desc);
+        else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                request_mem_region(addr->address, length, desc);
 }
 
 static int __init acpi_reserve_resources(void)
@@ -325,37 +329,6 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
         return NULL;
 }
 
-#ifndef CONFIG_IA64
-#define should_use_kmap(pfn)   page_is_ram(pfn)
-#else
-/* ioremap will take care of cache attributes */
-#define should_use_kmap(pfn)   0
-#endif
-
-static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz)
-{
-        unsigned long pfn;
-
-        pfn = pg_off >> PAGE_SHIFT;
-        if (should_use_kmap(pfn)) {
-                if (pg_sz > PAGE_SIZE)
-                        return NULL;
-                return (void __iomem __force *)kmap(pfn_to_page(pfn));
-        } else
-                return acpi_os_ioremap(pg_off, pg_sz);
-}
-
-static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
-{
-        unsigned long pfn;
-
-        pfn = pg_off >> PAGE_SHIFT;
-        if (should_use_kmap(pfn))
-                kunmap(pfn_to_page(pfn));
-        else
-                iounmap(vaddr);
-}
-
 void __iomem *__init_refok
 acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
@@ -388,7 +361,7 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 
         pg_off = round_down(phys, PAGE_SIZE);
         pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off;
-        virt = acpi_map(pg_off, pg_sz);
+        virt = acpi_os_ioremap(pg_off, pg_sz);
         if (!virt) {
                 mutex_unlock(&acpi_ioremap_lock);
                 kfree(map);
@@ -419,7 +392,7 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map)
 {
         if (!map->refcount) {
                 synchronize_rcu();
-                acpi_unmap(map->phys, map->virt);
+                iounmap(map->virt);
                 kfree(map);
         }
 }
@@ -453,42 +426,35 @@ void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
                 __acpi_unmap_table(virt, size);
 }
 
-int acpi_os_map_generic_address(struct acpi_generic_address *gas)
+static int acpi_os_map_generic_address(struct acpi_generic_address *addr)
 {
-        u64 addr;
         void __iomem *virt;
 
-        if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+        if (addr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
                 return 0;
 
-        /* Handle possible alignment issues */
-        memcpy(&addr, &gas->address, sizeof(addr));
-        if (!addr || !gas->bit_width)
+        if (!addr->address || !addr->bit_width)
                 return -EINVAL;
 
-        virt = acpi_os_map_memory(addr, gas->bit_width / 8);
+        virt = acpi_os_map_memory(addr->address, addr->bit_width / 8);
         if (!virt)
                 return -EIO;
 
         return 0;
 }
-EXPORT_SYMBOL(acpi_os_map_generic_address);
 
-void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
+static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
 {
-        u64 addr;
         struct acpi_ioremap *map;
 
-        if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+        if (addr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
                 return;
 
-        /* Handle possible alignment issues */
-        memcpy(&addr, &gas->address, sizeof(addr));
-        if (!addr || !gas->bit_width)
+        if (!addr->address || !addr->bit_width)
                 return;
 
         mutex_lock(&acpi_ioremap_lock);
-        map = acpi_map_lookup(addr, gas->bit_width / 8);
+        map = acpi_map_lookup(addr->address, addr->bit_width / 8);
         if (!map) {
                 mutex_unlock(&acpi_ioremap_lock);
                 return;
@@ -498,7 +464,6 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
 
         acpi_os_map_cleanup(map);
 }
-EXPORT_SYMBOL(acpi_os_unmap_generic_address);
 
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
@@ -534,137 +499,6 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
-#include <linux/earlycpio.h>
-#include <linux/memblock.h>
-
-static u64 acpi_tables_addr;
-static int all_tables_size;
-
-/* Copied from acpica/tbutils.c:acpi_tb_checksum() */
-u8 __init acpi_table_checksum(u8 *buffer, u32 length)
-{
-        u8 sum = 0;
-        u8 *end = buffer + length;
-
-        while (buffer < end)
-                sum = (u8) (sum + *(buffer++));
-        return sum;
-}
-
-/* All but ACPI_SIG_RSDP and ACPI_SIG_FACS: */
-static const char * const table_sigs[] = {
-        ACPI_SIG_BERT, ACPI_SIG_CPEP, ACPI_SIG_ECDT, ACPI_SIG_EINJ,
-        ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT, ACPI_SIG_MSCT,
-        ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT, ACPI_SIG_ASF,
-        ACPI_SIG_BOOT, ACPI_SIG_DBGP, ACPI_SIG_DMAR, ACPI_SIG_HPET,
-        ACPI_SIG_IBFT, ACPI_SIG_IVRS, ACPI_SIG_MCFG, ACPI_SIG_MCHI,
-        ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA,
-        ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,
-        ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,
-        ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT, NULL };
-
-/* Non-fatal errors: Affected tables/files are ignored */
-#define INVALID_TABLE(x, path, name)                                    \
-        { pr_err("ACPI OVERRIDE: " x " [%s%s]\n", path, name); continue; }
-
-#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)
-
-/* Must not increase 10 or needs code modification below */
-#define ACPI_OVERRIDE_TABLES 10
-
-void __init acpi_initrd_override(void *data, size_t size)
-{
-        int sig, no, table_nr = 0, total_offset = 0;
-        long offset = 0;
-        struct acpi_table_header *table;
-        char cpio_path[32] = "kernel/firmware/acpi/";
-        struct cpio_data file;
-        struct cpio_data early_initrd_files[ACPI_OVERRIDE_TABLES];
-        char *p;
-
-        if (data == NULL || size == 0)
-                return;
-
-        for (no = 0; no < ACPI_OVERRIDE_TABLES; no++) {
-                file = find_cpio_data(cpio_path, data, size, &offset);
-                if (!file.data)
-                        break;
-
-                data += offset;
-                size -= offset;
-
-                if (file.size < sizeof(struct acpi_table_header))
-                        INVALID_TABLE("Table smaller than ACPI header",
-                                      cpio_path, file.name);
-
-                table = file.data;
-
-                for (sig = 0; table_sigs[sig]; sig++)
-                        if (!memcmp(table->signature, table_sigs[sig], 4))
-                                break;
-
-                if (!table_sigs[sig])
-                        INVALID_TABLE("Unknown signature",
-                                      cpio_path, file.name);
-                if (file.size != table->length)
-                        INVALID_TABLE("File length does not match table length",
-                                      cpio_path, file.name);
-                if (acpi_table_checksum(file.data, table->length))
-                        INVALID_TABLE("Bad table checksum",
-                                      cpio_path, file.name);
-
-                pr_info("%4.4s ACPI table found in initrd [%s%s][0x%x]\n",
-                        table->signature, cpio_path, file.name, table->length);
-
-                all_tables_size += table->length;
-                early_initrd_files[table_nr].data = file.data;
-                early_initrd_files[table_nr].size = file.size;
-                table_nr++;
-        }
-        if (table_nr == 0)
-                return;
-
-        acpi_tables_addr =
-                memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT,
-                                       all_tables_size, PAGE_SIZE);
-        if (!acpi_tables_addr) {
-                WARN_ON(1);
-                return;
-        }
-        /*
-         * Only calling e820_add_reserve does not work and the
-         * tables are invalid (memory got used) later.
-         * memblock_reserve works as expected and the tables won't get modified.
-         * But it's not enough on X86 because ioremap will
-         * complain later (used by acpi_os_map_memory) that the pages
-         * that should get mapped are not marked "reserved".
-         * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area)
-         * works fine.
-         */
-        memblock_reserve(acpi_tables_addr, acpi_tables_addr + all_tables_size);
-        arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
-
-        p = early_ioremap(acpi_tables_addr, all_tables_size);
-
-        for (no = 0; no < table_nr; no++) {
-                memcpy(p + total_offset, early_initrd_files[no].data,
-                       early_initrd_files[no].size);
-                total_offset += early_initrd_files[no].size;
-        }
-        early_iounmap(p, all_tables_size);
-}
-#endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */
-
-static void acpi_table_taint(struct acpi_table_header *table)
-{
-        pr_warn(PREFIX
-                "Override [%4.4s-%8.8s], this is unsafe: tainting kernel\n",
-                table->signature, table->oem_table_id);
-        add_taint(TAINT_OVERRIDDEN_ACPI_TABLE);
-}
-
-
 acpi_status
 acpi_os_table_override(struct acpi_table_header * existing_table,
                        struct acpi_table_header ** new_table)
@@ -678,72 +512,14 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
         if (strncmp(existing_table->signature, "DSDT", 4) == 0)
                 *new_table = (struct acpi_table_header *)AmlCode;
 #endif
-        if (*new_table != NULL)
-                acpi_table_taint(existing_table);
-        return AE_OK;
-}
-
-acpi_status
-acpi_os_physical_table_override(struct acpi_table_header *existing_table,
-                                acpi_physical_address *address,
-                                u32 *table_length)
-{
-#ifndef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
-        *table_length = 0;
-        *address = 0;
-        return AE_OK;
-#else
-        int table_offset = 0;
-        struct acpi_table_header *table;
-
-        *table_length = 0;
-        *address = 0;
-
-        if (!acpi_tables_addr)
-                return AE_OK;
-
-        do {
-                if (table_offset + ACPI_HEADER_SIZE > all_tables_size) {
-                        WARN_ON(1);
-                        return AE_OK;
-                }
-
-                table = acpi_os_map_memory(acpi_tables_addr + table_offset,
-                                           ACPI_HEADER_SIZE);
-
-                if (table_offset + table->length > all_tables_size) {
-                        acpi_os_unmap_memory(table, ACPI_HEADER_SIZE);
-                        WARN_ON(1);
-                        return AE_OK;
-                }
-
-                table_offset += table->length;
-
-                if (memcmp(existing_table->signature, table->signature, 4)) {
-                        acpi_os_unmap_memory(table,
-                                     ACPI_HEADER_SIZE);
-                        continue;
-                }
-
-                /* Only override tables with matching oem id */
-                if (memcmp(table->oem_table_id, existing_table->oem_table_id,
-                           ACPI_OEM_TABLE_ID_SIZE)) {
-                        acpi_os_unmap_memory(table,
-                                     ACPI_HEADER_SIZE);
-                        continue;
-                }
-
-                table_offset -= table->length;
-                *table_length = table->length;
-                acpi_os_unmap_memory(table, ACPI_HEADER_SIZE);
-                *address = acpi_tables_addr + table_offset;
-                break;
-        } while (table_offset + ACPI_HEADER_SIZE < all_tables_size);
-
-        if (*address != 0)
-                acpi_table_taint(existing_table);
+        if (*new_table != NULL) {
+                printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], "
+                           "this is unsafe: tainting kernel\n",
+                       existing_table->signature,
+                       existing_table->oem_table_id);
+                add_taint(TAINT_OVERRIDDEN_ACPI_TABLE);
+        }
         return AE_OK;
-#endif
 }
 
 static irqreturn_t acpi_irq(int irq, void *dev_id)
@@ -891,28 +667,13 @@ acpi_status acpi_os_write_port(acpi_io_address port, u32 value, u32 width)
 
 EXPORT_SYMBOL(acpi_os_write_port);
 
-#ifdef readq
-static inline u64 read64(const volatile void __iomem *addr)
-{
-        return readq(addr);
-}
-#else
-static inline u64 read64(const volatile void __iomem *addr)
-{
-        u64 l, h;
-        l = readl(addr);
-        h = readl(addr+4);
-        return l | (h << 32);
-}
-#endif
-
 acpi_status
-acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width)
+acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
 {
         void __iomem *virt_addr;
         unsigned int size = width / 8;
         bool unmap = false;
-        u64 dummy;
+        u32 dummy;
 
         rcu_read_lock();
         virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
@@ -937,9 +698,6 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width)
         case 32:
                 *(u32 *) value = readl(virt_addr);
                 break;
-        case 64:
-                *(u64 *) value = read64(virt_addr);
-                break;
         default:
                 BUG();
         }
@@ -952,21 +710,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width)
         return AE_OK;
 }
 
-#ifdef writeq
-static inline void write64(u64 val, volatile void __iomem *addr)
-{
-        writeq(val, addr);
-}
-#else
-static inline void write64(u64 val, volatile void __iomem *addr)
-{
-        writel(val, addr);
-        writel(val>>32, addr+4);
-}
-#endif
-
 acpi_status
-acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)
+acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 {
         void __iomem *virt_addr;
         unsigned int size = width / 8;
@@ -992,9 +737,6 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)
         case 32:
                 writel(value, virt_addr);
                 break;
-        case 64:
-                write64(value, virt_addr);
-                break;
         default:
                 BUG();
         }
@@ -1071,7 +813,7 @@ 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->wait)
-                acpi_os_wait_events_complete();
+                acpi_os_wait_events_complete(NULL);
 
         dpc->function(dpc->context);
         kfree(dpc);
@@ -1112,7 +854,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
          * having a static work_struct.
          */
 
-        dpc = kzalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
+        dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
         if (!dpc)
                 return AE_NO_MEMORY;
 
@@ -1124,22 +866,17 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
          * because the hotplug code may call driver .remove() functions,
          * which invoke flush_scheduled_work/acpi_os_wait_events_complete
          * to flush these workqueues.
-         *
-         * To prevent lockdep from complaining unnecessarily, make sure that
-         * there is a different static lockdep key for each workqueue by using
-         * INIT_WORK() for each of them separately.
          */
-        if (hp) {
-                queue = kacpi_hotplug_wq;
-                dpc->wait = 1;
+        queue = hp ? kacpi_hotplug_wq :
+                (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq);
+        dpc->wait = hp ? 1 : 0;
+
+        if (queue == kacpi_hotplug_wq)
                 INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-        } else if (type == OSL_NOTIFY_HANDLER) {
-                queue = kacpi_notify_wq;
+        else if (queue == kacpi_notify_wq)
                 INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-        } else {
-                queue = kacpid_wq;
+        else
                 INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-        }
 
         /*
          * On some machines, a software-initiated SMI causes corruption unless
@@ -1171,9 +908,8 @@ acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function,
 {
         return __acpi_os_execute(0, function, context, 1);
 }
-EXPORT_SYMBOL(acpi_os_hotplug_execute);
 
-void acpi_os_wait_events_complete(void)
+void acpi_os_wait_events_complete(void *context)
 {
         flush_workqueue(kacpid_wq);
         flush_workqueue(kacpi_notify_wq);
@@ -1541,28 +1277,44 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
  * drivers */
 int acpi_check_resource_conflict(const struct resource *res)
 {
-        acpi_adr_space_type space_id;
-        acpi_size length;
-        u8 warn = 0;
-        int clash = 0;
+        struct acpi_res_list *res_list_elem;
+        int ioport = 0, clash = 0;
 
         if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
                 return 0;
         if (!(res->flags & IORESOURCE_IO) && !(res->flags & IORESOURCE_MEM))
                 return 0;
 
-        if (res->flags & IORESOURCE_IO)
-                space_id = ACPI_ADR_SPACE_SYSTEM_IO;
-        else
-                space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY;
+        ioport = res->flags & IORESOURCE_IO;
 
-        length = res->end - res->start + 1;
-        if (acpi_enforce_resources != ENFORCE_RESOURCES_NO)
-                warn = 1;
-        clash = acpi_check_address_range(space_id, res->start, length, warn);
+        spin_lock(&acpi_res_lock);
+        list_for_each_entry(res_list_elem, &resource_list_head,
+                            resource_list) {
+                if (ioport && (res_list_elem->resource_type
+                               != ACPI_ADR_SPACE_SYSTEM_IO))
+                        continue;
+                if (!ioport && (res_list_elem->resource_type
+                                != ACPI_ADR_SPACE_SYSTEM_MEMORY))
+                        continue;
+
+                if (res->end < res_list_elem->start
+                    || res_list_elem->end < res->start)
+                        continue;
+                clash = 1;
+                break;
+        }
+        spin_unlock(&acpi_res_lock);
 
         if (clash) {
                 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
+                        printk(KERN_WARNING "ACPI: resource %s %pR"
+                               " conflicts with ACPI region %s "
+                               "[%s 0x%zx-0x%zx]\n",
+                               res->name, res, res_list_elem->name,
+                               (res_list_elem->resource_type ==
+                                ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",
+                               (size_t) res_list_elem->start,
+                               (size_t) res_list_elem->end);
                         if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
                                 printk(KERN_NOTICE "ACPI: This conflict may"
                                        " cause random problems and system"
@@ -1714,6 +1466,155 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
         kmem_cache_free(cache, object);
         return (AE_OK);
 }
+
+static inline int acpi_res_list_add(struct acpi_res_list *res)
+{
+        struct acpi_res_list *res_list_elem;
+
+        list_for_each_entry(res_list_elem, &resource_list_head,
+                            resource_list) {
+
+                if (res->resource_type == res_list_elem->resource_type &&
+                    res->start == res_list_elem->start &&
+                    res->end == res_list_elem->end) {
+
+                        /*
+                         * The Region(addr,len) already exist in the list,
+                         * just increase the count
+                         */
+
+                        res_list_elem->count++;
+                        return 0;
+                }
+        }
+
+        res->count = 1;
+        list_add(&res->resource_list, &resource_list_head);
+        return 1;
+}
+
+static inline void acpi_res_list_del(struct acpi_res_list *res)
+{
+        struct acpi_res_list *res_list_elem;
+
+        list_for_each_entry(res_list_elem, &resource_list_head,
+                            resource_list) {
+
+                if (res->resource_type == res_list_elem->resource_type &&
+                    res->start == res_list_elem->start &&
+                    res->end == res_list_elem->end) {
+
+                        /*
+                         * If the res count is decreased to 0,
+                         * remove and free it
+                         */
+
+                        if (--res_list_elem->count == 0) {
+                                list_del(&res_list_elem->resource_list);
+                                kfree(res_list_elem);
+                        }
+                        return;
+                }
+        }
+}
+
+acpi_status
+acpi_os_invalidate_address(
+    u8                   space_id,
+    acpi_physical_address   address,
+    acpi_size               length)
+{
+        struct acpi_res_list res;
+
+        switch (space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                /* Only interference checks against SystemIO and SystemMemory
+                   are needed */
+                res.start = address;
+                res.end = address + length - 1;
+                res.resource_type = space_id;
+                spin_lock(&acpi_res_lock);
+                acpi_res_list_del(&res);
+                spin_unlock(&acpi_res_lock);
+                break;
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+        case ACPI_ADR_SPACE_EC:
+        case ACPI_ADR_SPACE_SMBUS:
+        case ACPI_ADR_SPACE_CMOS:
+        case ACPI_ADR_SPACE_PCI_BAR_TARGET:
+        case ACPI_ADR_SPACE_DATA_TABLE:
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                break;
+        }
+        return AE_OK;
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_validate_address
+ *
+ * PARAMETERS:  space_id             - ACPI space ID
+ *              address             - Physical address
+ *              length              - Address length
+ *
+ * RETURN:      AE_OK if address/length is valid for the space_id. Otherwise,
+ *              should return AE_AML_ILLEGAL_ADDRESS.
+ *
+ * DESCRIPTION: Validate a system address via the host OS. Used to validate
+ *              the addresses accessed by AML operation regions.
+ *
+ *****************************************************************************/
+
+acpi_status
+acpi_os_validate_address (
+    u8                   space_id,
+    acpi_physical_address   address,
+    acpi_size               length,
+    char *name)
+{
+        struct acpi_res_list *res;
+        int added;
+        if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
+                return AE_OK;
+
+        switch (space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+                /* Only interference checks against SystemIO and SystemMemory
+                   are needed */
+                res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
+                if (!res)
+                        return AE_OK;
+                /* ACPI names are fixed to 4 bytes, still better use strlcpy */
+                strlcpy(res->name, name, 5);
+                res->start = address;
+                res->end = address + length - 1;
+                res->resource_type = space_id;
+                spin_lock(&acpi_res_lock);
+                added = acpi_res_list_add(res);
+                spin_unlock(&acpi_res_lock);
+                pr_debug("%s %s resource: start: 0x%llx, end: 0x%llx, "
+                         "name: %s\n", added ? "Added" : "Already exist",
+                         (space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+                         ? "SystemIO" : "System Memory",
+                         (unsigned long long)res->start,
+                         (unsigned long long)res->end,
+                         res->name);
+                if (!added)
+                        kfree(res);
+                break;
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+        case ACPI_ADR_SPACE_EC:
+        case ACPI_ADR_SPACE_SMBUS:
+        case ACPI_ADR_SPACE_CMOS:
+        case ACPI_ADR_SPACE_PCI_BAR_TARGET:
+        case ACPI_ADR_SPACE_DATA_TABLE:
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                break;
+        }
+        return AE_OK;
+}
 #endif
 
 acpi_status __init acpi_os_initialize(void)
@@ -1757,24 +1658,3 @@ acpi_status acpi_os_terminate(void)
 
         return AE_OK;
 }
-
-acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control,
-                                  u32 pm1b_control)
-{
-        int rc = 0;
-        if (__acpi_os_prepare_sleep)
-                rc = __acpi_os_prepare_sleep(sleep_state,
-                                             pm1a_control, pm1b_control);
-        if (rc < 0)
-                return AE_ERROR;
-        else if (rc > 0)
-                return AE_CTRL_SKIP;
-
-        return AE_OK;
-}
-
-void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
-                               u32 pm1a_ctrl, u32 pm1b_ctrl))
-{
-        __acpi_os_prepare_sleep = func;
-}
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index a1dee29beed..2ef04098cc1 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -45,12 +45,11 @@ static int acpi_pci_unbind(struct acpi_device *device)
 
         device_set_run_wake(&dev->dev, false);
         pci_acpi_remove_pm_notifier(device);
-        acpi_power_resource_unregister_device(&dev->dev, device->handle);
 
         if (!dev->subordinate)
                 goto out;
 
-        acpi_pci_irq_del_prt(pci_domain_nr(dev->bus), dev->subordinate->number);
+        acpi_pci_irq_del_prt(dev->subordinate);
 
         device->ops.bind = NULL;
         device->ops.unbind = NULL;
@@ -64,7 +63,7 @@ static int acpi_pci_bind(struct acpi_device *device)
 {
         acpi_status status;
         acpi_handle handle;
-        unsigned char bus;
+        struct pci_bus *bus;
         struct pci_dev *dev;
 
         dev = acpi_get_pci_dev(device->handle);
@@ -72,7 +71,6 @@ static int acpi_pci_bind(struct acpi_device *device)
                 return 0;
 
         pci_acpi_add_pm_notifier(device, dev);
-        acpi_power_resource_register_device(&dev->dev, device->handle);
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(&dev->dev, true);
 
@@ -102,11 +100,11 @@ static int acpi_pci_bind(struct acpi_device *device)
                 goto out;
 
         if (dev->subordinate)
-                bus = dev->subordinate->number;
+                bus = dev->subordinate;
         else
-                bus = dev->bus->number;
+                bus = dev->bus;
 
-        acpi_pci_irq_add_prt(device->handle, pci_domain_nr(dev->bus), bus);
+        acpi_pci_irq_add_prt(device->handle, bus);
 
 out:
         pci_dev_put(dev);
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 68a921d0324..7f9eba9a0b0 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -184,7 +184,7 @@ static void do_prt_fixups(struct acpi_prt_entry *entry,
         }
 }
 
-static int acpi_pci_irq_add_entry(acpi_handle handle, int segment, int bus,
+static int acpi_pci_irq_add_entry(acpi_handle handle, struct pci_bus *bus,
                                   struct acpi_pci_routing_table *prt)
 {
         struct acpi_prt_entry *entry;
@@ -198,8 +198,8 @@ static int acpi_pci_irq_add_entry(acpi_handle handle, int segment, int bus,
          * 1=INTA, 2=INTB.  We use the PCI encoding throughout, so convert
          * it here.
          */
-        entry->id.segment = segment;
-        entry->id.bus = bus;
+        entry->id.segment = pci_domain_nr(bus);
+        entry->id.bus = bus->number;
         entry->id.device = (prt->address >> 16) & 0xFFFF;
         entry->pin = prt->pin + 1;
 
@@ -244,7 +244,7 @@ static int acpi_pci_irq_add_entry(acpi_handle handle, int segment, int bus,
         return 0;
 }
 
-int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
+int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus)
 {
         acpi_status status;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -273,7 +273,7 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
 
         entry = buffer.pointer;
         while (entry && (entry->length > 0)) {
-                acpi_pci_irq_add_entry(handle, segment, bus, entry);
+                acpi_pci_irq_add_entry(handle, bus, entry);
                 entry = (struct acpi_pci_routing_table *)
                     ((unsigned long)entry + entry->length);
         }
@@ -282,16 +282,17 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
         return 0;
 }
 
-void acpi_pci_irq_del_prt(int segment, int bus)
+void acpi_pci_irq_del_prt(struct pci_bus *bus)
 {
         struct acpi_prt_entry *entry, *tmp;
 
         printk(KERN_DEBUG
                "ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",
-               segment, bus);
+               pci_domain_nr(bus), bus->number);
         spin_lock(&acpi_prt_lock);
         list_for_each_entry_safe(entry, tmp, &acpi_prt_list, list) {
-                if (segment == entry->id.segment && bus == entry->id.bus) {
+                if (pci_domain_nr(bus) == entry->id.segment
+                        && bus->number == entry->id.bus) {
                         list_del(&entry->list);
                         kfree(entry);
                 }
@@ -458,19 +459,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
          */
         if (gsi < 0) {
                 u32 dev_gsi;
+                dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
                 /* Interrupt Line values above 0xF are forbidden */
                 if (dev->irq > 0 && (dev->irq <= 0xF) &&
                     (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
-                        dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
-                                 pin_name(pin), dev->irq);
+                        printk(" - using ISA IRQ %d\n", dev->irq);
                         acpi_register_gsi(&dev->dev, dev_gsi,
                                           ACPI_LEVEL_SENSITIVE,
                                           ACPI_ACTIVE_LOW);
+                        return 0;
                 } else {
-                        dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
-                                 pin_name(pin));
+                        printk("\n");
+                        return 0;
                 }
-                return 0;
         }
 
         rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);
@@ -486,14 +487,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
         else
                 link_desc[0] = '\0';
 
-        dev_dbg(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
-                pin_name(pin), link_desc, gsi,
-                (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
-                (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
+        dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
+                 pin_name(pin), link_desc, gsi,
+                 (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
+                 (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
 
         return 0;
 }
 
+/* FIXME: implement x86/x86_64 version */
+void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
+{
+}
+
 void acpi_pci_irq_disable(struct pci_dev *dev)
 {
         struct acpi_prt_entry *entry;
@@ -518,6 +524,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
          * (e.g. PCI_UNDEFINED_IRQ).
          */
 
-        dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
+        dev_info(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
         acpi_unregister_gsi(gsi);
 }
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index a12808259df..4a29763b8eb 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -720,21 +720,21 @@ static int acpi_pci_link_add(struct acpi_device *device)
                acpi_device_bid(device));
         for (i = 0; i < link->irq.possible_count; i++) {
                 if (link->irq.active == link->irq.possible[i]) {
-                        printk(KERN_CONT " *%d", link->irq.possible[i]);
+                        printk(" *%d", link->irq.possible[i]);
                         found = 1;
                 } else
-                        printk(KERN_CONT " %d", link->irq.possible[i]);
+                        printk(" %d", link->irq.possible[i]);
         }
 
-        printk(KERN_CONT ")");
+        printk(")");
 
         if (!found)
-                printk(KERN_CONT " *%d", link->irq.active);
+                printk(" *%d", link->irq.active);
 
         if (!link->device->status.enabled)
-                printk(KERN_CONT ", disabled.");
+                printk(", disabled.");
 
-        printk(KERN_CONT "\n");
+        printk("\n");
 
         list_add_tail(&link->list, &acpi_link_list);
 
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 7928d4dc705..2672c798272 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/mutex.h>
+#include <linux/spinlock.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/pci.h>
@@ -71,11 +71,9 @@ static struct acpi_driver acpi_pci_root_driver = {
                 },
 };
 
-/* Lock to protect both acpi_pci_roots and acpi_pci_drivers lists */
-static DEFINE_MUTEX(acpi_pci_root_lock);
 static LIST_HEAD(acpi_pci_roots);
-static LIST_HEAD(acpi_pci_drivers);
 
+static struct acpi_pci_driver *sub_driver;
 static DEFINE_MUTEX(osc_lock);
 
 int acpi_pci_register_driver(struct acpi_pci_driver *driver)
@@ -83,46 +81,55 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver)
         int n = 0;
         struct acpi_pci_root *root;
 
-        mutex_lock(&acpi_pci_root_lock);
-        list_add_tail(&driver->node, &acpi_pci_drivers);
-        if (driver->add)
-                list_for_each_entry(root, &acpi_pci_roots, node) {
-                        driver->add(root);
-                        n++;
-                }
-        mutex_unlock(&acpi_pci_root_lock);
+        struct acpi_pci_driver **pptr = &sub_driver;
+        while (*pptr)
+                pptr = &(*pptr)->next;
+        *pptr = driver;
+
+        if (!driver->add)
+                return 0;
+
+        list_for_each_entry(root, &acpi_pci_roots, node) {
+                driver->add(root->device->handle);
+                n++;
+        }
 
         return n;
 }
+
 EXPORT_SYMBOL(acpi_pci_register_driver);
 
 void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
 {
         struct acpi_pci_root *root;
 
-        mutex_lock(&acpi_pci_root_lock);
-        list_del(&driver->node);
-        if (driver->remove)
-                list_for_each_entry(root, &acpi_pci_roots, node)
-                        driver->remove(root);
-        mutex_unlock(&acpi_pci_root_lock);
+        struct acpi_pci_driver **pptr = &sub_driver;
+        while (*pptr) {
+                if (*pptr == driver)
+                        break;
+                pptr = &(*pptr)->next;
+        }
+        BUG_ON(!*pptr);
+        *pptr = (*pptr)->next;
+
+        if (!driver->remove)
+                return;
+
+        list_for_each_entry(root, &acpi_pci_roots, node)
+                driver->remove(root->device->handle);
 }
+
 EXPORT_SYMBOL(acpi_pci_unregister_driver);
 
 acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)
 {
         struct acpi_pci_root *root;
-        acpi_handle handle = NULL;
         
-        mutex_lock(&acpi_pci_root_lock);
         list_for_each_entry(root, &acpi_pci_roots, node)
                 if ((root->segment == (u16) seg) &&
-                    (root->secondary.start == (u16) bus)) {
-                        handle = root->device->handle;
-                        break;
-                }
-        mutex_unlock(&acpi_pci_root_lock);
-        return handle;
+                    (root->secondary.start == (u16) bus))
+                        return root->device->handle;
+        return NULL;            
 }
 
 EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle);
@@ -270,15 +277,12 @@ static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags)
 struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
 {
         struct acpi_pci_root *root;
-        struct acpi_device *device;
-
-        if (acpi_bus_get_device(handle, &device) ||
-            acpi_match_device_ids(device, root_device_ids))
-                return NULL;
 
-        root = acpi_driver_data(device);
-
-        return root;
+        list_for_each_entry(root, &acpi_pci_roots, node) {
+                if (root->device->handle == handle)
+                        return root;
+        }
+        return NULL;
 }
 EXPORT_SYMBOL_GPL(acpi_pci_find_root);
 
@@ -445,7 +449,7 @@ out:
 }
 EXPORT_SYMBOL(acpi_pci_osc_control_set);
 
-static int acpi_pci_root_add(struct acpi_device *device)
+static int __devinit acpi_pci_root_add(struct acpi_device *device)
 {
         unsigned long long segment, bus;
         acpi_status status;
@@ -454,7 +458,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
         acpi_handle handle;
         struct acpi_device *child;
         u32 flags, base_flags;
-        bool is_osc_granted = false;
 
         root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
         if (!root)
@@ -502,47 +505,75 @@ static int acpi_pci_root_add(struct acpi_device *device)
         strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
         device->driver_data = root;
 
+        /*
+         * All supported architectures that use ACPI have support for
+         * PCI domains, so we indicate this in _OSC support capabilities.
+         */
+        flags = base_flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
+        acpi_pci_osc_support(root, flags);
+
+        /*
+         * TBD: Need PCI interface for enumeration/configuration of roots.
+         */
+
+        /* TBD: Locking */
+        list_add_tail(&root->node, &acpi_pci_roots);
+
         printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",
                acpi_device_name(device), acpi_device_bid(device),
                root->segment, &root->secondary);
 
         /*
+         * Scan the Root Bridge
+         * --------------------
+         * Must do this prior to any attempt to bind the root device, as the
+         * PCI namespace does not get created until this call is made (and 
+         * thus the root bridge's pci_dev does not exist).
+         */
+        root->bus = pci_acpi_scan_root(root);
+        if (!root->bus) {
+                printk(KERN_ERR PREFIX
+                            "Bus %04x:%02x not present in PCI namespace\n",
+                            root->segment, (unsigned int)root->secondary.start);
+                result = -ENODEV;
+                goto end;
+        }
+
+        /*
+         * Attach ACPI-PCI Context
+         * -----------------------
+         * Thus binding the ACPI and PCI devices.
+         */
+        result = acpi_pci_bind_root(device);
+        if (result)
+                goto end;
+
+        /*
          * PCI Routing Table
          * -----------------
          * Evaluate and parse _PRT, if exists.
          */
         status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
         if (ACPI_SUCCESS(status))
-                result = acpi_pci_irq_add_prt(device->handle, root->segment,
-                                              root->secondary.start);
-
-        root->mcfg_addr = acpi_pci_root_get_mcfg_addr(device->handle);
+                result = acpi_pci_irq_add_prt(device->handle, root->bus);
 
         /*
-         * All supported architectures that use ACPI have support for
-         * PCI domains, so we indicate this in _OSC support capabilities.
+         * Scan and bind all _ADR-Based Devices
          */
-        flags = base_flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
-        acpi_pci_osc_support(root, flags);
+        list_for_each_entry(child, &device->children, node)
+                acpi_pci_bridge_scan(child);
 
         /* Indicate support for various _OSC capabilities. */
-        if (pci_ext_cfg_avail())
+        if (pci_ext_cfg_avail(root->bus->self))
                 flags |= OSC_EXT_PCI_CONFIG_SUPPORT;
-        if (pcie_aspm_support_enabled()) {
+        if (pcie_aspm_support_enabled())
                 flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |
-                OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
-        }
+                        OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
         if (pci_msi_enabled())
                 flags |= OSC_MSI_SUPPORT;
-        if (flags != base_flags) {
-                status = acpi_pci_osc_support(root, flags);
-                if (ACPI_FAILURE(status)) {
-                        dev_info(&device->dev, "ACPI _OSC support "
-                                "notification failed, disabling PCIe ASPM\n");
-                        pcie_no_aspm();
-                        flags = base_flags;
-                }
-        }
+        if (flags != base_flags)
+                acpi_pci_osc_support(root, flags);
+
         if (!pcie_ports_disabled
             && (flags & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) {
                 flags = OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL
@@ -551,81 +582,33 @@ static int acpi_pci_root_add(struct acpi_device *device)
 
                 if (pci_aer_available()) {
                         if (aer_acpi_firmware_first())
-                                dev_dbg(&device->dev,
+                                dev_dbg(root->bus->bridge,
                                         "PCIe errors handled by BIOS.\n");
                         else
                                 flags |= OSC_PCI_EXPRESS_AER_CONTROL;
                 }
 
-                dev_info(&device->dev,
+                dev_info(root->bus->bridge,
                         "Requesting ACPI _OSC control (0x%02x)\n", flags);
 
                 status = acpi_pci_osc_control_set(device->handle, &flags,
-                                       OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
+                                        OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
                 if (ACPI_SUCCESS(status)) {
-                        is_osc_granted = true;
-                        dev_info(&device->dev,
+                        dev_info(root->bus->bridge,
                                 "ACPI _OSC control (0x%02x) granted\n", flags);
                 } else {
-                        is_osc_granted = false;
-                        dev_info(&device->dev,
+                        dev_info(root->bus->bridge,
                                 "ACPI _OSC request failed (%s), "
                                 "returned control mask: 0x%02x\n",
                                 acpi_format_exception(status), flags);
+                        pr_info("ACPI _OSC control for PCIe not granted, "
+                                "disabling ASPM\n");
+                        pcie_no_aspm();
                 }
         } else {
-                dev_info(&device->dev,
-                        "Unable to request _OSC control "
-                        "(_OSC support mask: 0x%02x)\n", flags);
-        }
-
-        /*
-         * TBD: Need PCI interface for enumeration/configuration of roots.
-         */
-
-        mutex_lock(&acpi_pci_root_lock);
-        list_add_tail(&root->node, &acpi_pci_roots);
-        mutex_unlock(&acpi_pci_root_lock);
-
-        /*
-         * Scan the Root Bridge
-         * --------------------
-         * Must do this prior to any attempt to bind the root device, as the
-         * PCI namespace does not get created until this call is made (and 
-         * thus the root bridge's pci_dev does not exist).
-         */
-        root->bus = pci_acpi_scan_root(root);
-        if (!root->bus) {
-                printk(KERN_ERR PREFIX
-                            "Bus %04x:%02x not present in PCI namespace\n",
-                            root->segment, (unsigned int)root->secondary.start);
-                result = -ENODEV;
-                goto out_del_root;
-        }
-
-        /*
-         * Attach ACPI-PCI Context
-         * -----------------------
-         * Thus binding the ACPI and PCI devices.
-         */
-        result = acpi_pci_bind_root(device);
-        if (result)
-                goto out_del_root;
-
-        /*
-         * Scan and bind all _ADR-Based Devices
-         */
-        list_for_each_entry(child, &device->children, node)
-                acpi_pci_bridge_scan(child);
-
-        /* ASPM setting */
-        if (is_osc_granted) {
-                if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM)
-                        pcie_clear_aspm(root->bus);
-        } else {
-                pr_info("ACPI _OSC control for PCIe not granted, "
-                        "disabling ASPM\n");
-                pcie_no_aspm();
+                dev_info(root->bus->bridge,
+                         "Unable to request _OSC control "
+                         "(_OSC support mask: 0x%02x)\n", flags);
         }
 
         pci_acpi_add_bus_pm_notifier(device, root->bus);
@@ -634,13 +617,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
 
         return 0;
 
-out_del_root:
-        mutex_lock(&acpi_pci_root_lock);
-        list_del(&root->node);
-        mutex_unlock(&acpi_pci_root_lock);
-
-        acpi_pci_irq_del_prt(root->segment, root->secondary.start);
 end:
+        if (!list_empty(&root->node))
+                list_del(&root->node);
         kfree(root);
         return result;
 }
@@ -648,53 +627,18 @@ end:
 static int acpi_pci_root_start(struct acpi_device *device)
 {
         struct acpi_pci_root *root = acpi_driver_data(device);
-        struct acpi_pci_driver *driver;
-
-        if (system_state != SYSTEM_BOOTING)
-                pci_assign_unassigned_bus_resources(root->bus);
-
-        mutex_lock(&acpi_pci_root_lock);
-        list_for_each_entry(driver, &acpi_pci_drivers, node)
-                if (driver->add)
-                        driver->add(root);
-        mutex_unlock(&acpi_pci_root_lock);
-
-        /* need to after hot-added ioapic is registered */
-        if (system_state != SYSTEM_BOOTING)
-                pci_enable_bridges(root->bus);
 
         pci_bus_add_devices(root->bus);
-
         return 0;
 }
 
 static int acpi_pci_root_remove(struct acpi_device *device, int type)
 {
-        acpi_status status;
-        acpi_handle handle;
         struct acpi_pci_root *root = acpi_driver_data(device);
-        struct acpi_pci_driver *driver;
-
-        pci_stop_root_bus(root->bus);
-
-        mutex_lock(&acpi_pci_root_lock);
-        list_for_each_entry_reverse(driver, &acpi_pci_drivers, node)
-                if (driver->remove)
-                        driver->remove(root);
-        mutex_unlock(&acpi_pci_root_lock);
 
         device_set_run_wake(root->bus->bridge, false);
         pci_acpi_remove_bus_pm_notifier(device);
 
-        status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
-        if (ACPI_SUCCESS(status))
-                acpi_pci_irq_del_prt(root->segment, root->secondary.start);
-
-        pci_remove_root_bus(root->bus);
-
-        mutex_lock(&acpi_pci_root_lock);
-        list_del(&root->node);
-        mutex_unlock(&acpi_pci_root_lock);
         kfree(root);
         return 0;
 }
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index d22585f21ae..07f7fea8a4e 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -34,7 +34,7 @@
 #include <acpi/acpi_drivers.h>
 #include <linux/dmi.h>
 
-static bool debug;
+static int debug;
 static int check_sta_before_sun;
 
 #define DRIVER_VERSION  "0.1"
@@ -67,8 +67,8 @@ struct acpi_pci_slot {
         struct list_head list;          /* node in the list of slots */
 };
 
-static int acpi_pci_slot_add(struct acpi_pci_root *root);
-static void acpi_pci_slot_remove(struct acpi_pci_root *root);
+static int acpi_pci_slot_add(acpi_handle handle);
+static void acpi_pci_slot_remove(acpi_handle handle);
 
 static LIST_HEAD(slot_list);
 static DEFINE_MUTEX(slot_list_lock);
@@ -233,20 +233,45 @@ out:
 
 /*
  * walk_root_bridge - generic root bridge walker
- * @root: poiner of an acpi_pci_root
+ * @handle: points to an acpi_pci_root
  * @user_function: user callback for slot objects
  *
  * Call user_function for all objects underneath this root bridge.
  * Walk p2p bridges underneath us and call user_function on those too.
  */
 static int
-walk_root_bridge(struct acpi_pci_root *root, acpi_walk_callback user_function)
+walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function)
 {
+        int seg, bus;
+        unsigned long long tmp;
         acpi_status status;
-        acpi_handle handle = root->device->handle;
-        struct pci_bus *pci_bus = root->bus;
+        acpi_handle dummy_handle;
+        struct pci_bus *pci_bus;
         struct callback_args context;
 
+        /* If the bridge doesn't have _STA, we assume it is always there */
+        status = acpi_get_handle(handle, "_STA", &dummy_handle);
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_evaluate_integer(handle, "_STA", NULL, &tmp);
+                if (ACPI_FAILURE(status)) {
+                        info("%s: _STA evaluation failure\n", __func__);
+                        return 0;
+                }
+                if ((tmp & ACPI_STA_DEVICE_FUNCTIONING) == 0)
+                        /* don't register this object */
+                        return 0;
+        }
+
+        status = acpi_evaluate_integer(handle, "_SEG", NULL, &tmp);
+        seg = ACPI_SUCCESS(status) ? tmp : 0;
+
+        status = acpi_evaluate_integer(handle, "_BBN", NULL, &tmp);
+        bus = ACPI_SUCCESS(status) ? tmp : 0;
+
+        pci_bus = pci_find_bus(seg, bus);
+        if (!pci_bus)
+                return 0;
+
         context.pci_bus = pci_bus;
         context.user_function = user_function;
         context.root_handle = handle;
@@ -270,11 +295,11 @@ walk_root_bridge(struct acpi_pci_root *root, acpi_walk_callback user_function)
  * @handle: points to an acpi_pci_root
  */
 static int
-acpi_pci_slot_add(struct acpi_pci_root *root)
+acpi_pci_slot_add(acpi_handle handle)
 {
         acpi_status status;
 
-        status = walk_root_bridge(root, register_slot);
+        status = walk_root_bridge(handle, register_slot);
         if (ACPI_FAILURE(status))
                 err("%s: register_slot failure - %d\n", __func__, status);
 
@@ -286,11 +311,10 @@ acpi_pci_slot_add(struct acpi_pci_root *root)
  * @handle: points to an acpi_pci_root
  */
 static void
-acpi_pci_slot_remove(struct acpi_pci_root *root)
+acpi_pci_slot_remove(acpi_handle handle)
 {
         struct acpi_pci_slot *slot, *tmp;
         struct pci_bus *pbus;
-        acpi_handle handle = root->device->handle;
 
         mutex_lock(&slot_list_lock);
         list_for_each_entry_safe(slot, tmp, &slot_list, list) {
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 6e7b9d52381..9ac2a9fa90f 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -40,11 +40,9 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include <linux/pm_runtime.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
-#include "internal.h"
 
 #define PREFIX "ACPI: "
 
@@ -60,6 +58,7 @@ ACPI_MODULE_NAME("power");
 
 static int acpi_power_add(struct acpi_device *device);
 static int acpi_power_remove(struct acpi_device *device, int type);
+static int acpi_power_resume(struct acpi_device *device);
 
 static const struct acpi_device_id power_device_ids[] = {
         {ACPI_POWER_HID, 0},
@@ -67,11 +66,6 @@ static const struct acpi_device_id power_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, power_device_ids);
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_power_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);
-
 static struct acpi_driver acpi_power_driver = {
         .name = "power",
         .class = ACPI_POWER_CLASS,
@@ -79,22 +73,8 @@ static struct acpi_driver acpi_power_driver = {
         .ops = {
                 .add = acpi_power_add,
                 .remove = acpi_power_remove,
+                .resume = acpi_power_resume,
                 },
-        .drv.pm = &acpi_power_pm,
-};
-
-/*
- * A power managed device
- * A device may rely on multiple power resources.
- * */
-struct acpi_power_managed_device {
-        struct device *dev; /* The physical device */
-        acpi_handle *handle;
-};
-
-struct acpi_power_resource_device {
-        struct acpi_power_managed_device *device;
-        struct acpi_power_resource_device *next;
 };
 
 struct acpi_power_resource {
@@ -104,10 +84,6 @@ struct acpi_power_resource {
         u32 order;
         unsigned int ref_count;
         struct mutex resource_lock;
-
-        /* List of devices relying on this power resource */
-        struct acpi_power_resource_device *devices;
-        struct mutex devices_lock;
 };
 
 static struct list_head acpi_power_resource_list;
@@ -207,23 +183,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
         return 0;
 }
 
-/* Resume the device when all power resources in _PR0 are on */
-static void acpi_power_on_device(struct acpi_power_managed_device *device)
-{
-        struct acpi_device *acpi_dev;
-        acpi_handle handle = device->handle;
-        int state;
-
-        if (acpi_bus_get_device(handle, &acpi_dev))
-                return;
-
-        if(acpi_power_get_inferred_state(acpi_dev, &state))
-                return;
-
-        if (state == ACPI_STATE_D0 && pm_runtime_suspended(device->dev))
-                pm_request_resume(device->dev);
-}
-
 static int __acpi_power_on(struct acpi_power_resource *resource)
 {
         acpi_status status = AE_OK;
@@ -244,9 +203,7 @@ static int __acpi_power_on(struct acpi_power_resource *resource)
 static int acpi_power_on(acpi_handle handle)
 {
         int result = 0;
-        bool resume_device = false;
         struct acpi_power_resource *resource = NULL;
-        struct acpi_power_resource_device *device_list;
 
         result = acpi_power_get_context(handle, &resource);
         if (result)
@@ -262,25 +219,10 @@ static int acpi_power_on(acpi_handle handle)
                 result = __acpi_power_on(resource);
                 if (result)
                         resource->ref_count--;
-                else
-                        resume_device = true;
         }
 
         mutex_unlock(&resource->resource_lock);
 
-        if (!resume_device)
-                return result;
-
-        mutex_lock(&resource->devices_lock);
-
-        device_list = resource->devices;
-        while (device_list) {
-                acpi_power_on_device(device_list->device);
-                device_list = device_list->next;
-        }
-
-        mutex_unlock(&resource->devices_lock);
-
         return result;
 }
 
@@ -357,120 +299,6 @@ static int acpi_power_on_list(struct acpi_handle_list *list)
         return result;
 }
 
-static void __acpi_power_resource_unregister_device(struct device *dev,
-                acpi_handle res_handle)
-{
-        struct acpi_power_resource *resource = NULL;
-        struct acpi_power_resource_device *prev, *curr;
-
-        if (acpi_power_get_context(res_handle, &resource))
-                return;
-
-        mutex_lock(&resource->devices_lock);
-        prev = NULL;
-        curr = resource->devices;
-        while (curr) {
-                if (curr->device->dev == dev) {
-                        if (!prev)
-                                resource->devices = curr->next;
-                        else
-                                prev->next = curr->next;
-
-                        kfree(curr);
-                        break;
-                }
-
-                prev = curr;
-                curr = curr->next;
-        }
-        mutex_unlock(&resource->devices_lock);
-}
-
-/* Unlink dev from all power resources in _PR0 */
-void acpi_power_resource_unregister_device(struct device *dev, acpi_handle handle)
-{
-        struct acpi_device *acpi_dev;
-        struct acpi_handle_list *list;
-        int i;
-
-        if (!dev || !handle)
-                return;
-
-        if (acpi_bus_get_device(handle, &acpi_dev))
-                return;
-
-        list = &acpi_dev->power.states[ACPI_STATE_D0].resources;
-
-        for (i = 0; i < list->count; i++)
-                __acpi_power_resource_unregister_device(dev,
-                        list->handles[i]);
-}
-EXPORT_SYMBOL_GPL(acpi_power_resource_unregister_device);
-
-static int __acpi_power_resource_register_device(
-        struct acpi_power_managed_device *powered_device, acpi_handle handle)
-{
-        struct acpi_power_resource *resource = NULL;
-        struct acpi_power_resource_device *power_resource_device;
-        int result;
-
-        result = acpi_power_get_context(handle, &resource);
-        if (result)
-                return result;
-
-        power_resource_device = kzalloc(
-                sizeof(*power_resource_device), GFP_KERNEL);
-        if (!power_resource_device)
-                return -ENOMEM;
-
-        power_resource_device->device = powered_device;
-
-        mutex_lock(&resource->devices_lock);
-        power_resource_device->next = resource->devices;
-        resource->devices = power_resource_device;
-        mutex_unlock(&resource->devices_lock);
-
-        return 0;
-}
-
-/* Link dev to all power resources in _PR0 */
-int acpi_power_resource_register_device(struct device *dev, acpi_handle handle)
-{
-        struct acpi_device *acpi_dev;
-        struct acpi_handle_list *list;
-        struct acpi_power_managed_device *powered_device;
-        int i, ret;
-
-        if (!dev || !handle)
-                return -ENODEV;
-
-        ret = acpi_bus_get_device(handle, &acpi_dev);
-        if (ret || !acpi_dev->power.flags.power_resources)
-                return -ENODEV;
-
-        powered_device = kzalloc(sizeof(*powered_device), GFP_KERNEL);
-        if (!powered_device)
-                return -ENOMEM;
-
-        powered_device->dev = dev;
-        powered_device->handle = handle;
-
-        list = &acpi_dev->power.states[ACPI_STATE_D0].resources;
-
-        for (i = 0; i < list->count; i++) {
-                ret = __acpi_power_resource_register_device(powered_device,
-                        list->handles[i]);
-
-                if (ret) {
-                        acpi_power_resource_unregister_device(dev, handle);
-                        break;
-                }
-        }
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(acpi_power_resource_register_device);
-
 /**
  * acpi_device_sleep_wake - execute _DSW (Device Sleep Wake) or (deprecated in
  *                          ACPI 3.0) _PSW (Power State Wake)
@@ -641,7 +469,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
          */
-        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {
+        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3; i++) {
                 list = &device->power.states[i].resources;
                 if (list->count < 1)
                         continue;
@@ -670,16 +498,16 @@ int acpi_power_on_resources(struct acpi_device *device, int state)
 
 int acpi_power_transition(struct acpi_device *device, int state)
 {
-        int result = 0;
+        int result;
 
-        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
+        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                 return -EINVAL;
 
         if (device->power.state == state)
                 return 0;
 
         if ((device->power.state < ACPI_STATE_D0)
-            || (device->power.state > ACPI_STATE_D3_COLD))
+            || (device->power.state > ACPI_STATE_D3))
                 return -ENODEV;
 
         /* TBD: Resources must be ordered. */
@@ -689,11 +517,8 @@ int acpi_power_transition(struct acpi_device *device, int state)
          * (e.g. so the device doesn't lose power while transitioning).  Then,
          * we dereference all power resources used in the current list.
          */
-        if (state < ACPI_STATE_D3_COLD)
-                result = acpi_power_on_list(
-                        &device->power.states[state].resources);
-
-        if (!result && device->power.state < ACPI_STATE_D3_COLD)
+        result = acpi_power_on_list(&device->power.states[state].resources);
+        if (!result)
                 acpi_power_off_list(
                         &device->power.states[device->power.state].resources);
 
@@ -725,7 +550,6 @@ static int acpi_power_add(struct acpi_device *device)
 
         resource->device = device;
         mutex_init(&resource->resource_lock);
-        mutex_init(&resource->devices_lock);
         strcpy(resource->name, device->pnp.bus_id);
         strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
@@ -782,17 +606,14 @@ static int acpi_power_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_power_resume(struct device *dev)
+static int acpi_power_resume(struct acpi_device *device)
 {
         int result = 0, state;
-        struct acpi_device *device;
         struct acpi_power_resource *resource;
 
-        if (!dev)
+        if (!device)
                 return -EINVAL;
 
-        device = to_acpi_device(dev);
         resource = acpi_driver_data(device);
         if (!resource)
                 return -EINVAL;
@@ -811,7 +632,6 @@ static int acpi_power_resume(struct device *dev)
 
         return result;
 }
-#endif
 
 int __init acpi_power_init(void)
 {
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index ef98796b382..f5f986991b5 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -1,6 +1,5 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/bcd.h>
 #include <asm/uaccess.h>
@@ -302,41 +301,26 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                     container_of(node, struct acpi_device, wakeup_list);
-                struct acpi_device_physical_node *entry;
+                struct device *ldev;
 
                 if (!dev->wakeup.flags.valid)
                         continue;
 
-                seq_printf(seq, "%s\t  S%d\t",
+                ldev = acpi_get_physical_device(dev->handle);
+                seq_printf(seq, "%s\t  S%d\t%c%-8s  ",
                            dev->pnp.bus_id,
-                           (u32) dev->wakeup.sleep_state);
-
-                if (!dev->physical_node_count)
-                        seq_printf(seq, "%c%-8s\n",
-                                dev->wakeup.flags.run_wake ?
-                                '*' : ' ', "disabled");
-                else {
-                        struct device *ldev;
-                        list_for_each_entry(entry, &dev->physical_node_list,
-                                        node) {
-                                ldev = get_device(entry->dev);
-                                if (!ldev)
-                                        continue;
-
-                                if (&entry->node !=
-                                                dev->physical_node_list.next)
-                                        seq_printf(seq, "\t\t");
-
-                                seq_printf(seq, "%c%-8s  %s:%s\n",
-                                        dev->wakeup.flags.run_wake ? '*' : ' ',
-                                        (device_may_wakeup(&dev->dev) ||
-                                        (ldev && device_may_wakeup(ldev))) ?
-                                        "enabled" : "disabled",
-                                        ldev->bus ? ldev->bus->name :
-                                        "no-bus", dev_name(ldev));
-                                put_device(ldev);
-                        }
-                }
+                           (u32) dev->wakeup.sleep_state,
+                           dev->wakeup.flags.run_wake ? '*' : ' ',
+                           (device_may_wakeup(&dev->dev)
+                             || (ldev && device_may_wakeup(ldev))) ?
+                               "enabled" : "disabled");
+                if (ldev)
+                        seq_printf(seq, "%s:%s",
+                                   ldev->bus ? ldev->bus->name : "no-bus",
+                                   dev_name(ldev));
+                seq_printf(seq, "\n");
+                put_device(ldev);
+
         }
         mutex_unlock(&acpi_device_lock);
         return 0;
@@ -344,14 +328,12 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 
 static void physical_device_enable_wakeup(struct acpi_device *adev)
 {
-        struct acpi_device_physical_node *entry;
+        struct device *dev = acpi_get_physical_device(adev->handle);
 
-        list_for_each_entry(entry,
-                &adev->physical_node_list, node)
-                if (entry->dev && device_can_wakeup(entry->dev)) {
-                        bool enable = !device_may_wakeup(entry->dev);
-                        device_set_wakeup_enable(entry->dev, enable);
-                }
+        if (dev && device_can_wakeup(dev)) {
+                bool enable = !device_may_wakeup(dev);
+                device_set_wakeup_enable(dev, enable);
+        }
 }
 
 static ssize_t
@@ -362,13 +344,16 @@ acpi_system_write_wakeup_device(struct file *file,
         struct list_head *node, *next;
         char strbuf[5];
         char str[5] = "";
+        unsigned int len = count;
 
-        if (count > 4)
-                count = 4;
+        if (len > 4)
+                len = 4;
+        if (len < 0)
+                return -EFAULT;
 
-        if (copy_from_user(strbuf, buffer, count))
+        if (copy_from_user(strbuf, buffer, len))
                 return -EFAULT;
-        strbuf[count] = '\0';
+        strbuf[len] = '\0';
         sscanf(strbuf, "%s", str);
 
         mutex_lock(&acpi_device_lock);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index eff722278ff..02d2a4c9084 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -7,7 +7,6 @@
  *      Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
  *      - Added _PDC for platforms with Intel CPUs
  */
-#include <linux/export.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
 
@@ -173,32 +172,8 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
         apic_id = map_mat_entry(handle, type, acpi_id);
         if (apic_id == -1)
                 apic_id = map_madt_entry(type, acpi_id);
-        if (apic_id == -1) {
-                /*
-                 * On UP processor, there is no _MAT or MADT table.
-                 * So above apic_id is always set to -1.
-                 *
-                 * BIOS may define multiple CPU handles even for UP processor.
-                 * For example,
-                 *
-                 * Scope (_PR)
-                 * {
-                 *     Processor (CPU0, 0x00, 0x00000410, 0x06) {}
-                 *     Processor (CPU1, 0x01, 0x00000410, 0x06) {}
-                 *     Processor (CPU2, 0x02, 0x00000410, 0x06) {}
-                 *     Processor (CPU3, 0x03, 0x00000410, 0x06) {}
-                 * }
-                 *
-                 * Ignores apic_id and always returns 0 for the processor
-                 * handle with acpi id 0 if nr_cpu_ids is 1.
-                 * This should be the case if SMP tables are not found.
-                 * Return -1 for other CPU's handle.
-                 */
-                if (nr_cpu_ids <= 1 && acpi_id == 0)
-                        return acpi_id;
-                else
-                        return apic_id;
-        }
+        if (apic_id == -1)
+                return apic_id;
 
 #ifdef CONFIG_SMP
         for_each_possible_cpu(i) {
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index e83311bf1eb..a4e0f1ba604 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -44,9 +44,9 @@
 #include <linux/moduleparam.h>
 #include <linux/cpuidle.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
 
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/cpu.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
@@ -68,7 +68,6 @@
 #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
 #define ACPI_PROCESSOR_NOTIFY_POWER     0x81
 #define ACPI_PROCESSOR_NOTIFY_THROTTLING        0x82
-#define ACPI_PROCESSOR_DEVICE_HID       "ACPI0007"
 
 #define ACPI_PROCESSOR_LIMIT_USER       0
 #define ACPI_PROCESSOR_LIMIT_THERMAL    1
@@ -83,20 +82,17 @@ MODULE_LICENSE("GPL");
 static int acpi_processor_add(struct acpi_device *device);
 static int acpi_processor_remove(struct acpi_device *device, int type);
 static void acpi_processor_notify(struct acpi_device *device, u32 event);
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);
+static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
 static int acpi_processor_handle_eject(struct acpi_processor *pr);
-static int acpi_processor_start(struct acpi_processor *pr);
+
 
 static const struct acpi_device_id processor_device_ids[] = {
         {ACPI_PROCESSOR_OBJECT_HID, 0},
-        {ACPI_PROCESSOR_DEVICE_HID, 0},
+        {"ACPI0007", 0},
         {"", 0},
 };
 MODULE_DEVICE_TABLE(acpi, processor_device_ids);
 
-static SIMPLE_DEV_PM_OPS(acpi_processor_pm,
-                         acpi_processor_suspend, acpi_processor_resume);
-
 static struct acpi_driver acpi_processor_driver = {
         .name = "processor",
         .class = ACPI_PROCESSOR_CLASS,
@@ -104,9 +100,10 @@ static struct acpi_driver acpi_processor_driver = {
         .ops = {
                 .add = acpi_processor_add,
                 .remove = acpi_processor_remove,
+                .suspend = acpi_processor_suspend,
+                .resume = acpi_processor_resume,
                 .notify = acpi_processor_notify,
                 },
-        .drv.pm = &acpi_processor_pm,
 };
 
 #define INSTALL_NOTIFY_HANDLER          1
@@ -283,9 +280,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
                 /* Declared with "Processor" statement; match ProcessorID */
                 status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
                 if (ACPI_FAILURE(status)) {
-                        dev_err(&device->dev,
-                                "Failed to evaluate processor object (0x%x)\n",
-                                status);
+                        printk(KERN_ERR PREFIX "Evaluating processor object\n");
                         return -ENODEV;
                 }
 
@@ -304,9 +299,8 @@ static int acpi_processor_get_info(struct acpi_device *device)
                 status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
                                                 NULL, &value);
                 if (ACPI_FAILURE(status)) {
-                        dev_err(&device->dev,
-                                "Failed to evaluate processor _UID (0x%x)\n",
-                                status);
+                        printk(KERN_ERR PREFIX
+                            "Evaluating processor _UID [%#x]\n", status);
                         return -ENODEV;
                 }
                 device_declaration = 1;
@@ -330,8 +324,10 @@ static int acpi_processor_get_info(struct acpi_device *device)
          *  they are physically not present.
          */
         if (pr->id == -1) {
-                if (ACPI_FAILURE(acpi_processor_hotadd_init(pr)))
+                if (ACPI_FAILURE
+                    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
                         return -ENODEV;
+                }
         }
         /*
          * On some boxes several processors use the same processor bus id.
@@ -349,7 +345,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
         if (!object.processor.pblk_address)
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
         else if (object.processor.pblk_length != 6)
-                dev_err(&device->dev, "Invalid PBLK length [%d]\n",
+                printk(KERN_ERR PREFIX "Invalid PBLK length [%d]\n",
                             object.processor.pblk_length);
         else {
                 pr->throttling.address = object.processor.pblk_address;
@@ -413,7 +409,6 @@ static void acpi_processor_notify(struct acpi_device *device, u32 event)
                 acpi_bus_generate_proc_event(device, event, 0);
                 acpi_bus_generate_netlink_event(device->pnp.device_class,
                                                   dev_name(&device->dev), event, 0);
-                break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
@@ -430,22 +425,10 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         struct acpi_processor *pr = per_cpu(processors, cpu);
 
         if (action == CPU_ONLINE && pr) {
-                /* CPU got physically hotplugged and onlined the first time:
-                 * Initialize missing things
-                 */
-                if (pr->flags.need_hotplug_init) {
-                        pr_info("Will online and init hotplugged CPU: %d\n",
-                                pr->id);
-                        WARN(acpi_processor_start(pr), "Failed to start CPU:"
-                                " %d\n", pr->id);
-                        pr->flags.need_hotplug_init = 0;
-                /* Normal CPU soft online event */
-                } else {
-                        acpi_processor_ppc_has_changed(pr, 0);
-                        acpi_processor_hotplug(pr);
-                        acpi_processor_reevaluate_tstate(pr, action);
-                        acpi_processor_tstate_has_changed(pr);
-                }
+                acpi_processor_ppc_has_changed(pr, 0);
+                acpi_processor_cst_has_changed(pr);
+                acpi_processor_reevaluate_tstate(pr, action);
+                acpi_processor_tstate_has_changed(pr);
         }
         if (action == CPU_DEAD && pr) {
                 /* invalidate the flag.throttling after one CPU is offline */
@@ -459,87 +442,19 @@ static struct notifier_block acpi_cpu_notifier =
             .notifier_call = acpi_cpu_soft_notify,
 };
 
-/*
- * acpi_processor_start() is called by the cpu_hotplug_notifier func:
- * acpi_cpu_soft_notify(). Getting it __cpuinit{data} is difficult, the
- * root cause seem to be that acpi_processor_uninstall_hotplug_notify()
- * is in the module_exit (__exit) func. Allowing acpi_processor_start()
- * to not be in __cpuinit section, but being called from __cpuinit funcs
- * via __ref looks like the right thing to do here.
- */
-static __ref int acpi_processor_start(struct acpi_processor *pr)
-{
-        struct acpi_device *device = per_cpu(processor_device_array, pr->id);
-        int result = 0;
-
-#ifdef CONFIG_CPU_FREQ
-        acpi_processor_ppc_has_changed(pr, 0);
-        acpi_processor_load_module(pr);
-#endif
-        acpi_processor_get_throttling_info(pr);
-        acpi_processor_get_limit_info(pr);
-
-        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
-                acpi_processor_power_init(pr);
-
-        pr->cdev = thermal_cooling_device_register("Processor", device,
-                                                   &processor_cooling_ops);
-        if (IS_ERR(pr->cdev)) {
-                result = PTR_ERR(pr->cdev);
-                goto err_power_exit;
-        }
-
-        dev_dbg(&device->dev, "registered as cooling_device%d\n",
-                pr->cdev->id);
-
-        result = sysfs_create_link(&device->dev.kobj,
-                                   &pr->cdev->device.kobj,
-                                   "thermal_cooling");
-        if (result) {
-                dev_err(&device->dev,
-                        "Failed to create sysfs link 'thermal_cooling'\n");
-                goto err_thermal_unregister;
-        }
-        result = sysfs_create_link(&pr->cdev->device.kobj,
-                                   &device->dev.kobj,
-                                   "device");
-        if (result) {
-                dev_err(&pr->cdev->device,
-                        "Failed to create sysfs link 'device'\n");
-                goto err_remove_sysfs_thermal;
-        }
-
-        return 0;
-
-err_remove_sysfs_thermal:
-        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-err_thermal_unregister:
-        thermal_cooling_device_unregister(pr->cdev);
-err_power_exit:
-        acpi_processor_power_exit(pr);
-
-        return result;
-}
-
-/*
- * Do not put anything in here which needs the core to be online.
- * For example MSR access or setting up things which check for cpuinfo_x86
- * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc.
- * Such things have to be put in and set up above in acpi_processor_start()
- */
 static int __cpuinit acpi_processor_add(struct acpi_device *device)
 {
         struct acpi_processor *pr = NULL;
         int result = 0;
-        struct device *dev;
+        struct sys_device *sysdev;
 
         pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
         if (!pr)
                 return -ENOMEM;
 
         if (!zalloc_cpumask_var(&pr->throttling.shared_cpu_map, GFP_KERNEL)) {
-                result = -ENOMEM;
-                goto err_free_pr;
+                kfree(pr);
+                return -ENOMEM;
         }
 
         pr->handle = device->handle;
@@ -567,9 +482,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
          */
         if (per_cpu(processor_device_array, pr->id) != NULL &&
             per_cpu(processor_device_array, pr->id) != device) {
-                dev_warn(&device->dev,
-                        "BIOS reported wrong ACPI id %d for the processor\n",
-                        pr->id);
+                printk(KERN_WARNING "BIOS reported wrong ACPI id "
+                        "for the processor\n");
                 result = -ENODEV;
                 goto err_free_cpumask;
         }
@@ -577,36 +491,58 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
 
         per_cpu(processors, pr->id) = pr;
 
-        dev = get_cpu_device(pr->id);
-        if (sysfs_create_link(&device->dev.kobj, &dev->kobj, "sysdev")) {
+        sysdev = get_cpu_sysdev(pr->id);
+        if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
                 result = -EFAULT;
-                goto err_clear_processor;
+                goto err_free_cpumask;
         }
 
-        /*
-         * Do not start hotplugged CPUs now, but when they
-         * are onlined the first time
-         */
-        if (pr->flags.need_hotplug_init)
-                return 0;
+#ifdef CONFIG_CPU_FREQ
+        acpi_processor_ppc_has_changed(pr, 0);
+#endif
+        acpi_processor_get_throttling_info(pr);
+        acpi_processor_get_limit_info(pr);
+
+
+        if (cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr, device);
+
+        pr->cdev = thermal_cooling_device_register("Processor", device,
+                                                &processor_cooling_ops);
+        if (IS_ERR(pr->cdev)) {
+                result = PTR_ERR(pr->cdev);
+                goto err_power_exit;
+        }
 
-        result = acpi_processor_start(pr);
-        if (result)
+        dev_dbg(&device->dev, "registered as cooling_device%d\n",
+                 pr->cdev->id);
+
+        result = sysfs_create_link(&device->dev.kobj,
+                                   &pr->cdev->device.kobj,
+                                   "thermal_cooling");
+        if (result) {
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                goto err_thermal_unregister;
+        }
+        result = sysfs_create_link(&pr->cdev->device.kobj,
+                                   &device->dev.kobj,
+                                   "device");
+        if (result) {
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
                 goto err_remove_sysfs;
+        }
 
         return 0;
 
 err_remove_sysfs:
-        sysfs_remove_link(&device->dev.kobj, "sysdev");
-err_clear_processor:
-        /*
-         * processor_device_array is not cleared to allow checks for buggy BIOS
-         */ 
-        per_cpu(processors, pr->id) = NULL;
+        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+err_thermal_unregister:
+        thermal_cooling_device_unregister(pr->cdev);
+err_power_exit:
+        acpi_processor_power_exit(pr, device);
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
-err_free_pr:
-        kfree(pr);
+
         return result;
 }
 
@@ -628,7 +564,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
                         return -EINVAL;
         }
 
-        acpi_processor_power_exit(pr);
+        acpi_processor_power_exit(pr, device);
 
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 
@@ -702,11 +638,11 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
 static void acpi_processor_hotplug_notify(acpi_handle handle,
                                           u32 event, void *data)
 {
+        struct acpi_processor *pr;
         struct acpi_device *device = NULL;
-        struct acpi_eject_event *ej_event = NULL;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
         int result;
 
+
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
         case ACPI_NOTIFY_DEVICE_CHECK:
@@ -718,100 +654,53 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                 if (!is_processor_present(handle))
                         break;
 
-                if (!acpi_bus_get_device(handle, &device))
-                        break;
-
-                result = acpi_processor_device_add(handle, &device);
-                if (result) {
-                        acpi_handle_err(handle, "Unable to add the device\n");
+                if (acpi_bus_get_device(handle, &device)) {
+                        result = acpi_processor_device_add(handle, &device);
+                        if (result)
+                                printk(KERN_ERR PREFIX
+                                            "Unable to add the device\n");
                         break;
                 }
-
-                ost_code = ACPI_OST_SC_SUCCESS;
                 break;
-
         case ACPI_NOTIFY_EJECT_REQUEST:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "received ACPI_NOTIFY_EJECT_REQUEST\n"));
 
                 if (acpi_bus_get_device(handle, &device)) {
-                        acpi_handle_err(handle,
-                                "Device don't exist, dropping EJECT\n");
-                        break;
-                }
-                if (!acpi_driver_data(device)) {
-                        acpi_handle_err(handle,
-                                "Driver data is NULL, dropping EJECT\n");
+                        printk(KERN_ERR PREFIX
+                                    "Device don't exist, dropping EJECT\n");
                         break;
                 }
-
-                ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-                if (!ej_event) {
-                        acpi_handle_err(handle, "No memory, dropping EJECT\n");
-                        break;
+                pr = acpi_driver_data(device);
+                if (!pr) {
+                        printk(KERN_ERR PREFIX
+                                    "Driver data is NULL, dropping EJECT\n");
+                        return;
                 }
-
-                ej_event->handle = handle;
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-                acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
-                                        (void *)ej_event);
-
-                /* eject is performed asynchronously */
-                return;
-
+                break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
-
-                /* non-hotplug event; possibly handled by other handler */
-                return;
+                break;
         }
 
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
         return;
 }
 
-static acpi_status is_processor_device(acpi_handle handle)
-{
-        struct acpi_device_info *info;
-        char *hid;
-        acpi_status status;
-
-        status = acpi_get_object_info(handle, &info);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        if (info->type == ACPI_TYPE_PROCESSOR) {
-                kfree(info);
-                return AE_OK;   /* found a processor object */
-        }
-
-        if (!(info->valid & ACPI_VALID_HID)) {
-                kfree(info);
-                return AE_ERROR;
-        }
-
-        hid = info->hardware_id.string;
-        if ((hid == NULL) || strcmp(hid, ACPI_PROCESSOR_DEVICE_HID)) {
-                kfree(info);
-                return AE_ERROR;
-        }
-
-        kfree(info);
-        return AE_OK;   /* found a processor device object */
-}
-
 static acpi_status
 processor_walk_namespace_cb(acpi_handle handle,
                             u32 lvl, void *context, void **rv)
 {
         acpi_status status;
         int *action = context;
+        acpi_object_type type = 0;
 
-        status = is_processor_device(handle);
+        status = acpi_get_type(handle, &type);
         if (ACPI_FAILURE(status))
-                return AE_OK;   /* not a processor; continue to walk */
+                return (AE_OK);
+
+        if (type != ACPI_TYPE_PROCESSOR)
+                return (AE_OK);
 
         switch (*action) {
         case INSTALL_NOTIFY_HANDLER:
@@ -829,37 +718,24 @@ processor_walk_namespace_cb(acpi_handle handle,
                 break;
         }
 
-        /* found a processor; skip walking underneath */
-        return AE_CTRL_DEPTH;
+        return (AE_OK);
 }
 
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
+static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
 {
-        acpi_handle handle = pr->handle;
 
         if (!is_processor_present(handle)) {
                 return AE_ERROR;
         }
 
-        if (acpi_map_lsapic(handle, &pr->id))
+        if (acpi_map_lsapic(handle, p_cpu))
                 return AE_ERROR;
 
-        if (arch_register_cpu(pr->id)) {
-                acpi_unmap_lsapic(pr->id);
+        if (arch_register_cpu(*p_cpu)) {
+                acpi_unmap_lsapic(*p_cpu);
                 return AE_ERROR;
         }
 
-        /* CPU got hot-plugged, but cpu_data is not initialized yet
-         * Set flag to delay cpu_idle/throttling initialization
-         * in:
-         * acpi_processor_add()
-         *   acpi_processor_get_info()
-         * and do it when the CPU gets online the first time
-         * TBD: Cleanup above functions and try to do this more elegant.
-         */
-        pr_info("CPU %d got hotplugged\n", pr->id);
-        pr->flags.need_hotplug_init = 1;
-
         return AE_OK;
 }
 
@@ -868,26 +744,12 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr)
         if (cpu_online(pr->id))
                 cpu_down(pr->id);
 
-        get_online_cpus();
-        /*
-         * The cpu might become online again at this point. So we check whether
-         * the cpu has been onlined or not. If the cpu became online, it means
-         * that someone wants to use the cpu. So acpi_processor_handle_eject()
-         * returns -EAGAIN.
-         */
-        if (unlikely(cpu_online(pr->id))) {
-                put_online_cpus();
-                pr_warn("Failed to remove CPU %d, because other task "
-                        "brought the CPU back online\n", pr->id);
-                return -EAGAIN;
-        }
         arch_unregister_cpu(pr->id);
         acpi_unmap_lsapic(pr->id);
-        put_online_cpus();
         return (0);
 }
 #else
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
+static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
 {
         return AE_ERROR;
 }
@@ -902,7 +764,7 @@ void acpi_processor_install_hotplug_notify(void)
 {
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
         int action = INSTALL_NOTIFY_HANDLER;
-        acpi_walk_namespace(ACPI_TYPE_ANY,
+        acpi_walk_namespace(ACPI_TYPE_PROCESSOR,
                             ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX,
                             processor_walk_namespace_cb, NULL, &action, NULL);
@@ -915,7 +777,7 @@ void acpi_processor_uninstall_hotplug_notify(void)
 {
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
         int action = UNINSTALL_NOTIFY_HANDLER;
-        acpi_walk_namespace(ACPI_TYPE_ANY,
+        acpi_walk_namespace(ACPI_TYPE_PROCESSOR,
                             ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX,
                             processor_walk_namespace_cb, NULL, &action, NULL);
@@ -936,9 +798,19 @@ static int __init acpi_processor_init(void)
         if (acpi_disabled)
                 return 0;
 
+        memset(&errata, 0, sizeof(errata));
+
+        if (!cpuidle_register_driver(&acpi_idle_driver)) {
+                printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+                        acpi_idle_driver.name);
+        } else {
+                printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s\n",
+                        cpuidle_get_driver()->name);
+        }
+
         result = acpi_bus_register_driver(&acpi_processor_driver);
         if (result < 0)
-                return result;
+                goto out_cpuidle;
 
         acpi_processor_install_hotplug_notify();
 
@@ -949,6 +821,11 @@ static int __init acpi_processor_init(void)
         acpi_processor_throttling_init();
 
         return 0;
+
+out_cpuidle:
+        cpuidle_unregister_driver(&acpi_idle_driver);
+
+        return result;
 }
 
 static void __exit acpi_processor_exit(void)
@@ -964,6 +841,8 @@ static void __exit acpi_processor_exit(void)
 
         acpi_bus_unregister_driver(&acpi_processor_driver);
 
+        cpuidle_unregister_driver(&acpi_idle_driver);
+
         return;
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index f1a5da44591..431ab11c8c1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -37,7 +37,7 @@
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
 #include <linux/sched.h>        /* need_resched() */
-#include <linux/pm_qos.h>
+#include <linux/pm_qos_params.h>
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/irqflags.h>
@@ -79,8 +79,6 @@ module_param(bm_check_disable, uint, 0000);
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
 
-static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);
-
 static int disabled_by_idle_boot_param(void)
 {
         return boot_option_idle_override == IDLE_POLL ||
@@ -223,6 +221,10 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,
 
 #endif
 
+/*
+ * Suspend / resume control
+ */
+static int acpi_idle_suspend;
 static u32 saved_bm_rld;
 
 static void acpi_idle_bm_rld_save(void)
@@ -239,15 +241,23 @@ static void acpi_idle_bm_rld_restore(void)
                 acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);
 }
 
-int acpi_processor_suspend(struct device *dev)
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
 {
+        if (acpi_idle_suspend == 1)
+                return 0;
+
         acpi_idle_bm_rld_save();
+        acpi_idle_suspend = 1;
         return 0;
 }
 
-int acpi_processor_resume(struct device *dev)
+int acpi_processor_resume(struct acpi_device * device)
 {
+        if (acpi_idle_suspend == 0)
+                return 0;
+
         acpi_idle_bm_rld_restore();
+        acpi_idle_suspend = 0;
         return 0;
 }
 
@@ -303,16 +313,16 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5;
 
         /* determine latencies from FADT */
-        pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.c2_latency;
-        pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.c3_latency;
+        pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.C2latency;
+        pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.C3latency;
 
         /*
          * FADT specified C2 latency must be less than or equal to
          * 100 microseconds.
          */
-        if (acpi_gbl_FADT.c2_latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
+        if (acpi_gbl_FADT.C2latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "C2 latency too large [%d]\n", acpi_gbl_FADT.c2_latency));
+                        "C2 latency too large [%d]\n", acpi_gbl_FADT.C2latency));
                 /* invalidate C2 */
                 pr->power.states[ACPI_STATE_C2].address = 0;
         }
@@ -321,9 +331,9 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
          * FADT supplied C3 latency must be less than or equal to
          * 1000 microseconds.
          */
-        if (acpi_gbl_FADT.c3_latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
+        if (acpi_gbl_FADT.C3latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "C3 latency too large [%d]\n", acpi_gbl_FADT.c3_latency));
+                        "C3 latency too large [%d]\n", acpi_gbl_FADT.C3latency));
                 /* invalidate C3 */
                 pr->power.states[ACPI_STATE_C3].address = 0;
         }
@@ -485,6 +495,8 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
+                cx.power = obj->integer.value;
+
                 current_count++;
                 memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
 
@@ -583,6 +595,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
          */
         cx->valid = 1;
 
+        cx->latency_ticks = cx->latency;
         /*
          * On older chipsets, BM_RLD needs to be set
          * in order for Bus Master activity to wake the
@@ -615,6 +628,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                         if (!cx->address)
                                 break;
                         cx->valid = 1; 
+                        cx->latency_ticks = cx->latency; /* Normalize latency */
                         break;
 
                 case ACPI_STATE_C3:
@@ -727,77 +741,68 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 /**
  * acpi_idle_enter_c1 - enters an ACPI C1 state-type
  * @dev: the target CPU
- * @drv: cpuidle driver containing cpuidle state info
- * @index: index of target state
+ * @state: the state data
  *
  * This is equivalent to the HALT instruction.
  */
 static int acpi_idle_enter_c1(struct cpuidle_device *dev,
-                struct cpuidle_driver *drv, int index)
+                              struct cpuidle_state *state)
 {
+        ktime_t  kt1, kt2;
+        s64 idle_time;
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
 
         pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
-                return -EINVAL;
+                return 0;
+
+        local_irq_disable();
+
+        /* Do not access any ACPI IO ports in suspend path */
+        if (acpi_idle_suspend) {
+                local_irq_enable();
+                cpu_relax();
+                return 0;
+        }
 
         lapic_timer_state_broadcast(pr, cx, 1);
+        kt1 = ktime_get_real();
         acpi_idle_do_entry(cx);
+        kt2 = ktime_get_real();
+        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
 
+        local_irq_enable();
+        cx->usage++;
         lapic_timer_state_broadcast(pr, cx, 0);
 
-        return index;
-}
-
-
-/**
- * acpi_idle_play_dead - enters an ACPI state for long-term idle (i.e. off-lining)
- * @dev: the target CPU
- * @index: the index of suggested state
- */
-static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
-{
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
-
-        ACPI_FLUSH_CPU_CACHE();
-
-        while (1) {
-
-                if (cx->entry_method == ACPI_CSTATE_HALT)
-                        safe_halt();
-                else if (cx->entry_method == ACPI_CSTATE_SYSTEMIO) {
-                        inb(cx->address);
-                        /* See comment in acpi_idle_do_entry() */
-                        inl(acpi_gbl_FADT.xpm_timer_block.address);
-                } else
-                        return -ENODEV;
-        }
-
-        /* Never reached */
-        return 0;
+        return idle_time;
 }
 
 /**
  * acpi_idle_enter_simple - enters an ACPI state without BM handling
  * @dev: the target CPU
- * @drv: cpuidle driver with cpuidle state information
- * @index: the index of suggested state
+ * @state: the state data
  */
 static int acpi_idle_enter_simple(struct cpuidle_device *dev,
-                struct cpuidle_driver *drv, int index)
+                                  struct cpuidle_state *state)
 {
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+        ktime_t  kt1, kt2;
+        s64 idle_time_ns;
+        s64 idle_time;
 
         pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
-                return -EINVAL;
+                return 0;
+
+        if (acpi_idle_suspend)
+                return(acpi_idle_enter_c1(dev, state));
+
+        local_irq_disable();
 
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
@@ -809,7 +814,8 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 
                 if (unlikely(need_resched())) {
                         current_thread_info()->status |= TS_POLLING;
-                        return -EINVAL;
+                        local_irq_enable();
+                        return 0;
                 }
         }
 
@@ -822,52 +828,71 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
+        kt1 = ktime_get_real();
         /* Tell the scheduler that we are going deep-idle: */
         sched_clock_idle_sleep_event();
         acpi_idle_do_entry(cx);
+        kt2 = ktime_get_real();
+        idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
+        idle_time = idle_time_ns;
+        do_div(idle_time, NSEC_PER_USEC);
 
-        sched_clock_idle_wakeup_event(0);
+        /* Tell the scheduler how much we idled: */
+        sched_clock_idle_wakeup_event(idle_time_ns);
 
+        local_irq_enable();
         if (cx->entry_method != ACPI_CSTATE_FFH)
                 current_thread_info()->status |= TS_POLLING;
 
+        cx->usage++;
+
         lapic_timer_state_broadcast(pr, cx, 0);
-        return index;
+        cx->time += idle_time;
+        return idle_time;
 }
 
 static int c3_cpu_count;
-static DEFINE_RAW_SPINLOCK(c3_lock);
+static DEFINE_SPINLOCK(c3_lock);
 
 /**
  * acpi_idle_enter_bm - enters C3 with proper BM handling
  * @dev: the target CPU
- * @drv: cpuidle driver containing state data
- * @index: the index of suggested state
+ * @state: the state data
  *
  * If BM is detected, the deepest non-C3 idle state is entered instead.
  */
 static int acpi_idle_enter_bm(struct cpuidle_device *dev,
-                struct cpuidle_driver *drv, int index)
+                              struct cpuidle_state *state)
 {
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+        ktime_t  kt1, kt2;
+        s64 idle_time_ns;
+        s64 idle_time;
+
 
         pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
-                return -EINVAL;
+                return 0;
+
+        if (acpi_idle_suspend)
+                return(acpi_idle_enter_c1(dev, state));
 
         if (!cx->bm_sts_skip && acpi_idle_bm_check()) {
-                if (drv->safe_state_index >= 0) {
-                        return drv->states[drv->safe_state_index].enter(dev,
-                                                drv, drv->safe_state_index);
+                if (dev->safe_state) {
+                        dev->last_state = dev->safe_state;
+                        return dev->safe_state->enter(dev, dev->safe_state);
                 } else {
+                        local_irq_disable();
                         acpi_safe_halt();
-                        return -EBUSY;
+                        local_irq_enable();
+                        return 0;
                 }
         }
 
+        local_irq_disable();
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -878,7 +903,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 
                 if (unlikely(need_resched())) {
                         current_thread_info()->status |= TS_POLLING;
-                        return -EINVAL;
+                        local_irq_enable();
+                        return 0;
                 }
         }
 
@@ -892,6 +918,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         lapic_timer_state_broadcast(pr, cx, 1);
 
+        kt1 = ktime_get_real();
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -903,12 +930,12 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          * without doing anything.
          */
         if (pr->flags.bm_check && pr->flags.bm_control) {
-                raw_spin_lock(&c3_lock);
+                spin_lock(&c3_lock);
                 c3_cpu_count++;
                 /* Disable bus master arbitration when all CPUs are in C3 */
                 if (c3_cpu_count == num_online_cpus())
                         acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);
-                raw_spin_unlock(&c3_lock);
+                spin_unlock(&c3_lock);
         } else if (!pr->flags.bm_check) {
                 ACPI_FLUSH_CPU_CACHE();
         }
@@ -917,39 +944,45 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 
         /* Re-enable bus master arbitration */
         if (pr->flags.bm_check && pr->flags.bm_control) {
-                raw_spin_lock(&c3_lock);
+                spin_lock(&c3_lock);
                 acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
                 c3_cpu_count--;
-                raw_spin_unlock(&c3_lock);
+                spin_unlock(&c3_lock);
         }
+        kt2 = ktime_get_real();
+        idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
+        idle_time = idle_time_ns;
+        do_div(idle_time, NSEC_PER_USEC);
 
-        sched_clock_idle_wakeup_event(0);
+        /* Tell the scheduler how much we idled: */
+        sched_clock_idle_wakeup_event(idle_time_ns);
 
+        local_irq_enable();
         if (cx->entry_method != ACPI_CSTATE_FFH)
                 current_thread_info()->status |= TS_POLLING;
 
+        cx->usage++;
+
         lapic_timer_state_broadcast(pr, cx, 0);
-        return index;
+        cx->time += idle_time;
+        return idle_time;
 }
 
 struct cpuidle_driver acpi_idle_driver = {
         .name =         "acpi_idle",
         .owner =        THIS_MODULE,
-        .en_core_tk_irqen = 1,
 };
 
 /**
- * acpi_processor_setup_cpuidle_cx - prepares and configures CPUIDLE
- * device i.e. per-cpu data
- *
+ * acpi_processor_setup_cpuidle - prepares and configures CPUIDLE
  * @pr: the ACPI processor
  */
-static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
+static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
 {
         int i, count = CPUIDLE_DRIVER_STATE_START;
         struct acpi_processor_cx *cx;
-        struct cpuidle_state_usage *state_usage;
-        struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
+        struct cpuidle_state *state;
+        struct cpuidle_device *dev = &pr->power.dev;
 
         if (!pr->flags.power_setup_done)
                 return -EINVAL;
@@ -959,62 +992,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
         }
 
         dev->cpu = pr->id;
-
-        if (max_cstate == 0)
-                max_cstate = 1;
-
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
-                cx = &pr->power.states[i];
-                state_usage = &dev->states_usage[count];
-
-                if (!cx->valid)
-                        continue;
-
-#ifdef CONFIG_HOTPLUG_CPU
-                if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-                    !pr->flags.has_cst &&
-                    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                        continue;
-#endif
-
-                cpuidle_set_statedata(state_usage, cx);
-
-                count++;
-                if (count == CPUIDLE_STATE_MAX)
-                        break;
-        }
-
-        dev->state_count = count;
-
-        if (!count)
-                return -EINVAL;
-
-        return 0;
-}
-
-/**
- * acpi_processor_setup_cpuidle states- prepares and configures cpuidle
- * global state data i.e. idle routines
- *
- * @pr: the ACPI processor
- */
-static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
-{
-        int i, count = CPUIDLE_DRIVER_STATE_START;
-        struct acpi_processor_cx *cx;
-        struct cpuidle_state *state;
-        struct cpuidle_driver *drv = &acpi_idle_driver;
-
-        if (!pr->flags.power_setup_done)
-                return -EINVAL;
-
-        if (pr->flags.power == 0)
-                return -EINVAL;
-
-        drv->safe_state_index = -1;
         for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                drv->states[i].name[0] = '\0';
-                drv->states[i].desc[0] = '\0';
+                dev->states[i].name[0] = '\0';
+                dev->states[i].desc[0] = '\0';
         }
 
         if (max_cstate == 0)
@@ -1022,6 +1002,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
 
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                 cx = &pr->power.states[i];
+                state = &dev->states[count];
 
                 if (!cx->valid)
                         continue;
@@ -1032,8 +1013,8 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                     !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
                         continue;
 #endif
+                cpuidle_set_statedata(state, cx);
 
-                state = &drv->states[count];
                 snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
                 strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);
                 state->exit_latency = cx->latency;
@@ -1046,15 +1027,13 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                                 state->flags |= CPUIDLE_FLAG_TIME_VALID;
 
                         state->enter = acpi_idle_enter_c1;
-                        state->enter_dead = acpi_idle_play_dead;
-                        drv->safe_state_index = count;
+                        dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C2:
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
                         state->enter = acpi_idle_enter_simple;
-                        state->enter_dead = acpi_idle_play_dead;
-                        drv->safe_state_index = count;
+                        dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C3:
@@ -1070,7 +1049,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                         break;
         }
 
-        drv->state_count = count;
+        dev->state_count = count;
 
         if (!count)
                 return -EINVAL;
@@ -1078,10 +1057,9 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
         return 0;
 }
 
-int acpi_processor_hotplug(struct acpi_processor *pr)
+int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
         int ret = 0;
-        struct cpuidle_device *dev;
 
         if (disabled_by_idle_boot_param())
                 return 0;
@@ -1096,87 +1074,22 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
         if (!pr->flags.power_setup_done)
                 return -ENODEV;
 
-        dev = per_cpu(acpi_cpuidle_device, pr->id);
         cpuidle_pause_and_lock();
-        cpuidle_disable_device(dev);
+        cpuidle_disable_device(&pr->power.dev);
         acpi_processor_get_power_info(pr);
         if (pr->flags.power) {
-                acpi_processor_setup_cpuidle_cx(pr);
-                ret = cpuidle_enable_device(dev);
+                acpi_processor_setup_cpuidle(pr);
+                ret = cpuidle_enable_device(&pr->power.dev);
         }
         cpuidle_resume_and_unlock();
 
         return ret;
 }
 
-int acpi_processor_cst_has_changed(struct acpi_processor *pr)
-{
-        int cpu;
-        struct acpi_processor *_pr;
-        struct cpuidle_device *dev;
-
-        if (disabled_by_idle_boot_param())
-                return 0;
-
-        if (!pr)
-                return -EINVAL;
-
-        if (nocst)
-                return -ENODEV;
-
-        if (!pr->flags.power_setup_done)
-                return -ENODEV;
-
-        /*
-         * FIXME:  Design the ACPI notification to make it once per
-         * system instead of once per-cpu.  This condition is a hack
-         * to make the code that updates C-States be called once.
-         */
-
-        if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {
-
-                cpuidle_pause_and_lock();
-                /* Protect against cpu-hotplug */
-                get_online_cpus();
-
-                /* Disable all cpuidle devices */
-                for_each_online_cpu(cpu) {
-                        _pr = per_cpu(processors, cpu);
-                        if (!_pr || !_pr->flags.power_setup_done)
-                                continue;
-                        dev = per_cpu(acpi_cpuidle_device, cpu);
-                        cpuidle_disable_device(dev);
-                }
-
-                /* Populate Updated C-state information */
-                acpi_processor_setup_cpuidle_states(pr);
-
-                /* Enable all cpuidle devices */
-                for_each_online_cpu(cpu) {
-                        _pr = per_cpu(processors, cpu);
-                        if (!_pr || !_pr->flags.power_setup_done)
-                                continue;
-                        acpi_processor_get_power_info(_pr);
-                        if (_pr->flags.power) {
-                                acpi_processor_setup_cpuidle_cx(_pr);
-                                dev = per_cpu(acpi_cpuidle_device, cpu);
-                                cpuidle_enable_device(dev);
-                        }
-                }
-                put_online_cpus();
-                cpuidle_resume_and_unlock();
-        }
-
-        return 0;
-}
-
-static int acpi_processor_registered;
-
-int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
+int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
+                              struct acpi_device *device)
 {
         acpi_status status = 0;
-        int retval;
-        struct cpuidle_device *dev;
         static int first_run;
 
         if (disabled_by_idle_boot_param())
@@ -1213,51 +1126,21 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
          * platforms that only support C1.
          */
         if (pr->flags.power) {
-                /* Register acpi_idle_driver if not already registered */
-                if (!acpi_processor_registered) {
-                        acpi_processor_setup_cpuidle_states(pr);
-                        retval = cpuidle_register_driver(&acpi_idle_driver);
-                        if (retval)
-                                return retval;
-                        printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
-                                        acpi_idle_driver.name);
-                }
-
-                dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-                if (!dev)
-                        return -ENOMEM;
-                per_cpu(acpi_cpuidle_device, pr->id) = dev;
-
-                acpi_processor_setup_cpuidle_cx(pr);
-
-                /* Register per-cpu cpuidle_device. Cpuidle driver
-                 * must already be registered before registering device
-                 */
-                retval = cpuidle_register_device(dev);
-                if (retval) {
-                        if (acpi_processor_registered == 0)
-                                cpuidle_unregister_driver(&acpi_idle_driver);
-                        return retval;
-                }
-                acpi_processor_registered++;
+                acpi_processor_setup_cpuidle(pr);
+                if (cpuidle_register_device(&pr->power.dev))
+                        return -EIO;
         }
         return 0;
 }
 
-int acpi_processor_power_exit(struct acpi_processor *pr)
+int acpi_processor_power_exit(struct acpi_processor *pr,
+                              struct acpi_device *device)
 {
-        struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
-
         if (disabled_by_idle_boot_param())
                 return 0;
 
-        if (pr->flags.power) {
-                cpuidle_unregister_device(dev);
-                acpi_processor_registered--;
-                if (acpi_processor_registered == 0)
-                        cpuidle_unregister_driver(&acpi_idle_driver);
-        }
-
+        cpuidle_unregister_device(&pr->power.dev);
         pr->flags.power_setup_done = 0;
+
         return 0;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 836bfe06904..85b32376dad 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -240,28 +240,6 @@ void acpi_processor_ppc_exit(void)
         acpi_processor_ppc_status &= ~PPC_REGISTERED;
 }
 
-/*
- * Do a quick check if the systems looks like it should use ACPI
- * cpufreq. We look at a _PCT method being available, but don't
- * do a whole lot of sanity checks.
- */
-void acpi_processor_load_module(struct acpi_processor *pr)
-{
-        static int requested;
-        acpi_status status = 0;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-
-        if (!arch_has_acpi_pdc() || requested)
-                return;
-        status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
-        if (!ACPI_FAILURE(status)) {
-                printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n");
-                request_module_nowait("acpi_cpufreq");
-                requested = 1;
-        }
-        kfree(buffer.pointer);
-}
-
 static int acpi_processor_get_performance_control(struct acpi_processor *pr)
 {
         int result = 0;
@@ -324,34 +302,6 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
         return result;
 }
 
-#ifdef CONFIG_X86
-/*
- * Some AMDs have 50MHz frequency multiples, but only provide 100MHz rounding
- * in their ACPI data. Calculate the real values and fix up the _PSS data.
- */
-static void amd_fixup_frequency(struct acpi_processor_px *px, int i)
-{
-        u32 hi, lo, fid, did;
-        int index = px->control & 0x00000007;
-
-        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
-                return;
-
-        if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
-            || boot_cpu_data.x86 == 0x11) {
-                rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi);
-                fid = lo & 0x3f;
-                did = (lo >> 6) & 7;
-                if (boot_cpu_data.x86 == 0x10)
-                        px->core_frequency = (100 * (fid + 0x10)) >> did;
-                else
-                        px->core_frequency = (100 * (fid + 8)) >> did;
-        }
-}
-#else
-static void amd_fixup_frequency(struct acpi_processor_px *px, int i) {};
-#endif
-
 static int acpi_processor_get_performance_states(struct acpi_processor *pr)
 {
         int result = 0;
@@ -361,7 +311,6 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
         struct acpi_buffer state = { 0, NULL };
         union acpi_object *pss = NULL;
         int i;
-        int last_invalid = -1;
 
 
         status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);
@@ -407,8 +356,6 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                         goto end;
                 }
 
-                amd_fixup_frequency(px, i);
-
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "State [%d]: core_frequency[%d] power[%d] transition_latency[%d] bus_master_latency[%d] control[0x%x] status[0x%x]\n",
                                   i,
@@ -425,33 +372,14 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                     ((u32)(px->core_frequency * 1000) !=
                      (px->core_frequency * 1000))) {
                         printk(KERN_ERR FW_BUG PREFIX
-                               "Invalid BIOS _PSS frequency found for processor %d: 0x%llx MHz\n",
-                               pr->id, px->core_frequency);
-                        if (last_invalid == -1)
-                                last_invalid = i;
-                } else {
-                        if (last_invalid != -1) {
-                                /*
-                                 * Copy this valid entry over last_invalid entry
-                                 */
-                                memcpy(&(pr->performance->states[last_invalid]),
-                                       px, sizeof(struct acpi_processor_px));
-                                ++last_invalid;
-                        }
+                               "Invalid BIOS _PSS frequency: 0x%llx MHz\n",
+                               px->core_frequency);
+                        result = -EFAULT;
+                        kfree(pr->performance->states);
+                        goto end;
                 }
         }
 
-        if (last_invalid == 0) {
-                printk(KERN_ERR FW_BUG PREFIX
-                       "No valid BIOS _PSS frequency found for processor %d\n", pr->id);
-                result = -EFAULT;
-                kfree(pr->performance->states);
-                pr->performance->states = NULL;
-        }
-
-        if (last_invalid > 0)
-                pr->performance->state_count = last_invalid;
-
       end:
         kfree(buffer.pointer);
 
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 641b5450a0d..870550d6a4b 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
+#include <linux/sysdev.h>
 
 #include <asm/uaccess.h>
 
@@ -57,27 +58,6 @@ ACPI_MODULE_NAME("processor_thermal");
 static DEFINE_PER_CPU(unsigned int, cpufreq_thermal_reduction_pctg);
 static unsigned int acpi_thermal_cpufreq_is_init = 0;
 
-#define reduction_pctg(cpu) \
-        per_cpu(cpufreq_thermal_reduction_pctg, phys_package_first_cpu(cpu))
-
-/*
- * Emulate "per package data" using per cpu data (which should really be
- * provided elsewhere)
- *
- * Note we can lose a CPU on cpu hotunplug, in this case we forget the state
- * temporarily. Fortunately that's not a big issue here (I hope)
- */
-static int phys_package_first_cpu(int cpu)
-{
-        int i;
-        int id = topology_physical_package_id(cpu);
-
-        for_each_online_cpu(i)
-                if (topology_physical_package_id(i) == id)
-                        return i;
-        return 0;
-}
-
 static int cpu_has_cpufreq(unsigned int cpu)
 {
         struct cpufreq_policy policy;
@@ -97,7 +77,7 @@ static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb,
 
         max_freq = (
             policy->cpuinfo.max_freq *
-            (100 - reduction_pctg(policy->cpu) * 20)
+            (100 - per_cpu(cpufreq_thermal_reduction_pctg, policy->cpu) * 20)
         ) / 100;
 
         cpufreq_verify_within_limits(policy, 0, max_freq);
@@ -123,28 +103,16 @@ static int cpufreq_get_cur_state(unsigned int cpu)
         if (!cpu_has_cpufreq(cpu))
                 return 0;
 
-        return reduction_pctg(cpu);
+        return per_cpu(cpufreq_thermal_reduction_pctg, cpu);
 }
 
 static int cpufreq_set_cur_state(unsigned int cpu, int state)
 {
-        int i;
-
         if (!cpu_has_cpufreq(cpu))
                 return 0;
 
-        reduction_pctg(cpu) = state;
-
-        /*
-         * Update all the CPUs in the same package because they all
-         * contribute to the temperature and often share the same
-         * frequency.
-         */
-        for_each_online_cpu(i) {
-                if (topology_physical_package_id(i) ==
-                    topology_physical_package_id(cpu))
-                        cpufreq_update_policy(i);
-        }
+        per_cpu(cpufreq_thermal_reduction_pctg, cpu) = state;
+        cpufreq_update_policy(cpu);
         return 0;
 }
 
@@ -152,6 +120,10 @@ void acpi_thermal_cpufreq_init(void)
 {
         int i;
 
+        for (i = 0; i < nr_cpu_ids; i++)
+                if (cpu_present(i))
+                        per_cpu(cpufreq_thermal_reduction_pctg, i) = 0;
+
         i = cpufreq_register_notifier(&acpi_thermal_cpufreq_notifier_block,
                                       CPUFREQ_POLICY_NOTIFIER);
         if (!i)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1d02b7b5ade..605a2954ef1 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -769,7 +769,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
                                         u64 *value)
 {
         u32 bit_width, bit_offset;
-        u32 ptc_value;
+        u64 ptc_value;
         u64 ptc_mask;
         struct acpi_processor_throttling *throttling;
         int ret = -1;
@@ -777,11 +777,12 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
         throttling = &pr->throttling;
         switch (throttling->status_register.space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                ptc_value = 0;
                 bit_width = throttling->status_register.bit_width;
                 bit_offset = throttling->status_register.bit_offset;
 
                 acpi_os_read_port((acpi_io_address) throttling->status_register.
-                                  address, &ptc_value,
+                                  address, (u32 *) &ptc_value,
                                   (u32) (bit_width + bit_offset));
                 ptc_mask = (1 << bit_width) - 1;
                 *value = (u64) ((ptc_value >> bit_offset) & ptc_mask);
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
deleted file mode 100644
index a3868f6c222..00000000000
--- a/drivers/acpi/resource.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * drivers/acpi/resource.c - ACPI device resources interpretation.
- *
- * Copyright (C) 2012, Intel Corp.
- * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#include <linux/acpi.h>
-#include <linux/device.h>
-#include <linux/export.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-
-#ifdef CONFIG_X86
-#define valid_IRQ(i) (((i) != 0) && ((i) != 2))
-#else
-#define valid_IRQ(i) (true)
-#endif
-
-static unsigned long acpi_dev_memresource_flags(u64 len, u8 write_protect,
-                                                bool window)
-{
-        unsigned long flags = IORESOURCE_MEM;
-
-        if (len == 0)
-                flags |= IORESOURCE_DISABLED;
-
-        if (write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
-
-        if (window)
-                flags |= IORESOURCE_WINDOW;
-
-        return flags;
-}
-
-static void acpi_dev_get_memresource(struct resource *res, u64 start, u64 len,
-                                     u8 write_protect)
-{
-        res->start = start;
-        res->end = start + len - 1;
-        res->flags = acpi_dev_memresource_flags(len, write_protect, false);
-}
-
-/**
- * acpi_dev_resource_memory - Extract ACPI memory resource information.
- * @ares: Input ACPI resource object.
- * @res: Output generic resource object.
- *
- * Check if the given ACPI resource object represents a memory resource and
- * if that's the case, use the information in it to populate the generic
- * resource object pointed to by @res.
- */
-bool acpi_dev_resource_memory(struct acpi_resource *ares, struct resource *res)
-{
-        struct acpi_resource_memory24 *memory24;
-        struct acpi_resource_memory32 *memory32;
-        struct acpi_resource_fixed_memory32 *fixed_memory32;
-
-        switch (ares->type) {
-        case ACPI_RESOURCE_TYPE_MEMORY24:
-                memory24 = &ares->data.memory24;
-                acpi_dev_get_memresource(res, memory24->minimum,
-                                         memory24->address_length,
-                                         memory24->write_protect);
-                break;
-        case ACPI_RESOURCE_TYPE_MEMORY32:
-                memory32 = &ares->data.memory32;
-                acpi_dev_get_memresource(res, memory32->minimum,
-                                         memory32->address_length,
-                                         memory32->write_protect);
-                break;
-        case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-                fixed_memory32 = &ares->data.fixed_memory32;
-                acpi_dev_get_memresource(res, fixed_memory32->address,
-                                         fixed_memory32->address_length,
-                                         fixed_memory32->write_protect);
-                break;
-        default:
-                return false;
-        }
-        return true;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resource_memory);
-
-static unsigned int acpi_dev_ioresource_flags(u64 start, u64 end, u8 io_decode,
-                                              bool window)
-{
-        int flags = IORESOURCE_IO;
-
-        if (io_decode == ACPI_DECODE_16)
-                flags |= IORESOURCE_IO_16BIT_ADDR;
-
-        if (start > end || end >= 0x10003)
-                flags |= IORESOURCE_DISABLED;
-
-        if (window)
-                flags |= IORESOURCE_WINDOW;
-
-        return flags;
-}
-
-static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
-                                    u8 io_decode)
-{
-        u64 end = start + len - 1;
-
-        res->start = start;
-        res->end = end;
-        res->flags = acpi_dev_ioresource_flags(start, end, io_decode, false);
-}
-
-/**
- * acpi_dev_resource_io - Extract ACPI I/O resource information.
- * @ares: Input ACPI resource object.
- * @res: Output generic resource object.
- *
- * Check if the given ACPI resource object represents an I/O resource and
- * if that's the case, use the information in it to populate the generic
- * resource object pointed to by @res.
- */
-bool acpi_dev_resource_io(struct acpi_resource *ares, struct resource *res)
-{
-        struct acpi_resource_io *io;
-        struct acpi_resource_fixed_io *fixed_io;
-
-        switch (ares->type) {
-        case ACPI_RESOURCE_TYPE_IO:
-                io = &ares->data.io;
-                acpi_dev_get_ioresource(res, io->minimum,
-                                        io->address_length,
-                                        io->io_decode);
-                break;
-        case ACPI_RESOURCE_TYPE_FIXED_IO:
-                fixed_io = &ares->data.fixed_io;
-                acpi_dev_get_ioresource(res, fixed_io->address,
-                                        fixed_io->address_length,
-                                        ACPI_DECODE_10);
-                break;
-        default:
-                return false;
-        }
-        return true;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resource_io);
-
-/**
- * acpi_dev_resource_address_space - Extract ACPI address space information.
- * @ares: Input ACPI resource object.
- * @res: Output generic resource object.
- *
- * Check if the given ACPI resource object represents an address space resource
- * and if that's the case, use the information in it to populate the generic
- * resource object pointed to by @res.
- */
-bool acpi_dev_resource_address_space(struct acpi_resource *ares,
-                                     struct resource *res)
-{
-        acpi_status status;
-        struct acpi_resource_address64 addr;
-        bool window;
-        u64 len;
-        u8 io_decode;
-
-        switch (ares->type) {
-        case ACPI_RESOURCE_TYPE_ADDRESS16:
-        case ACPI_RESOURCE_TYPE_ADDRESS32:
-        case ACPI_RESOURCE_TYPE_ADDRESS64:
-                break;
-        default:
-                return false;
-        }
-
-        status = acpi_resource_to_address64(ares, &addr);
-        if (ACPI_FAILURE(status))
-                return true;
-
-        res->start = addr.minimum;
-        res->end = addr.maximum;
-        window = addr.producer_consumer == ACPI_PRODUCER;
-
-        switch(addr.resource_type) {
-        case ACPI_MEMORY_RANGE:
-                len = addr.maximum - addr.minimum + 1;
-                res->flags = acpi_dev_memresource_flags(len,
-                                                addr.info.mem.write_protect,
-                                                window);
-                break;
-        case ACPI_IO_RANGE:
-                io_decode = addr.granularity == 0xfff ?
-                                ACPI_DECODE_10 : ACPI_DECODE_16;
-                res->flags = acpi_dev_ioresource_flags(addr.minimum,
-                                                       addr.maximum,
-                                                       io_decode, window);
-                break;
-        case ACPI_BUS_NUMBER_RANGE:
-                res->flags = IORESOURCE_BUS;
-                break;
-        default:
-                res->flags = 0;
-        }
-
-        return true;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resource_address_space);
-
-/**
- * acpi_dev_resource_ext_address_space - Extract ACPI address space information.
- * @ares: Input ACPI resource object.
- * @res: Output generic resource object.
- *
- * Check if the given ACPI resource object represents an extended address space
- * resource and if that's the case, use the information in it to populate the
- * generic resource object pointed to by @res.
- */
-bool acpi_dev_resource_ext_address_space(struct acpi_resource *ares,
-                                         struct resource *res)
-{
-        struct acpi_resource_extended_address64 *ext_addr;
-        bool window;
-        u64 len;
-        u8 io_decode;
-
-        if (ares->type != ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64)
-                return false;
-
-        ext_addr = &ares->data.ext_address64;
-
-        res->start = ext_addr->minimum;
-        res->end = ext_addr->maximum;
-        window = ext_addr->producer_consumer == ACPI_PRODUCER;
-
-        switch(ext_addr->resource_type) {
-        case ACPI_MEMORY_RANGE:
-                len = ext_addr->maximum - ext_addr->minimum + 1;
-                res->flags = acpi_dev_memresource_flags(len,
-                                        ext_addr->info.mem.write_protect,
-                                        window);
-                break;
-        case ACPI_IO_RANGE:
-                io_decode = ext_addr->granularity == 0xfff ?
-                                ACPI_DECODE_10 : ACPI_DECODE_16;
-                res->flags = acpi_dev_ioresource_flags(ext_addr->minimum,
-                                                       ext_addr->maximum,
-                                                       io_decode, window);
-                break;
-        case ACPI_BUS_NUMBER_RANGE:
-                res->flags = IORESOURCE_BUS;
-                break;
-        default:
-                res->flags = 0;
-        }
-
-        return true;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resource_ext_address_space);
-
-/**
- * acpi_dev_irq_flags - Determine IRQ resource flags.
- * @triggering: Triggering type as provided by ACPI.
- * @polarity: Interrupt polarity as provided by ACPI.
- * @shareable: Whether or not the interrupt is shareable.
- */
-unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable)
-{
-        unsigned long flags;
-
-        if (triggering == ACPI_LEVEL_SENSITIVE)
-                flags = polarity == ACPI_ACTIVE_LOW ?
-                        IORESOURCE_IRQ_LOWLEVEL : IORESOURCE_IRQ_HIGHLEVEL;
-        else
-                flags = polarity == ACPI_ACTIVE_LOW ?
-                        IORESOURCE_IRQ_LOWEDGE : IORESOURCE_IRQ_HIGHEDGE;
-
-        if (shareable == ACPI_SHARED)
-                flags |= IORESOURCE_IRQ_SHAREABLE;
-
-        return flags | IORESOURCE_IRQ;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_irq_flags);
-
-static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi)
-{
-        res->start = gsi;
-        res->end = gsi;
-        res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED;
-}
-
-static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
-                                     u8 triggering, u8 polarity, u8 shareable)
-{
-        int irq, p, t;
-
-        if (!valid_IRQ(gsi)) {
-                acpi_dev_irqresource_disabled(res, gsi);
-                return;
-        }
-
-        /*
-         * In IO-APIC mode, use overrided attribute. Two reasons:
-         * 1. BIOS bug in DSDT
-         * 2. BIOS uses IO-APIC mode Interrupt Source Override
-         */
-        if (!acpi_get_override_irq(gsi, &t, &p)) {
-                u8 trig = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
-                u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
-
-                if (triggering != trig || polarity != pol) {
-                        pr_warning("ACPI: IRQ %d override to %s, %s\n", gsi,
-                                   t ? "edge" : "level", p ? "low" : "high");
-                        triggering = trig;
-                        polarity = pol;
-                }
-        }
-
-        res->flags = acpi_dev_irq_flags(triggering, polarity, shareable);
-        irq = acpi_register_gsi(NULL, gsi, triggering, polarity);
-        if (irq >= 0) {
-                res->start = irq;
-                res->end = irq;
-        } else {
-                acpi_dev_irqresource_disabled(res, gsi);
-        }
-}
-
-/**
- * acpi_dev_resource_interrupt - Extract ACPI interrupt resource information.
- * @ares: Input ACPI resource object.
- * @index: Index into the array of GSIs represented by the resource.
- * @res: Output generic resource object.
- *
- * Check if the given ACPI resource object represents an interrupt resource
- * and @index does not exceed the resource's interrupt count (true is returned
- * in that case regardless of the results of the other checks)).  If that's the
- * case, register the GSI corresponding to @index from the array of interrupts
- * represented by the resource and populate the generic resource object pointed
- * to by @res accordingly.  If the registration of the GSI is not successful,
- * IORESOURCE_DISABLED will be set it that object's flags.
- */
-bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
-                                 struct resource *res)
-{
-        struct acpi_resource_irq *irq;
-        struct acpi_resource_extended_irq *ext_irq;
-
-        switch (ares->type) {
-        case ACPI_RESOURCE_TYPE_IRQ:
-                /*
-                 * Per spec, only one interrupt per descriptor is allowed in
-                 * _CRS, but some firmware violates this, so parse them all.
-                 */
-                irq = &ares->data.irq;
-                if (index >= irq->interrupt_count) {
-                        acpi_dev_irqresource_disabled(res, 0);
-                        return false;
-                }
-                acpi_dev_get_irqresource(res, irq->interrupts[index],
-                                         irq->triggering, irq->polarity,
-                                         irq->sharable);
-                break;
-        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-                ext_irq = &ares->data.extended_irq;
-                if (index >= ext_irq->interrupt_count) {
-                        acpi_dev_irqresource_disabled(res, 0);
-                        return false;
-                }
-                acpi_dev_get_irqresource(res, ext_irq->interrupts[index],
-                                         ext_irq->triggering, ext_irq->polarity,
-                                         ext_irq->sharable);
-                break;
-        default:
-                return false;
-        }
-
-        return true;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_resource_interrupt);
-
-/**
- * acpi_dev_free_resource_list - Free resource from %acpi_dev_get_resources().
- * @list: The head of the resource list to free.
- */
-void acpi_dev_free_resource_list(struct list_head *list)
-{
-        struct resource_list_entry *rentry, *re;
-
-        list_for_each_entry_safe(rentry, re, list, node) {
-                list_del(&rentry->node);
-                kfree(rentry);
-        }
-}
-EXPORT_SYMBOL_GPL(acpi_dev_free_resource_list);
-
-struct res_proc_context {
-        struct list_head *list;
-        int (*preproc)(struct acpi_resource *, void *);
-        void *preproc_data;
-        int count;
-        int error;
-};
-
-static acpi_status acpi_dev_new_resource_entry(struct resource *r,
-                                               struct res_proc_context *c)
-{
-        struct resource_list_entry *rentry;
-
-        rentry = kmalloc(sizeof(*rentry), GFP_KERNEL);
-        if (!rentry) {
-                c->error = -ENOMEM;
-                return AE_NO_MEMORY;
-        }
-        rentry->res = *r;
-        list_add_tail(&rentry->node, c->list);
-        c->count++;
-        return AE_OK;
-}
-
-static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
-                                             void *context)
-{
-        struct res_proc_context *c = context;
-        struct resource r;
-        int i;
-
-        if (c->preproc) {
-                int ret;
-
-                ret = c->preproc(ares, c->preproc_data);
-                if (ret < 0) {
-                        c->error = ret;
-                        return AE_CTRL_TERMINATE;
-                } else if (ret > 0) {
-                        return AE_OK;
-                }
-        }
-
-        memset(&r, 0, sizeof(r));
-
-        if (acpi_dev_resource_memory(ares, &r)
-            || acpi_dev_resource_io(ares, &r)
-            || acpi_dev_resource_address_space(ares, &r)
-            || acpi_dev_resource_ext_address_space(ares, &r))
-                return acpi_dev_new_resource_entry(&r, c);
-
-        for (i = 0; acpi_dev_resource_interrupt(ares, i, &r); i++) {
-                acpi_status status;
-
-                status = acpi_dev_new_resource_entry(&r, c);
-                if (ACPI_FAILURE(status))
-                        return status;
-        }
-
-        return AE_OK;
-}
-
-/**
- * acpi_dev_get_resources - Get current resources of a device.
- * @adev: ACPI device node to get the resources for.
- * @list: Head of the resultant list of resources (must be empty).
- * @preproc: The caller's preprocessing routine.
- * @preproc_data: Pointer passed to the caller's preprocessing routine.
- *
- * Evaluate the _CRS method for the given device node and process its output by
- * (1) executing the @preproc() rountine provided by the caller, passing the
- * resource pointer and @preproc_data to it as arguments, for each ACPI resource
- * returned and (2) converting all of the returned ACPI resources into struct
- * resource objects if possible.  If the return value of @preproc() in step (1)
- * is different from 0, step (2) is not applied to the given ACPI resource and
- * if that value is negative, the whole processing is aborted and that value is
- * returned as the final error code.
- *
- * The resultant struct resource objects are put on the list pointed to by
- * @list, that must be empty initially, as members of struct resource_list_entry
- * objects.  Callers of this routine should use %acpi_dev_free_resource_list() to
- * free that list.
- *
- * The number of resources in the output list is returned on success, an error
- * code reflecting the error condition is returned otherwise.
- */
-int acpi_dev_get_resources(struct acpi_device *adev, struct list_head *list,
-                           int (*preproc)(struct acpi_resource *, void *),
-                           void *preproc_data)
-{
-        struct res_proc_context c;
-        acpi_handle not_used;
-        acpi_status status;
-
-        if (!adev || !adev->handle || !list_empty(list))
-                return -EINVAL;
-
-        status = acpi_get_handle(adev->handle, METHOD_NAME__CRS, &not_used);
-        if (ACPI_FAILURE(status))
-                return 0;
-
-        c.list = list;
-        c.preproc = preproc;
-        c.preproc_data = preproc_data;
-        c.count = 0;
-        c.error = 0;
-        status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,
-                                     acpi_dev_process_resource, &c);
-        if (ACPI_FAILURE(status)) {
-                acpi_dev_free_resource_list(list);
-                return c.error ? c.error : -EIO;
-        }
-
-        return c.count;
-}
-EXPORT_SYMBOL_GPL(acpi_dev_get_resources);
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index ff0740e0a9c..6e36d0c0057 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -988,19 +988,15 @@ static void acpi_sbs_rmdirs(void)
 #endif
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_sbs_resume(struct device *dev)
+static int acpi_sbs_resume(struct acpi_device *device)
 {
         struct acpi_sbs *sbs;
-        if (!dev)
+        if (!device)
                 return -EINVAL;
-        sbs = to_acpi_device(dev)->driver_data;
+        sbs = device->driver_data;
         acpi_sbs_callback(sbs);
         return 0;
 }
-#endif
-
-static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
 
 static struct acpi_driver acpi_sbs_driver = {
         .name = "sbs",
@@ -1009,8 +1005,8 @@ static struct acpi_driver acpi_sbs_driver = {
         .ops = {
                 .add = acpi_sbs_add,
                 .remove = acpi_sbs_remove,
+                .resume = acpi_sbs_resume,
                 },
-        .drv.pm = &acpi_sbs_pm,
 };
 
 static int __init acpi_sbs_init(void)
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index cf6129a8af7..f8be23b6c12 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -13,7 +13,6 @@
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include "sbshc.h"
 
@@ -310,7 +309,23 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-module_acpi_driver(acpi_smb_hc_driver);
+static int __init acpi_smb_hc_init(void)
+{
+        int result;
+
+        result = acpi_bus_register_driver(&acpi_smb_hc_driver);
+        if (result < 0)
+                return -ENODEV;
+        return 0;
+}
+
+static void __exit acpi_smb_hc_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_smb_hc_driver);
+}
+
+module_init(acpi_smb_hc_init);
+module_exit(acpi_smb_hc_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alexey Starikovskiy");
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c88be6c37c3..449c556274c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -10,7 +10,6 @@
 #include <linux/signal.h>
 #include <linux/kthread.h>
 #include <linux/dmi.h>
-#include <linux/nls.h>
 
 #include <acpi/acpi_drivers.h>
 
@@ -29,27 +28,6 @@ extern struct acpi_device *acpi_root;
 
 static const char *dummy_hid = "device";
 
-/*
- * The following ACPI IDs are known to be suitable for representing as
- * platform devices.
- */
-static const struct acpi_device_id acpi_platform_device_ids[] = {
-
-        { "PNP0D40" },
-
-        /* Haswell LPSS devices */
-        { "INT33C0", 0 },
-        { "INT33C1", 0 },
-        { "INT33C2", 0 },
-        { "INT33C3", 0 },
-        { "INT33C4", 0 },
-        { "INT33C5", 0 },
-        { "INT33C6", 0 },
-        { "INT33C7", 0 },
-
-        { }
-};
-
 static LIST_HEAD(acpi_device_list);
 static LIST_HEAD(acpi_bus_id_list);
 DEFINE_MUTEX(acpi_device_lock);
@@ -105,30 +83,19 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
 
-/**
- * acpi_bus_hot_remove_device: hot-remove a device and its children
- * @context: struct acpi_eject_event pointer (freed in this func)
- *
- * Hot-remove a device and its children. This function frees up the
- * memory space passed by arg context, so that the caller may call
- * this function asynchronously through acpi_os_hotplug_execute().
- */
-void acpi_bus_hot_remove_device(void *context)
+static void acpi_bus_hot_remove_device(void *context)
 {
-        struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context;
         struct acpi_device *device;
-        acpi_handle handle = ej_event->handle;
-        acpi_handle temp;
+        acpi_handle handle = context;
         struct acpi_object_list arg_list;
         union acpi_object arg;
         acpi_status status = AE_OK;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
 
         if (acpi_bus_get_device(handle, &device))
-                goto err_out;
+                return;
 
         if (!device)
-                goto err_out;
+                return;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                 "Hot-removing device %s...\n", dev_name(&device->dev)));
@@ -136,19 +103,16 @@ void acpi_bus_hot_remove_device(void *context)
         if (acpi_bus_trim(device, 1)) {
                 printk(KERN_ERR PREFIX
                                 "Removing device failed\n");
-                goto err_out;
+                return;
         }
 
-        /* device has been freed */
-        device = NULL;
-
         /* power off device */
         status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
                 printk(KERN_WARNING PREFIX
                                 "Power-off device failed\n");
 
-        if (ACPI_SUCCESS(acpi_get_handle(handle, "_LCK", &temp))) {
+        if (device->flags.lockable) {
                 arg_list.count = 1;
                 arg_list.pointer = &arg;
                 arg.type = ACPI_TYPE_INTEGER;
@@ -165,24 +129,12 @@ void acpi_bus_hot_remove_device(void *context)
          * TBD: _EJD support.
          */
         status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
-        if (ACPI_FAILURE(status)) {
-                if (status != AE_NOT_FOUND)
-                        printk(KERN_WARNING PREFIX
-                                        "Eject device failed\n");
-                goto err_out;
-        }
-
-        kfree(context);
-        return;
+        if (ACPI_FAILURE(status))
+                printk(KERN_WARNING PREFIX
+                                "Eject device failed\n");
 
-err_out:
-        /* Inform firmware the hot-remove operation has completed w/ error */
-        (void) acpi_evaluate_hotplug_ost(handle,
-                                ej_event->event, ost_code, NULL);
-        kfree(context);
         return;
 }
-EXPORT_SYMBOL(acpi_bus_hot_remove_device);
 
 static ssize_t
 acpi_eject_store(struct device *d, struct device_attribute *attr,
@@ -192,7 +144,6 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
         acpi_status status;
         acpi_object_type type = 0;
         struct acpi_device *acpi_device = to_acpi_device(d);
-        struct acpi_eject_event *ej_event;
 
         if ((!count) || (buf[0] != '1')) {
                 return -EINVAL;
@@ -209,25 +160,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
                 goto err;
         }
 
-        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-        if (!ej_event) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        ej_event->handle = acpi_device->handle;
-        if (acpi_device->flags.eject_pending) {
-                /* event originated from ACPI eject notification */
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-                acpi_device->flags.eject_pending = 0;
-        } else {
-                /* event originated from user */
-                ej_event->event = ACPI_OST_EC_OSPM_EJECT;
-                (void) acpi_evaluate_hotplug_ost(ej_event->handle,
-                        ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
-        }
-
-        acpi_os_hotplug_execute(acpi_bus_hot_remove_device, (void *)ej_event);
+        acpi_os_hotplug_execute(acpi_bus_hot_remove_device, acpi_device->handle);
 err:
         return ret;
 }
@@ -242,25 +175,6 @@ acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *bu
 }
 static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
 
-static ssize_t acpi_device_uid_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-
-        return sprintf(buf, "%s\n", acpi_dev->pnp.unique_id);
-}
-static DEVICE_ATTR(uid, 0444, acpi_device_uid_show, NULL);
-
-static ssize_t acpi_device_adr_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-
-        return sprintf(buf, "0x%08x\n",
-                       (unsigned int)(acpi_dev->pnp.bus_address));
-}
-static DEVICE_ATTR(adr, 0444, acpi_device_adr_show, NULL);
-
 static ssize_t
 acpi_device_path_show(struct device *dev, struct device_attribute *attr, char *buf) {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
@@ -278,47 +192,10 @@ end:
 }
 static DEVICE_ATTR(path, 0444, acpi_device_path_show, NULL);
 
-/* sysfs file that shows description text from the ACPI _STR method */
-static ssize_t description_show(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        int result;
-
-        if (acpi_dev->pnp.str_obj == NULL)
-                return 0;
-
-        /*
-         * The _STR object contains a Unicode identifier for a device.
-         * We need to convert to utf-8 so it can be displayed.
-         */
-        result = utf16s_to_utf8s(
-                (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer,
-                acpi_dev->pnp.str_obj->buffer.length,
-                UTF16_LITTLE_ENDIAN, buf,
-                PAGE_SIZE);
-
-        buf[result++] = '\n';
-
-        return result;
-}
-static DEVICE_ATTR(description, 0444, description_show, NULL);
-
-static ssize_t
-acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
-                     char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-
-        return sprintf(buf, "%lu\n", acpi_dev->pnp.sun);
-}
-static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
-
 static int acpi_device_setup_files(struct acpi_device *dev)
 {
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
         acpi_status status;
         acpi_handle temp;
-        unsigned long long sun;
         int result = 0;
 
         /*
@@ -340,36 +217,6 @@ static int acpi_device_setup_files(struct acpi_device *dev)
                         goto end;
         }
 
-        /*
-         * If device has _STR, 'description' file is created
-         */
-        status = acpi_get_handle(dev->handle, "_STR", &temp);
-        if (ACPI_SUCCESS(status)) {
-                status = acpi_evaluate_object(dev->handle, "_STR",
-                                        NULL, &buffer);
-                if (ACPI_FAILURE(status))
-                        buffer.pointer = NULL;
-                dev->pnp.str_obj = buffer.pointer;
-                result = device_create_file(&dev->dev, &dev_attr_description);
-                if (result)
-                        goto end;
-        }
-
-        if (dev->flags.bus_address)
-                result = device_create_file(&dev->dev, &dev_attr_adr);
-        if (dev->pnp.unique_id)
-                result = device_create_file(&dev->dev, &dev_attr_uid);
-
-        status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun);
-        if (ACPI_SUCCESS(status)) {
-                dev->pnp.sun = (unsigned long)sun;
-                result = device_create_file(&dev->dev, &dev_attr_sun);
-                if (result)
-                        goto end;
-        } else {
-                dev->pnp.sun = (unsigned long)-1;
-        }
-
         /*
          * If device has _EJ0, 'eject' file is created that is used to trigger
          * hot-removal function from userland.
@@ -387,28 +234,13 @@ static void acpi_device_remove_files(struct acpi_device *dev)
         acpi_handle temp;
 
         /*
-         * If device has _STR, remove 'description' file
-         */
-        status = acpi_get_handle(dev->handle, "_STR", &temp);
-        if (ACPI_SUCCESS(status)) {
-                kfree(dev->pnp.str_obj);
-                device_remove_file(&dev->dev, &dev_attr_description);
-        }
-        /*
-         * If device has _EJ0, remove 'eject' file.
+         * If device has _EJ0, 'eject' file is created that is used to trigger
+         * hot-removal function from userland.
          */
         status = acpi_get_handle(dev->handle, "_EJ0", &temp);
         if (ACPI_SUCCESS(status))
                 device_remove_file(&dev->dev, &dev_attr_eject);
 
-        status = acpi_get_handle(dev->handle, "_SUN", &temp);
-        if (ACPI_SUCCESS(status))
-                device_remove_file(&dev->dev, &dev_attr_sun);
-
-        if (dev->pnp.unique_id)
-                device_remove_file(&dev->dev, &dev_attr_uid);
-        if (dev->flags.bus_address)
-                device_remove_file(&dev->dev, &dev_attr_adr);
         device_remove_file(&dev->dev, &dev_attr_modalias);
         device_remove_file(&dev->dev, &dev_attr_hid);
         if (dev->handle)
@@ -418,8 +250,8 @@ static void acpi_device_remove_files(struct acpi_device *dev)
                         ACPI Bus operations
    -------------------------------------------------------------------------- */
 
-static const struct acpi_device_id *__acpi_match_device(
-        struct acpi_device *device, const struct acpi_device_id *ids)
+int acpi_match_device_ids(struct acpi_device *device,
+                          const struct acpi_device_id *ids)
 {
         const struct acpi_device_id *id;
         struct acpi_hardware_id *hwid;
@@ -429,44 +261,14 @@ static const struct acpi_device_id *__acpi_match_device(
          * driver for it.
          */
         if (!device->status.present)
-                return NULL;
+                return -ENODEV;
 
         for (id = ids; id->id[0]; id++)
                 list_for_each_entry(hwid, &device->pnp.ids, list)
                         if (!strcmp((char *) id->id, hwid->id))
-                                return id;
+                                return 0;
 
-        return NULL;
-}
-
-/**
- * acpi_match_device - Match a struct device against a given list of ACPI IDs
- * @ids: Array of struct acpi_device_id object to match against.
- * @dev: The device structure to match.
- *
- * Check if @dev has a valid ACPI handle and if there is a struct acpi_device
- * object for that handle and use that object to match against a given list of
- * device IDs.
- *
- * Return a pointer to the first matching ID on success or %NULL on failure.
- */
-const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
-                                               const struct device *dev)
-{
-        struct acpi_device *adev;
-
-        if (!ids || !ACPI_HANDLE(dev)
-            || ACPI_FAILURE(acpi_bus_get_device(ACPI_HANDLE(dev), &adev)))
-                return NULL;
-
-        return __acpi_match_device(adev, ids);
-}
-EXPORT_SYMBOL_GPL(acpi_match_device);
-
-int acpi_match_device_ids(struct acpi_device *device,
-                          const struct acpi_device_id *ids)
-{
-        return __acpi_match_device(device, ids) ? 0 : -ENOENT;
+        return -ENOENT;
 }
 EXPORT_SYMBOL(acpi_match_device_ids);
 
@@ -485,10 +287,29 @@ static void acpi_device_release(struct device *dev)
         struct acpi_device *acpi_dev = to_acpi_device(dev);
 
         acpi_free_ids(acpi_dev);
-        kfree(acpi_dev->pnp.unique_id);
         kfree(acpi_dev);
 }
 
+static int acpi_device_suspend(struct device *dev, pm_message_t state)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_driver *acpi_drv = acpi_dev->driver;
+
+        if (acpi_drv && acpi_drv->ops.suspend)
+                return acpi_drv->ops.suspend(acpi_dev, state);
+        return 0;
+}
+
+static int acpi_device_resume(struct device *dev)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_driver *acpi_drv = acpi_dev->driver;
+
+        if (acpi_drv && acpi_drv->ops.resume)
+                return acpi_drv->ops.resume(acpi_dev);
+        return 0;
+}
+
 static int acpi_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
@@ -620,6 +441,8 @@ static int acpi_device_remove(struct device * dev)
 
 struct bus_type acpi_bus_type = {
         .name           = "acpi",
+        .suspend        = acpi_device_suspend,
+        .resume         = acpi_device_resume,
         .match          = acpi_bus_match,
         .probe          = acpi_device_probe,
         .remove         = acpi_device_remove,
@@ -640,8 +463,6 @@ static int acpi_device_register(struct acpi_device *device)
         INIT_LIST_HEAD(&device->children);
         INIT_LIST_HEAD(&device->node);
         INIT_LIST_HEAD(&device->wakeup_list);
-        INIT_LIST_HEAD(&device->physical_node_list);
-        mutex_init(&device->physical_node_lock);
 
         new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
         if (!new_bus_id) {
@@ -968,8 +789,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
 static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
 {
         struct acpi_device_id button_device_ids[] = {
-                {"PNP0C0C", 0},
                 {"PNP0C0D", 0},
+                {"PNP0C0C", 0},
                 {"PNP0C0E", 0},
                 {"", 0},
         };
@@ -981,11 +802,6 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
         /* Power button, Lid switch always enable wakeup */
         if (!acpi_match_device_ids(device, button_device_ids)) {
                 device->wakeup.flags.run_wake = 1;
-                if (!acpi_match_device_ids(device, &button_device_ids[1])) {
-                        /* Do not use Lid/sleep button for S5 wakeup */
-                        if (device->wakeup.sleep_state == ACPI_STATE_S5)
-                                device->wakeup.sleep_state = ACPI_STATE_S4;
-                }
                 device_set_wakeup_capable(&device->dev, true);
                 return;
         }
@@ -1053,7 +869,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         /*
          * Enumerate supported power management states
          */
-        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {
+        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
                 struct acpi_device_power_state *ps = &device->power.states[i];
                 char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
 
@@ -1064,6 +880,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                         int j;
 
                         device->power.flags.power_resources = 1;
+                        ps->flags.valid = 1;
                         for (j = 0; j < ps->resources.count; j++)
                                 acpi_bus_add_power_resource(ps->resources.handles[j]);
                 }
@@ -1071,19 +888,15 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                 /* Evaluate "_PSx" to see if we can do explicit sets */
                 object_name[2] = 'S';
                 status = acpi_get_handle(device->handle, object_name, &handle);
-                if (ACPI_SUCCESS(status))
+                if (ACPI_SUCCESS(status)) {
                         ps->flags.explicit_set = 1;
-
-                /*
-                 * State is valid if there are means to put the device into it.
-                 * D3hot is only valid if _PR3 present.
-                 */
-                if (ps->resources.count ||
-                    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT)) {
                         ps->flags.valid = 1;
-                        ps->flags.os_accessible = 1;
                 }
 
+                /* State is valid if we have some power control */
+                if (ps->resources.count || ps->flags.explicit_set)
+                        ps->flags.valid = 1;
+
                 ps->power = -1; /* Unknown - driver assigned */
                 ps->latency = -1;       /* Unknown - driver assigned */
         }
@@ -1094,15 +907,6 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         device->power.states[ACPI_STATE_D3].flags.valid = 1;
         device->power.states[ACPI_STATE_D3].power = 0;
 
-        /* Set D3cold's explicit_set flag if _PS3 exists. */
-        if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set)
-                device->power.states[ACPI_STATE_D3_COLD].flags.explicit_set = 1;
-
-        /* Presence of _PS3 or _PRx means we can put the device into D3 cold */
-        if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set ||
-                        device->power.flags.power_resources)
-                device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible = 1;
-
         acpi_bus_init_power(device);
 
         return 0;
@@ -1134,6 +938,11 @@ static int acpi_bus_get_flags(struct acpi_device *device)
                         device->flags.ejectable = 1;
         }
 
+        /* Presence of _LCK indicates 'lockable' */
+        status = acpi_get_handle(device->handle, "_LCK", &temp);
+        if (ACPI_SUCCESS(status))
+                device->flags.lockable = 1;
+
         /* Power resources cannot be power manageable. */
         if (device->device_type == ACPI_BUS_TYPE_POWER)
                 return 0;
@@ -1253,12 +1062,13 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id)
         if (!id)
                 return;
 
-        id->id = kstrdup(dev_id, GFP_KERNEL);
+        id->id = kmalloc(strlen(dev_id) + 1, GFP_KERNEL);
         if (!id->id) {
                 kfree(id);
                 return;
         }
 
+        strcpy(id->id, dev_id);
         list_add_tail(&id->list, &device->pnp.ids);
 }
 
@@ -1301,7 +1111,7 @@ static void acpi_device_set_id(struct acpi_device *device)
 {
         acpi_status status;
         struct acpi_device_info *info;
-        struct acpi_pnp_device_id_list *cid_list;
+        struct acpica_device_id_list *cid_list;
         int i;
 
         switch (device->device_type) {
@@ -1328,9 +1138,6 @@ static void acpi_device_set_id(struct acpi_device *device)
                         device->pnp.bus_address = info->address;
                         device->flags.bus_address = 1;
                 }
-                if (info->valid & ACPI_VALID_UID)
-                        device->pnp.unique_id = kstrdup(info->unique_id.string,
-                                                        GFP_KERNEL);
 
                 kfree(info);
 
@@ -1346,7 +1153,7 @@ static void acpi_device_set_id(struct acpi_device *device)
                         acpi_add_id(device, ACPI_DOCK_HID);
                 else if (!acpi_ibm_smbus_match(device))
                         acpi_add_id(device, ACPI_SMBUS_IBM_HID);
-                else if (list_empty(&device->pnp.ids) &&
+                else if (!acpi_device_hid(device) &&
                          ACPI_IS_ROOT_DEVICE(device->parent)) {
                         acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
                         strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
@@ -1602,13 +1409,8 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
          */
         device = NULL;
         acpi_bus_get_device(handle, &device);
-        if (ops->acpi_op_add && !device) {
+        if (ops->acpi_op_add && !device)
                 acpi_add_single_object(&device, handle, type, sta, ops);
-                /* Is the device a known good platform device? */
-                if (device
-                    && !acpi_match_device_ids(device, acpi_platform_device_ids))
-                        acpi_create_platform_device(device);
-        }
 
         if (!device)
                 return AE_CTRL_DEPTH;
@@ -1761,7 +1563,6 @@ static int acpi_bus_scan_fixed(void)
                                                 ACPI_BUS_TYPE_POWER_BUTTON,
                                                 ACPI_STA_DEFAULT,
                                                 &ops);
-                device_init_wakeup(&device->dev, true);
         }
 
         if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 2fcc67d34b1..3ed80b2ca90 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -17,7 +17,6 @@
 #include <linux/suspend.h>
 #include <linux/reboot.h>
 #include <linux/acpi.h>
-#include <linux/module.h>
 
 #include <asm/io.h>
 
@@ -64,9 +63,11 @@ static int acpi_sleep_prepare(u32 acpi_state)
 #ifdef CONFIG_ACPI_SLEEP
         /* do we have a wakeup address for S2 and S3? */
         if (acpi_state == ACPI_STATE_S3) {
-                if (!acpi_wakeup_address)
+                if (!acpi_wakeup_address) {
                         return -EFAULT;
-                acpi_set_firmware_waking_vector(acpi_wakeup_address);
+                }
+                acpi_set_firmware_waking_vector(
+                                (acpi_physical_address)acpi_wakeup_address);
 
         }
         ACPI_FLUSH_CPU_CACHE();
@@ -81,13 +82,6 @@ static int acpi_sleep_prepare(u32 acpi_state)
 #ifdef CONFIG_ACPI_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 
-u32 acpi_target_system_state(void)
-{
-        return acpi_target_sleep_state;
-}
-
-static bool pwr_btn_event_pending;
-
 /*
  * The ACPI specification wants us to save NVS memory regions during hibernation
  * and to restore them during the subsequent resume.  Windows does that also for
@@ -103,21 +97,6 @@ void __init acpi_nvs_nosave(void)
 }
 
 /*
- * The ACPI specification wants us to save NVS memory regions during hibernation
- * but says nothing about saving NVS during S3.  Not all versions of Windows
- * save NVS on S3 suspend either, and it is clear that not all systems need
- * NVS to be saved at S3 time.  To improve suspend/resume time, allow the
- * user to disable saving NVS on S3 if their system does not require it, but
- * continue to save/restore NVS for S4 as specified.
- */
-static bool nvs_nosave_s3;
-
-void __init acpi_nvs_nosave_s3(void)
-{
-        nvs_nosave_s3 = true;
-}
-
-/*
  * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
  * user to request that behavior by using the 'acpi_old_suspend_ordering'
  * kernel command line option that causes the following variable to be set.
@@ -129,187 +108,13 @@ void __init acpi_old_suspend_ordering(void)
         old_suspend_ordering = true;
 }
 
-static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
-{
-        acpi_old_suspend_ordering();
-        return 0;
-}
-
-static int __init init_nvs_nosave(const struct dmi_system_id *d)
-{
-        acpi_nvs_nosave();
-        return 0;
-}
-
-static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "Abit KN9 (nForce4 variant)",
-        .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
-                DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
-                },
-        },
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "HP xw4600 Workstation",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
-                },
-        },
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
-        .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
-                DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
-                },
-        },
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "Panasonic CF51-2L",
-        .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR,
-                                "Matsushita Electric Industrial Co.,Ltd."),
-                DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VGN-FW21E",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VPCEB17FX",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VGN-SR11M",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Everex StepNote Series",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VPCEB1Z1E",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VGN-NW130D",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VPCCW29FX",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Averatec AV1020-ED2",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
-                },
-        },
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "Asus A8N-SLI DELUXE",
-        .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
-                },
-        },
-        {
-        .callback = init_old_suspend_ordering,
-        .ident = "Asus A8N-SLI Premium",
-        .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VGN-SR26GN_P",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VPCEB1S1E",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Sony Vaio VGN-FW520F",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Asus K54C",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
-                },
-        },
-        {
-        .callback = init_nvs_nosave,
-        .ident = "Asus K54HR",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
-                },
-        },
-        {},
-};
-
-static void acpi_sleep_dmi_check(void)
-{
-        dmi_check_system(acpisleep_dmi_table);
-}
-
 /**
  * acpi_pm_freeze - Disable the GPEs and suspend EC transactions.
  */
 static int acpi_pm_freeze(void)
 {
         acpi_disable_all_gpes();
-        acpi_os_wait_events_complete();
+        acpi_os_wait_events_complete(NULL);
         acpi_ec_block_transactions();
         return 0;
 }
@@ -351,14 +156,6 @@ static int acpi_pm_prepare(void)
         return error;
 }
 
-static int find_powerf_dev(struct device *dev, void *data)
-{
-        struct acpi_device *device = to_acpi_device(dev);
-        const char *hid = acpi_device_hid(device);
-
-        return !strcmp(hid, ACPI_BUTTON_HID_POWERF);
-}
-
 /**
  *      acpi_pm_finish - Instruct the platform to leave a sleep state.
  *
@@ -367,7 +164,6 @@ static int find_powerf_dev(struct device *dev, void *data)
  */
 static void acpi_pm_finish(void)
 {
-        struct device *pwr_btn_dev;
         u32 acpi_state = acpi_target_sleep_state;
 
         acpi_ec_unblock_transactions();
@@ -385,23 +181,6 @@ static void acpi_pm_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
-
-        /* If we were woken with the fixed power button, provide a small
-         * hint to userspace in the form of a wakeup event on the fixed power
-         * button device (if it can be found).
-         *
-         * We delay the event generation til now, as the PM layer requires
-         * timekeeping to be running before we generate events. */
-        if (!pwr_btn_event_pending)
-                return;
-
-        pwr_btn_event_pending = false;
-        pwr_btn_dev = bus_find_device(&acpi_bus_type, NULL, NULL,
-                                      find_powerf_dev);
-        if (pwr_btn_dev) {
-                pm_wakeup_event(pwr_btn_dev, 0);
-                put_device(pwr_btn_dev);
-        }
 }
 
 /**
@@ -418,7 +197,6 @@ static void acpi_pm_end(void)
 }
 #else /* !CONFIG_ACPI_SLEEP */
 #define acpi_target_sleep_state ACPI_STATE_S0
-static inline void acpi_sleep_dmi_check(void) {}
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
@@ -438,7 +216,7 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
         u32 acpi_state = acpi_suspend_states[pm_state];
         int error = 0;
 
-        error = (nvs_nosave || nvs_nosave_s3) ? 0 : suspend_nvs_alloc();
+        error = nvs_nosave ? 0 : suspend_nvs_alloc();
         if (error)
                 return error;
 
@@ -486,29 +264,15 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         /* This violates the spec but is required for bug compatibility. */
         acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
 
-        /* Reprogram control registers */
+        /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(acpi_state);
 
         /* ACPI 3.0 specs (P62) says that it's the responsibility
          * of the OSPM to clear the status bit [ implying that the
          * POWER_BUTTON event should not reach userspace ]
-         *
-         * However, we do generate a small hint for userspace in the form of
-         * a wakeup event. We flag this condition for now and generate the
-         * event later, as we're currently too early in resume to be able to
-         * generate wakeup events.
          */
-        if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) {
-                acpi_event_status pwr_btn_status;
-
-                acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status);
-
-                if (pwr_btn_status & ACPI_EVENT_FLAG_SET) {
-                        acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
-                        /* Flag for later */
-                        pwr_btn_event_pending = true;
-                }
-        }
+        if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
+                acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
 
         /*
          * Disable and clear GPE status before interrupt is enabled. Some GPEs
@@ -577,6 +341,111 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
         .end = acpi_pm_end,
         .recover = acpi_pm_finish,
 };
+
+static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
+{
+        old_suspend_ordering = true;
+        return 0;
+}
+
+static int __init init_nvs_nosave(const struct dmi_system_id *d)
+{
+        acpi_nvs_nosave();
+        return 0;
+}
+
+static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Abit KN9 (nForce4 variant)",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
+                DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
+                },
+        },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "HP xw4600 Workstation",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
+                },
+        },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
+                DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
+                },
+        },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Panasonic CF51-2L",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR,
+                                "Matsushita Electric Industrial Co.,Ltd."),
+                DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VGN-SR11M",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Everex StepNote Series",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VPCEB1Z1E",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VGN-NW130D",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Averatec AV1020-ED2",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
+                },
+        },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Asus A8N-SLI DELUXE",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
+                },
+        },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Asus A8N-SLI Premium",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
+                },
+        },
+        {},
+};
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
@@ -610,7 +479,7 @@ static int acpi_hibernation_enter(void)
 
         /* This shouldn't return.  If it returns, we have a problem */
         status = acpi_enter_sleep_state(ACPI_STATE_S4);
-        /* Reprogram control registers */
+        /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
@@ -623,7 +492,7 @@ static void acpi_hibernation_leave(void)
          * enable it here.
          */
         acpi_enable();
-        /* Reprogram control registers */
+        /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
         /* Check the hardware signature */
         if (facs && s4_hardware_signature != facs->hardware_signature) {
@@ -715,6 +584,127 @@ int acpi_suspend(u32 acpi_state)
         return -EINVAL;
 }
 
+#ifdef CONFIG_PM
+/**
+ *      acpi_pm_device_sleep_state - return preferred power state of ACPI device
+ *              in the system sleep state given by %acpi_target_sleep_state
+ *      @dev: device to examine; its driver model wakeup flags control
+ *              whether it should be able to wake up the system
+ *      @d_min_p: used to store the upper limit of allowed states range
+ *      Return value: preferred power state of the device on success, -ENODEV on
+ *              failure (ie. if there's no 'struct acpi_device' for @dev)
+ *
+ *      Find the lowest power (highest number) ACPI device power state that
+ *      device @dev can be in while the system is in the sleep state represented
+ *      by %acpi_target_sleep_state.  If @wake is nonzero, the device should be
+ *      able to wake up the system from this sleep state.  If @d_min_p is set,
+ *      the highest power (lowest number) device power state of @dev allowed
+ *      in this system sleep state is stored at the location pointed to by it.
+ *
+ *      The caller must ensure that @dev is valid before using this function.
+ *      The caller is also responsible for figuring out if the device is
+ *      supposed to be able to wake up the system and passing this information
+ *      via @wake.
+ */
+
+int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
+{
+        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        struct acpi_device *adev;
+        char acpi_method[] = "_SxD";
+        unsigned long long d_min, d_max;
+
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                printk(KERN_DEBUG "ACPI handle has no context!\n");
+                return -ENODEV;
+        }
+
+        acpi_method[2] = '0' + acpi_target_sleep_state;
+        /*
+         * If the sleep state is S0, we will return D3, but if the device has
+         * _S0W, we will use the value from _S0W
+         */
+        d_min = ACPI_STATE_D0;
+        d_max = ACPI_STATE_D3;
+
+        /*
+         * If present, _SxD methods return the minimum D-state (highest power
+         * state) we can use for the corresponding S-states.  Otherwise, the
+         * minimum D-state is D0 (ACPI 3.x).
+         *
+         * NOTE: We rely on acpi_evaluate_integer() not clobbering the integer
+         * provided -- that's our fault recovery, we ignore retval.
+         */
+        if (acpi_target_sleep_state > ACPI_STATE_S0)
+                acpi_evaluate_integer(handle, acpi_method, NULL, &d_min);
+
+        /*
+         * If _PRW says we can wake up the system from the target sleep state,
+         * the D-state returned by _SxD is sufficient for that (we assume a
+         * wakeup-aware driver if wake is set).  Still, if _SxW exists
+         * (ACPI 3.x), it should return the maximum (lowest power) D-state that
+         * can wake the system.  _S0W may be valid, too.
+         */
+        if (acpi_target_sleep_state == ACPI_STATE_S0 ||
+            (device_may_wakeup(dev) &&
+             adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
+                acpi_status status;
+
+                acpi_method[3] = 'W';
+                status = acpi_evaluate_integer(handle, acpi_method, NULL,
+                                                &d_max);
+                if (ACPI_FAILURE(status)) {
+                        if (acpi_target_sleep_state != ACPI_STATE_S0 ||
+                            status != AE_NOT_FOUND)
+                                d_max = d_min;
+                } else if (d_max < d_min) {
+                        /* Warn the user of the broken DSDT */
+                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
+                                acpi_method);
+                        /* Sanitize it */
+                        d_min = d_max;
+                }
+        }
+
+        if (d_min_p)
+                *d_min_p = d_min;
+        return d_max;
+}
+#endif /* CONFIG_PM */
+
+#ifdef CONFIG_PM_SLEEP
+/**
+ *      acpi_pm_device_sleep_wake - enable or disable the system wake-up
+ *                                  capability of given device
+ *      @dev: device to handle
+ *      @enable: 'true' - enable, 'false' - disable the wake-up capability
+ */
+int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
+{
+        acpi_handle handle;
+        struct acpi_device *adev;
+        int error;
+
+        if (!device_can_wakeup(dev))
+                return -EINVAL;
+
+        handle = DEVICE_ACPI_HANDLE(dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                dev_dbg(dev, "ACPI handle has no context in %s!\n", __func__);
+                return -ENODEV;
+        }
+
+        error = enable ?
+                acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
+                acpi_disable_wakeup_device_power(adev);
+        if (!error)
+                dev_info(dev, "wake-up capability %s by ACPI\n",
+                                enable ? "enabled" : "disabled");
+
+        return error;
+}
+#endif  /* CONFIG_PM_SLEEP */
+
 static void acpi_power_off_prepare(void)
 {
         /* Prepare to power off the system */
@@ -730,19 +720,45 @@ static void acpi_power_off(void)
         acpi_enter_sleep_state(ACPI_STATE_S5);
 }
 
+/*
+ * ACPI 2.0 created the optional _GTS and _BFS,
+ * but industry adoption has been neither rapid nor broad.
+ *
+ * Linux gets into trouble when it executes poorly validated
+ * paths through the BIOS, so disable _GTS and _BFS by default,
+ * but do speak up and offer the option to enable them.
+ */
+static void __init acpi_gts_bfs_check(void)
+{
+        acpi_handle dummy;
+
+        if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__GTS, &dummy)))
+        {
+                printk(KERN_NOTICE PREFIX "BIOS offers _GTS\n");
+                printk(KERN_NOTICE PREFIX "If \"acpi.gts=1\" improves suspend, "
+                        "please notify linux-acpi@vger.kernel.org\n");
+        }
+        if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__BFS, &dummy)))
+        {
+                printk(KERN_NOTICE PREFIX "BIOS offers _BFS\n");
+                printk(KERN_NOTICE PREFIX "If \"acpi.bfs=1\" improves resume, "
+                        "please notify linux-acpi@vger.kernel.org\n");
+        }
+}
+
 int __init acpi_sleep_init(void)
 {
         acpi_status status;
         u8 type_a, type_b;
 #ifdef CONFIG_SUSPEND
         int i = 0;
+
+        dmi_check_system(acpisleep_dmi_table);
 #endif
 
         if (acpi_disabled)
                 return 0;
 
-        acpi_sleep_dmi_check();
-
         sleep_states[ACPI_STATE_S0] = 1;
         printk(KERN_INFO PREFIX "(supports S0");
 
@@ -751,7 +767,7 @@ int __init acpi_sleep_init(void)
                 status = acpi_get_sleep_type_data(i, &type_a, &type_b);
                 if (ACPI_SUCCESS(status)) {
                         sleep_states[i] = 1;
-                        printk(KERN_CONT " S%d", i);
+                        printk(" S%d", i);
                 }
         }
 
@@ -765,7 +781,7 @@ int __init acpi_sleep_init(void)
                 hibernation_set_ops(old_suspend_ordering ?
                         &acpi_hibernation_ops_old : &acpi_hibernation_ops);
                 sleep_states[ACPI_STATE_S4] = 1;
-                printk(KERN_CONT " S4");
+                printk(" S4");
                 if (!nosigcheck) {
                         acpi_get_table(ACPI_SIG_FACS, 1,
                                 (struct acpi_table_header **)&facs);
@@ -778,15 +794,16 @@ int __init acpi_sleep_init(void)
         status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
         if (ACPI_SUCCESS(status)) {
                 sleep_states[ACPI_STATE_S5] = 1;
-                printk(KERN_CONT " S5");
+                printk(" S5");
                 pm_power_off_prepare = acpi_power_off_prepare;
                 pm_power_off = acpi_power_off;
         }
-        printk(KERN_CONT ")\n");
+        printk(")\n");
         /*
          * Register the tts_notifier to reboot notifier list so that the _TTS
          * object can also be evaluated when the system enters S5.
          */
         register_reboot_notifier(&tts_notifier);
+        acpi_gts_bfs_check();
         return 0;
 }
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index ea61ca9129c..c538d0ef10f 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -173,7 +173,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp)
 {
         int result = 0;
 
-        if (!strncmp(val, "enable", sizeof("enable") - 1)) {
+        if (!strncmp(val, "enable", strlen("enable") - 1)) {
                 result = acpi_debug_trace(trace_method_name, trace_debug_level,
                                           trace_debug_layer, 0);
                 if (result)
@@ -181,7 +181,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp)
                 goto exit;
         }
 
-        if (!strncmp(val, "disable", sizeof("disable") - 1)) {
+        if (!strncmp(val, "disable", strlen("disable") - 1)) {
                 int name = 0;
                 result = acpi_debug_trace((char *)&name, trace_debug_level,
                                           trace_debug_layer, 0);
@@ -476,7 +476,7 @@ static void fixed_event_count(u32 event_number)
         return;
 }
 
-static void acpi_global_event_handler(u32 event_type, acpi_handle device,
+static void acpi_gbl_event_handler(u32 event_type, acpi_handle device,
         u32 event_number, void *context)
 {
         if (event_type == ACPI_EVENT_TYPE_GPE)
@@ -638,7 +638,7 @@ void acpi_irq_stats_init(void)
         if (all_counters == NULL)
                 goto fail;
 
-        status = acpi_install_global_event_handler(acpi_global_event_handler, NULL);
+        status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL);
         if (ACPI_FAILURE(status))
                 goto fail;
 
@@ -706,23 +706,11 @@ static void __exit interrupt_stats_exit(void)
         return;
 }
 
-static ssize_t
-acpi_show_profile(struct device *dev, struct device_attribute *attr,
-                  char *buf)
-{
-        return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile);
-}
-
-static const struct device_attribute pm_profile_attr =
-        __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
-
 int __init acpi_sysfs_init(void)
 {
         int result;
 
         result = acpi_tables_sysfs_init();
-        if (result)
-                return result;
-        result = sysfs_create_file(acpi_kobj, &pm_profile_attr.attr);
+
         return result;
 }
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 506fbd4b573..48fbc647b17 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -98,6 +98,7 @@ MODULE_PARM_DESC(psv, "Disable or override all passive trip points.");
 
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
+static int acpi_thermal_resume(struct acpi_device *device);
 static void acpi_thermal_notify(struct acpi_device *device, u32 event);
 
 static const struct acpi_device_id  thermal_device_ids[] = {
@@ -106,11 +107,6 @@ static const struct acpi_device_id  thermal_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_thermal_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);
-
 static struct acpi_driver acpi_thermal_driver = {
         .name = "thermal",
         .class = ACPI_THERMAL_CLASS,
@@ -118,9 +114,9 @@ static struct acpi_driver acpi_thermal_driver = {
         .ops = {
                 .add = acpi_thermal_add,
                 .remove = acpi_thermal_remove,
+                .resume = acpi_thermal_resume,
                 .notify = acpi_thermal_notify,
                 },
-        .drv.pm = &acpi_thermal_pm,
 };
 
 struct acpi_thermal_state {
@@ -554,6 +550,8 @@ static int thermal_get_temp(struct thermal_zone_device *thermal,
         return 0;
 }
 
+static const char enabled[] = "kernel";
+static const char disabled[] = "user";
 static int thermal_get_mode(struct thermal_zone_device *thermal,
                                 enum thermal_device_mode *mode)
 {
@@ -590,8 +588,8 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,
         if (enable != tz->tz_enabled) {
                 tz->tz_enabled = enable;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "%s kernel ACPI thermal control\n",
-                        tz->tz_enabled ? "Enable" : "Disable"));
+                        "%s ACPI thermal control\n",
+                        tz->tz_enabled ? enabled : disabled));
                 acpi_thermal_check(tz);
         }
         return 0;
@@ -708,40 +706,6 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
                 return -EINVAL;
 }
 
-static int thermal_get_trend(struct thermal_zone_device *thermal,
-                                int trip, enum thermal_trend *trend)
-{
-        struct acpi_thermal *tz = thermal->devdata;
-        enum thermal_trip_type type;
-        int i;
-
-        if (thermal_get_trip_type(thermal, trip, &type))
-                return -EINVAL;
-
-        if (type == THERMAL_TRIP_ACTIVE) {
-                /* aggressive active cooling */
-                *trend = THERMAL_TREND_RAISING;
-                return 0;
-        }
-
-        /*
-         * tz->temperature has already been updated by generic thermal layer,
-         * before this callback being invoked
-         */
-        i = (tz->trips.passive.tc1 * (tz->temperature - tz->last_temperature))
-                + (tz->trips.passive.tc2
-                * (tz->temperature - tz->trips.passive.temperature));
-
-        if (i > 0)
-                *trend = THERMAL_TREND_RAISING;
-        else if (i < 0)
-                *trend = THERMAL_TREND_DROPPING;
-        else
-                *trend = THERMAL_TREND_STABLE;
-        return 0;
-}
-
-
 static int thermal_notify(struct thermal_zone_device *thermal, int trip,
                            enum thermal_trip_type trip_type)
 {
@@ -765,9 +729,11 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip,
         return 0;
 }
 
+typedef int (*cb)(struct thermal_zone_device *, int,
+                  struct thermal_cooling_device *);
 static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                                         struct thermal_cooling_device *cdev,
-                                        bool bind)
+                                        cb action)
 {
         struct acpi_device *device = cdev->devdata;
         struct acpi_thermal *tz = thermal->devdata;
@@ -791,19 +757,11 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                     i++) {
                         handle = tz->trips.passive.devices.handles[i];
                         status = acpi_bus_get_device(handle, &dev);
-                        if (ACPI_FAILURE(status) || dev != device)
-                                continue;
-                        if (bind)
-                                result =
-                                        thermal_zone_bind_cooling_device
-                                        (thermal, trip, cdev,
-                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT);
-                        else
-                                result =
-                                        thermal_zone_unbind_cooling_device
-                                        (thermal, trip, cdev);
-                        if (result)
-                                goto failed;
+                        if (ACPI_SUCCESS(status) && (dev == device)) {
+                                result = action(thermal, trip, cdev);
+                                if (result)
+                                        goto failed;
+                        }
                 }
         }
 
@@ -816,17 +774,11 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                     j++) {
                         handle = tz->trips.active[i].devices.handles[j];
                         status = acpi_bus_get_device(handle, &dev);
-                        if (ACPI_FAILURE(status) || dev != device)
-                                continue;
-                        if (bind)
-                                result = thermal_zone_bind_cooling_device
-                                        (thermal, trip, cdev,
-                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT);
-                        else
-                                result = thermal_zone_unbind_cooling_device
-                                        (thermal, trip, cdev);
-                        if (result)
-                                goto failed;
+                        if (ACPI_SUCCESS(status) && (dev == device)) {
+                                result = action(thermal, trip, cdev);
+                                if (result)
+                                        goto failed;
+                        }
                 }
         }
 
@@ -834,14 +786,7 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                 handle = tz->devices.handles[i];
                 status = acpi_bus_get_device(handle, &dev);
                 if (ACPI_SUCCESS(status) && (dev == device)) {
-                        if (bind)
-                                result = thermal_zone_bind_cooling_device
-                                                (thermal, -1, cdev,
-                                                 THERMAL_NO_LIMIT,
-                                                 THERMAL_NO_LIMIT);
-                        else
-                                result = thermal_zone_unbind_cooling_device
-                                                (thermal, -1, cdev);
+                        result = action(thermal, -1, cdev);
                         if (result)
                                 goto failed;
                 }
@@ -855,14 +800,16 @@ static int
 acpi_thermal_bind_cooling_device(struct thermal_zone_device *thermal,
                                         struct thermal_cooling_device *cdev)
 {
-        return acpi_thermal_cooling_device_cb(thermal, cdev, true);
+        return acpi_thermal_cooling_device_cb(thermal, cdev,
+                                thermal_zone_bind_cooling_device);
 }
 
 static int
 acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal,
                                         struct thermal_cooling_device *cdev)
 {
-        return acpi_thermal_cooling_device_cb(thermal, cdev, false);
+        return acpi_thermal_cooling_device_cb(thermal, cdev,
+                                thermal_zone_unbind_cooling_device);
 }
 
 static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
@@ -874,7 +821,6 @@ static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
         .get_trip_type = thermal_get_trip_type,
         .get_trip_temp = thermal_get_trip_temp,
         .get_crit_temp = thermal_get_crit_temp,
-        .get_trend = thermal_get_trend,
         .notify = thermal_notify,
 };
 
@@ -899,15 +845,18 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
 
         if (tz->trips.passive.flags.valid)
                 tz->thermal_zone =
-                        thermal_zone_device_register("acpitz", trips, 0, tz,
-                                                &acpi_thermal_zone_ops, NULL,
+                        thermal_zone_device_register("acpitz", trips, tz,
+                                                     &acpi_thermal_zone_ops,
+                                                     tz->trips.passive.tc1,
+                                                     tz->trips.passive.tc2,
                                                      tz->trips.passive.tsp*100,
                                                      tz->polling_frequency*100);
         else
                 tz->thermal_zone =
-                        thermal_zone_device_register("acpitz", trips, 0, tz,
-                                                &acpi_thermal_zone_ops, NULL,
-                                                0, tz->polling_frequency*100);
+                        thermal_zone_device_register("acpitz", trips, tz,
+                                                     &acpi_thermal_zone_ops,
+                                                     0, 0, 0,
+                                                     tz->polling_frequency*100);
         if (IS_ERR(tz->thermal_zone))
                 return -ENODEV;
 
@@ -984,38 +933,6 @@ static void acpi_thermal_notify(struct acpi_device *device, u32 event)
         }
 }
 
-/*
- * On some platforms, the AML code has dependency about
- * the evaluating order of _TMP and _CRT/_HOT/_PSV/_ACx.
- * 1. On HP Pavilion G4-1016tx, _TMP must be invoked after
- *    /_CRT/_HOT/_PSV/_ACx, or else system will be power off.
- * 2. On HP Compaq 6715b/6715s, the return value of _PSV is 0
- *    if _TMP has never been evaluated.
- *
- * As this dependency is totally transparent to OS, evaluate
- * all of them once, in the order of _CRT/_HOT/_PSV/_ACx,
- * _TMP, before they are actually used.
- */
-static void acpi_thermal_aml_dependency_fix(struct acpi_thermal *tz)
-{
-        acpi_handle handle = tz->device->handle;
-        unsigned long long value;
-        int i;
-
-        acpi_evaluate_integer(handle, "_CRT", NULL, &value);
-        acpi_evaluate_integer(handle, "_HOT", NULL, &value);
-        acpi_evaluate_integer(handle, "_PSV", NULL, &value);
-        for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
-                char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
-                acpi_status status;
-
-                status = acpi_evaluate_integer(handle, name, NULL, &value);
-                if (status == AE_NOT_FOUND)
-                        break;
-        }
-        acpi_evaluate_integer(handle, "_TMP", NULL, &value);
-}
-
 static int acpi_thermal_get_info(struct acpi_thermal *tz)
 {
         int result = 0;
@@ -1024,15 +941,13 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
         if (!tz)
                 return -EINVAL;
 
-        acpi_thermal_aml_dependency_fix(tz);
-
-        /* Get trip points [_CRT, _PSV, etc.] (required) */
-        result = acpi_thermal_get_trip_points(tz);
+        /* Get temperature [_TMP] (required) */
+        result = acpi_thermal_get_temperature(tz);
         if (result)
                 return result;
 
-        /* Get temperature [_TMP] (required) */
-        result = acpi_thermal_get_temperature(tz);
+        /* Get trip points [_CRT, _PSV, etc.] (required) */
+        result = acpi_thermal_get_trip_points(tz);
         if (result)
                 return result;
 
@@ -1126,19 +1041,17 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int acpi_thermal_resume(struct device *dev)
+static int acpi_thermal_resume(struct acpi_device *device)
 {
-        struct acpi_thermal *tz;
+        struct acpi_thermal *tz = NULL;
         int i, j, power_state, result;
 
-        if (!dev)
-                return -EINVAL;
 
-        tz = acpi_driver_data(to_acpi_device(dev));
-        if (!tz)
+        if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
+        tz = acpi_driver_data(device);
+
         for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
                 if (!(&tz->trips.active[i]))
                         break;
@@ -1161,7 +1074,6 @@ static int acpi_thermal_resume(struct device *dev)
 
         return AE_OK;
 }
-#endif
 
 static int thermal_act(const struct dmi_system_id *d) {
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 74437130431..b002a471c5d 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -28,8 +28,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/hardirq.h>
-#include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -384,114 +382,3 @@ acpi_evaluate_reference(acpi_handle handle,
 }
 
 EXPORT_SYMBOL(acpi_evaluate_reference);
-
-acpi_status
-acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld)
-{
-        acpi_status status;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object *output;
-
-        status = acpi_evaluate_object(handle, "_PLD", NULL, &buffer);
-
-        if (ACPI_FAILURE(status))
-                return status;
-
-        output = buffer.pointer;
-
-        if (!output || output->type != ACPI_TYPE_PACKAGE
-            || !output->package.count
-            || output->package.elements[0].type != ACPI_TYPE_BUFFER
-            || output->package.elements[0].buffer.length < ACPI_PLD_REV1_BUFFER_SIZE) {
-                status = AE_TYPE;
-                goto out;
-        }
-
-        status = acpi_decode_pld_buffer(
-                        output->package.elements[0].buffer.pointer,
-                        output->package.elements[0].buffer.length,
-                        pld);
-
-out:
-        kfree(buffer.pointer);
-        return status;
-}
-EXPORT_SYMBOL(acpi_get_physical_device_location);
-
-/**
- * acpi_evaluate_hotplug_ost: Evaluate _OST for hotplug operations
- * @handle: ACPI device handle
- * @source_event: source event code
- * @status_code: status code
- * @status_buf: optional detailed information (NULL if none)
- *
- * Evaluate _OST for hotplug operations. All ACPI hotplug handlers
- * must call this function when evaluating _OST for hotplug operations.
- * When the platform does not support _OST, this function has no effect.
- */
-acpi_status
-acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
-                u32 status_code, struct acpi_buffer *status_buf)
-{
-#ifdef ACPI_HOTPLUG_OST
-        union acpi_object params[3] = {
-                {.type = ACPI_TYPE_INTEGER,},
-                {.type = ACPI_TYPE_INTEGER,},
-                {.type = ACPI_TYPE_BUFFER,}
-        };
-        struct acpi_object_list arg_list = {3, params};
-        acpi_status status;
-
-        params[0].integer.value = source_event;
-        params[1].integer.value = status_code;
-        if (status_buf != NULL) {
-                params[2].buffer.pointer = status_buf->pointer;
-                params[2].buffer.length = status_buf->length;
-        } else {
-                params[2].buffer.pointer = NULL;
-                params[2].buffer.length = 0;
-        }
-
-        status = acpi_evaluate_object(handle, "_OST", &arg_list, NULL);
-        return status;
-#else
-        return AE_OK;
-#endif
-}
-EXPORT_SYMBOL(acpi_evaluate_hotplug_ost);
-
-/**
- * acpi_handle_printk: Print message with ACPI prefix and object path
- *
- * This function is called through acpi_handle_<level> macros and prints
- * a message with ACPI prefix and object path.  This function acquires
- * the global namespace mutex to obtain an object path.  In interrupt
- * context, it shows the object path as <n/a>.
- */
-void
-acpi_handle_printk(const char *level, acpi_handle handle, const char *fmt, ...)
-{
-        struct va_format vaf;
-        va_list args;
-        struct acpi_buffer buffer = {
-                .length = ACPI_ALLOCATE_BUFFER,
-                .pointer = NULL
-        };
-        const char *path;
-
-        va_start(args, fmt);
-        vaf.fmt = fmt;
-        vaf.va = &args;
-
-        if (in_interrupt() ||
-            acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK)
-                path = "<n/a>";
-        else
-                path = buffer.pointer;
-
-        printk("%sACPI: %s: %pV", level, path, &vaf);
-
-        va_end(args);
-        kfree(buffer.pointer);
-}
-EXPORT_SYMBOL(acpi_handle_printk);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index ac9a69cd45f..08a44b532f7 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -69,21 +69,21 @@ MODULE_AUTHOR("Bruno Ducrot");
 MODULE_DESCRIPTION("ACPI Video Driver");
 MODULE_LICENSE("GPL");
 
-static bool brightness_switch_enabled = 1;
+static int brightness_switch_enabled = 1;
 module_param(brightness_switch_enabled, bool, 0644);
 
 /*
  * By default, we don't allow duplicate ACPI video bus devices
  * under the same VGA controller
  */
-static bool allow_duplicates;
+static int allow_duplicates;
 module_param(allow_duplicates, bool, 0644);
 
 /*
  * Some BIOSes claim they use minimum backlight at boot,
  * and this may bring dimming screen after boot
  */
-static bool use_bios_initial_backlight = 1;
+static int use_bios_initial_backlight = 1;
 module_param(use_bios_initial_backlight, bool, 0644);
 
 static int register_count = 0;
@@ -389,12 +389,6 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)
         return 0;
 }
 
-static int video_ignore_initial_backlight(const struct dmi_system_id *d)
-{
-        use_bios_initial_backlight = 0;
-        return 0;
-}
-
 static struct dmi_system_id video_dmi_table[] __initdata = {
         /*
          * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -439,14 +433,6 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"),
                 },
         },
-        {
-         .callback = video_ignore_initial_backlight,
-         .ident = "HP Folio 13-2000",
-         .matches = {
-                DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"),
-                },
-        },
         {}
 };
 
@@ -562,29 +548,27 @@ acpi_video_device_EDID(struct acpi_video_device *device,
  *              1.      The system BIOS should NOT automatically control the brightness 
  *                      level of the LCD when the power changes from AC to DC.
  * Return Value:
- *              -EINVAL wrong arg.
+ *              -1      wrong arg.
  */
 
 static int
 acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 {
-        acpi_status status;
+        u64 status = 0;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
 
-        if (!video->cap._DOS)
-                return 0;
 
-        if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1)
-                return -EINVAL;
+        if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1) {
+                status = -1;
+                goto Failed;
+        }
         arg0.integer.value = (lcd_flag << 2) | bios_flag;
         video->dos_setting = arg0.integer.value;
-        status = acpi_evaluate_object(video->device->handle, "_DOS",
-                &args, NULL);
-        if (ACPI_FAILURE(status))
-                return -EIO;
+        acpi_evaluate_object(video->device->handle, "_DOS", &args, NULL);
 
-        return 0;
+      Failed:
+        return status;
 }
 
 /*
@@ -1362,17 +1346,12 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
         int status = 0;
         struct acpi_device *dev;
 
-        /*
-         * There are systems where video module known to work fine regardless
-         * of broken _DOD and ignoring returned value here doesn't cause
-         * any issues later.
-         */
         acpi_video_device_enumerate(video);
 
         list_for_each_entry(dev, &device->children, node) {
 
                 status = acpi_video_bus_get_one_device(dev, video);
-                if (status) {
+                if (ACPI_FAILURE(status)) {
                         printk(KERN_WARNING PREFIX
                                         "Can't attach device\n");
                         continue;
@@ -1465,7 +1444,8 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
         case ACPI_VIDEO_NOTIFY_SWITCH:  /* User requested a switch,
                                          * most likely via hotkey. */
                 acpi_bus_generate_proc_event(device, event, 0);
-                keycode = KEY_SWITCHVIDEOMODE;
+                if (!acpi_notifier_call_chain(device, event, 0))
+                        keycode = KEY_SWITCHVIDEOMODE;
                 break;
 
         case ACPI_VIDEO_NOTIFY_PROBE:   /* User plugged in or removed a video
@@ -1495,9 +1475,8 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
                 break;
         }
 
-        if (acpi_notifier_call_chain(device, event, 0))
-                /* Something vetoed the keypress. */
-                keycode = 0;
+        if (event != ACPI_VIDEO_NOTIFY_SWITCH)
+                acpi_notifier_call_chain(device, event, 0);
 
         if (keycode) {
                 input_report_key(input, keycode, 1);
@@ -1674,20 +1653,15 @@ static int acpi_video_bus_add(struct acpi_device *device)
         mutex_init(&video->device_list_lock);
         INIT_LIST_HEAD(&video->video_device_list);
 
-        error = acpi_video_bus_get_devices(video, device);
-        if (error)
-                goto err_free_video;
+        acpi_video_bus_get_devices(video, device);
+        acpi_video_bus_start_devices(video);
 
         video->input = input = input_allocate_device();
         if (!input) {
                 error = -ENOMEM;
-                goto err_put_video;
+                goto err_stop_video;
         }
 
-        error = acpi_video_bus_start_devices(video);
-        if (error)
-                goto err_free_input_dev;
-
         snprintf(video->phys, sizeof(video->phys),
                 "%s/video/input0", acpi_device_hid(video->device));
 
@@ -1706,6 +1680,10 @@ static int acpi_video_bus_add(struct acpi_device *device)
         set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
         set_bit(KEY_DISPLAY_OFF, input->keybit);
 
+        error = input_register_device(input);
+        if (error)
+                goto err_free_input_dev;
+
         printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
                ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
                video->flags.multihead ? "yes" : "no",
@@ -1714,23 +1692,14 @@ static int acpi_video_bus_add(struct acpi_device *device)
 
         video->pm_nb.notifier_call = acpi_video_resume;
         video->pm_nb.priority = 0;
-        error = register_pm_notifier(&video->pm_nb);
-        if (error)
-                goto err_stop_video;
-
-        error = input_register_device(input);
-        if (error)
-                goto err_unregister_pm_notifier;
+        register_pm_notifier(&video->pm_nb);
 
         return 0;
 
- err_unregister_pm_notifier:
-        unregister_pm_notifier(&video->pm_nb);
- err_stop_video:
-        acpi_video_bus_stop_devices(video);
  err_free_input_dev:
         input_free_device(input);
- err_put_video:
+ err_stop_video:
+        acpi_video_bus_stop_devices(video);
         acpi_video_bus_put_devices(video);
         kfree(video->attached_array);
  err_free_video:
@@ -1762,18 +1731,9 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-static int __init is_i740(struct pci_dev *dev)
-{
-        if (dev->device == 0x00D1)
-                return 1;
-        if (dev->device == 0x7000)
-                return 1;
-        return 0;
-}
-
 static int __init intel_opregion_present(void)
 {
-        int opregion = 0;
+#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
         struct pci_dev *dev = NULL;
         u32 address;
 
@@ -1782,15 +1742,13 @@ static int __init intel_opregion_present(void)
                         continue;
                 if (dev->vendor != PCI_VENDOR_ID_INTEL)
                         continue;
-                /* We don't want to poke around undefined i740 registers */
-                if (is_i740(dev))
-                        continue;
                 pci_read_config_dword(dev, 0xfc, &address);
                 if (!address)
                         continue;
-                opregion = 1;
+                return 1;
         }
-        return opregion;
+#endif
+        return 0;
 }
 
 int acpi_video_register(void)
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 4ac2593234e..5af3479714f 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -23,7 +23,7 @@
  * Depending on whether ACPI graphics extensions (cmp. ACPI spec Appendix B)
  * are available, video.ko should be used to handle the device.
  *
- * Otherwise vendor specific drivers like thinkpad_acpi, asus-laptop,
+ * Otherwise vendor specific drivers like thinkpad_acpi, asus_acpi,
  * sony_acpi,... can take care about backlight brightness.
  *
  * If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module (m)
@@ -33,7 +33,6 @@
  *
  */
 
-#include <linux/export.h>
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/pci.h>
@@ -132,41 +131,6 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK;
 }
 
-/* Force to use vendor driver when the ACPI device is known to be
- * buggy */
-static int video_detect_force_vendor(const struct dmi_system_id *d)
-{
-        acpi_video_support |= ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
-        return 0;
-}
-
-static struct dmi_system_id video_detect_dmi_table[] = {
-        /* On Samsung X360, the BIOS will set a flag (VDRV) if generic
-         * ACPI backlight device is used. This flag will definitively break
-         * the backlight interface (even the vendor interface) untill next
-         * reboot. It's why we should prevent video.ko from being used here
-         * and we can't rely on a later call to acpi_video_unregister().
-         */
-        {
-         .callback = video_detect_force_vendor,
-         .ident = "X360",
-         .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "X360"),
-                DMI_MATCH(DMI_BOARD_NAME, "X360"),
-                },
-        },
-        {
-        .callback = video_detect_force_vendor,
-        .ident = "Asus UL30VT",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"),
-                },
-        },
-        { },
-};
-
 /*
  * Returns the video capabilities of a specific ACPI graphics device
  *
@@ -199,8 +163,6 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
                  *              ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
                  *}
                  */
-
-                dmi_check_system(video_detect_dmi_table);
         } else {
                 status = acpi_bus_get_device(graphics_handle, &tmp_dev);
                 if (ACPI_FAILURE(status)) {
@@ -219,7 +181,8 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
 }
 EXPORT_SYMBOL(acpi_video_get_capabilities);
 
-static void acpi_video_caps_check(void)
+/* Returns true if video.ko can do backlight switching */
+int acpi_video_backlight_support(void)
 {
         /*
          * We must check whether the ACPI graphics device is physically plugged
@@ -227,34 +190,6 @@ static void acpi_video_caps_check(void)
          */
         if (!acpi_video_caps_checked)
                 acpi_video_get_capabilities(NULL);
-}
-
-/* Promote the vendor interface instead of the generic video module.
- * This function allow DMI blacklists to be implemented by externals
- * platform drivers instead of putting a big blacklist in video_detect.c
- * After calling this function you will probably want to call
- * acpi_video_unregister() to make sure the video module is not loaded
- */
-void acpi_video_dmi_promote_vendor(void)
-{
-        acpi_video_caps_check();
-        acpi_video_support |= ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
-}
-EXPORT_SYMBOL(acpi_video_dmi_promote_vendor);
-
-/* To be called when a driver who previously promoted the vendor
- * interface */
-void acpi_video_dmi_demote_vendor(void)
-{
-        acpi_video_caps_check();
-        acpi_video_support &= ~ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
-}
-EXPORT_SYMBOL(acpi_video_dmi_demote_vendor);
-
-/* Returns true if video.ko can do backlight switching */
-int acpi_video_backlight_support(void)
-{
-        acpi_video_caps_check();
 
         /* First check for boot param -> highest prio */
         if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR)