190 files changed, 6249 insertions, 4091 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 3f3489c5ca8..3a17ca5fff6 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -7,7 +7,6 @@ menuconfig ACPI
         depends on !IA64_HP_SIM
         depends on IA64 || X86
         depends on PCI
-        depends on PM
         select PNP
         default y
         help
@@ -51,12 +50,7 @@ config ACPI_PROCFS
           For backwards compatibility, this option allows
           deprecated /proc/acpi/ files to exist, even when
           they have been replaced by functions in /sys.
-          The deprecated files (and their replacements) include:
 
-          /proc/acpi/processor/*/throttling (/sys/class/thermal/
-                cooling_device*/*)
-          /proc/acpi/video/*/brightness (/sys/class/backlight/)
-          /proc/acpi/thermal_zone/*/* (/sys/class/thermal/)
           This option has no effect on /proc/acpi/ files
           and functions which do not yet exist in /sys.
 
@@ -74,6 +68,8 @@ config ACPI_PROCFS_POWER
           /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
           This option has no effect on /proc/acpi/ directories
           and functions, which do not yet exist in /sys
+          This option, together with the proc directories, will be
+          deleted in 2.6.39.
 
           Say N to delete power /proc/acpi/ directories that have moved to /sys/
 
@@ -209,6 +205,17 @@ config ACPI_PROCESSOR
 
           To compile this driver as a module, choose M here:
           the module will be called processor.
+config ACPI_IPMI
+        tristate "IPMI"
+        depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
+        default n
+        help
+          This driver enables the ACPI to access the BMC controller. And it
+          uses the IPMI request/response message to communicate with BMC
+          controller, which can be found on on the server.
+
+          To compile this driver as a module, choose M here:
+          the module will be called as acpi_ipmi.
 
 config ACPI_HOTPLUG_CPU
         bool
@@ -310,7 +317,7 @@ config ACPI_PCI_SLOT
           the module will be called pci_slot.
 
 config X86_PM_TIMER
-        bool "Power Management Timer Support" if EMBEDDED
+        bool "Power Management Timer Support" if EXPERT
         depends on X86
         default y
         help
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3d031d02e54..d113fa5100b 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -24,7 +24,7 @@ acpi-y				+= atomicio.o
 # sleep related files
 acpi-y                          += wakeup.o
 acpi-y                          += sleep.o
-acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
+acpi-$(CONFIG_ACPI_SLEEP)       += proc.o nvs.o
 
 
 #
@@ -69,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 ba9afeaa23a..58c3f74bd84 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -100,24 +100,7 @@ static const struct file_operations acpi_ac_fops = {
         .release = single_release,
 };
 #endif
-static int get_ac_property(struct power_supply *psy,
-                           enum power_supply_property psp,
-                           union power_supply_propval *val)
-{
-        struct acpi_ac *ac = to_acpi_ac(psy);
-        switch (psp) {
-        case POWER_SUPPLY_PROP_ONLINE:
-                val->intval = ac->state;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
 
-static enum power_supply_property ac_props[] = {
-        POWER_SUPPLY_PROP_ONLINE,
-};
 /* --------------------------------------------------------------------------
                                AC Adapter Management
    -------------------------------------------------------------------------- */
@@ -140,6 +123,35 @@ static int acpi_ac_get_state(struct acpi_ac *ac)
         return 0;
 }
 
+/* --------------------------------------------------------------------------
+                            sysfs I/F
+   -------------------------------------------------------------------------- */
+static int get_ac_property(struct power_supply *psy,
+                           enum power_supply_property psp,
+                           union power_supply_propval *val)
+{
+        struct acpi_ac *ac = to_acpi_ac(psy);
+
+        if (!ac)
+                return -ENODEV;
+
+        if (acpi_ac_get_state(ac))
+                return -ENODEV;
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = ac->state;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static enum power_supply_property ac_props[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
+
 #ifdef CONFIG_ACPI_PROCFS_POWER
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
@@ -185,7 +197,8 @@ static int acpi_ac_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
 
-
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_ac_dir);
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
new file mode 100644
index 00000000000..f40acef8026
--- /dev/null
+++ b/drivers/acpi/acpi_ipmi.c
@@ -0,0 +1,525 @@
+/*
+ *  acpi_ipmi.c - ACPI IPMI opregion
+ *
+ *  Copyright (C) 2010 Intel Corporation
+ *  Copyright (C) 2010 Zhao Yakui <yakui.zhao@intel.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
+ *
+ *  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/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+#include <linux/ipmi.h>
+#include <linux/device.h>
+#include <linux/pnp.h>
+
+MODULE_AUTHOR("Zhao Yakui");
+MODULE_DESCRIPTION("ACPI IPMI Opregion driver");
+MODULE_LICENSE("GPL");
+
+#define IPMI_FLAGS_HANDLER_INSTALL      0
+
+#define ACPI_IPMI_OK                    0
+#define ACPI_IPMI_TIMEOUT               0x10
+#define ACPI_IPMI_UNKNOWN               0x07
+/* the IPMI timeout is 5s */
+#define IPMI_TIMEOUT                    (5 * HZ)
+
+struct acpi_ipmi_device {
+        /* the device list attached to driver_data.ipmi_devices */
+        struct list_head head;
+        /* the IPMI request message list */
+        struct list_head tx_msg_list;
+        struct mutex    tx_msg_lock;
+        acpi_handle handle;
+        struct pnp_dev *pnp_dev;
+        ipmi_user_t     user_interface;
+        int ipmi_ifnum; /* IPMI interface number */
+        long curr_msgid;
+        unsigned long flags;
+        struct ipmi_smi_info smi_data;
+};
+
+struct ipmi_driver_data {
+        struct list_head        ipmi_devices;
+        struct ipmi_smi_watcher bmc_events;
+        struct ipmi_user_hndl   ipmi_hndlrs;
+        struct mutex            ipmi_lock;
+};
+
+struct acpi_ipmi_msg {
+        struct list_head head;
+        /*
+         * General speaking the addr type should be SI_ADDR_TYPE. And
+         * the addr channel should be BMC.
+         * In fact it can also be IPMB type. But we will have to
+         * parse it from the Netfn command buffer. It is so complex
+         * that it is skipped.
+         */
+        struct ipmi_addr addr;
+        long tx_msgid;
+        /* it is used to track whether the IPMI message is finished */
+        struct completion tx_complete;
+        struct kernel_ipmi_msg tx_message;
+        int     msg_done;
+        /* tx data . And copy it from ACPI object buffer */
+        u8      tx_data[64];
+        int     tx_len;
+        u8      rx_data[64];
+        int     rx_len;
+        struct acpi_ipmi_device *device;
+};
+
+/* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */
+struct acpi_ipmi_buffer {
+        u8 status;
+        u8 length;
+        u8 data[64];
+};
+
+static void ipmi_register_bmc(int iface, struct device *dev);
+static void ipmi_bmc_gone(int iface);
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
+static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device);
+static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device);
+
+static struct ipmi_driver_data driver_data = {
+        .ipmi_devices = LIST_HEAD_INIT(driver_data.ipmi_devices),
+        .bmc_events = {
+                .owner = THIS_MODULE,
+                .new_smi = ipmi_register_bmc,
+                .smi_gone = ipmi_bmc_gone,
+        },
+        .ipmi_hndlrs = {
+                .ipmi_recv_hndl = ipmi_msg_handler,
+        },
+};
+
+static struct acpi_ipmi_msg *acpi_alloc_ipmi_msg(struct acpi_ipmi_device *ipmi)
+{
+        struct acpi_ipmi_msg *ipmi_msg;
+        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+
+        ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL);
+        if (!ipmi_msg)  {
+                dev_warn(&pnp_dev->dev, "Can't allocate memory for ipmi_msg\n");
+                return NULL;
+        }
+        init_completion(&ipmi_msg->tx_complete);
+        INIT_LIST_HEAD(&ipmi_msg->head);
+        ipmi_msg->device = ipmi;
+        return ipmi_msg;
+}
+
+#define         IPMI_OP_RGN_NETFN(offset)       ((offset >> 8) & 0xff)
+#define         IPMI_OP_RGN_CMD(offset)         (offset & 0xff)
+static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,
+                                acpi_physical_address address,
+                                acpi_integer *value)
+{
+        struct kernel_ipmi_msg *msg;
+        struct acpi_ipmi_buffer *buffer;
+        struct acpi_ipmi_device *device;
+
+        msg = &tx_msg->tx_message;
+        /*
+         * IPMI network function and command are encoded in the address
+         * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3.
+         */
+        msg->netfn = IPMI_OP_RGN_NETFN(address);
+        msg->cmd = IPMI_OP_RGN_CMD(address);
+        msg->data = tx_msg->tx_data;
+        /*
+         * value is the parameter passed by the IPMI opregion space handler.
+         * It points to the IPMI request message buffer
+         */
+        buffer = (struct acpi_ipmi_buffer *)value;
+        /* copy the tx message data */
+        msg->data_len = buffer->length;
+        memcpy(tx_msg->tx_data, buffer->data, msg->data_len);
+        /*
+         * now the default type is SYSTEM_INTERFACE and channel type is BMC.
+         * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE,
+         * the addr type should be changed to IPMB. Then we will have to parse
+         * the IPMI request message buffer to get the IPMB address.
+         * If so, please fix me.
+         */
+        tx_msg->addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+        tx_msg->addr.channel = IPMI_BMC_CHANNEL;
+        tx_msg->addr.data[0] = 0;
+
+        /* Get the msgid */
+        device = tx_msg->device;
+        mutex_lock(&device->tx_msg_lock);
+        device->curr_msgid++;
+        tx_msg->tx_msgid = device->curr_msgid;
+        mutex_unlock(&device->tx_msg_lock);
+}
+
+static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
+                acpi_integer *value, int rem_time)
+{
+        struct acpi_ipmi_buffer *buffer;
+
+        /*
+         * value is also used as output parameter. It represents the response
+         * IPMI message returned by IPMI command.
+         */
+        buffer = (struct acpi_ipmi_buffer *)value;
+        if (!rem_time && !msg->msg_done) {
+                buffer->status = ACPI_IPMI_TIMEOUT;
+                return;
+        }
+        /*
+         * If the flag of msg_done is not set or the recv length is zero, it
+         * means that the IPMI command is not executed correctly.
+         * The status code will be ACPI_IPMI_UNKNOWN.
+         */
+        if (!msg->msg_done || !msg->rx_len) {
+                buffer->status = ACPI_IPMI_UNKNOWN;
+                return;
+        }
+        /*
+         * If the IPMI response message is obtained correctly, the status code
+         * will be ACPI_IPMI_OK
+         */
+        buffer->status = ACPI_IPMI_OK;
+        buffer->length = msg->rx_len;
+        memcpy(buffer->data, msg->rx_data, msg->rx_len);
+}
+
+static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi)
+{
+        struct acpi_ipmi_msg *tx_msg, *temp;
+        int count = HZ / 10;
+        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+
+        list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) {
+                /* wake up the sleep thread on the Tx msg */
+                complete(&tx_msg->tx_complete);
+        }
+
+        /* wait for about 100ms to flush the tx message list */
+        while (count--) {
+                if (list_empty(&ipmi->tx_msg_list))
+                        break;
+                schedule_timeout(1);
+        }
+        if (!list_empty(&ipmi->tx_msg_list))
+                dev_warn(&pnp_dev->dev, "tx msg list is not NULL\n");
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
+{
+        struct acpi_ipmi_device *ipmi_device = user_msg_data;
+        int msg_found = 0;
+        struct acpi_ipmi_msg *tx_msg;
+        struct pnp_dev *pnp_dev = ipmi_device->pnp_dev;
+
+        if (msg->user != ipmi_device->user_interface) {
+                dev_warn(&pnp_dev->dev, "Unexpected response is returned. "
+                        "returned user %p, expected user %p\n",
+                        msg->user, ipmi_device->user_interface);
+                ipmi_free_recv_msg(msg);
+                return;
+        }
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_for_each_entry(tx_msg, &ipmi_device->tx_msg_list, head) {
+                if (msg->msgid == tx_msg->tx_msgid) {
+                        msg_found = 1;
+                        break;
+                }
+        }
+
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        if (!msg_found) {
+                dev_warn(&pnp_dev->dev, "Unexpected response (msg id %ld) is "
+                        "returned.\n", msg->msgid);
+                ipmi_free_recv_msg(msg);
+                return;
+        }
+
+        if (msg->msg.data_len) {
+                /* copy the response data to Rx_data buffer */
+                memcpy(tx_msg->rx_data, msg->msg_data, msg->msg.data_len);
+                tx_msg->rx_len = msg->msg.data_len;
+                tx_msg->msg_done = 1;
+        }
+        complete(&tx_msg->tx_complete);
+        ipmi_free_recv_msg(msg);
+};
+
+static void ipmi_register_bmc(int iface, struct device *dev)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+        struct pnp_dev *pnp_dev;
+        ipmi_user_t             user;
+        int err;
+        struct ipmi_smi_info smi_data;
+        acpi_handle handle;
+
+        err = ipmi_get_smi_info(iface, &smi_data);
+
+        if (err)
+                return;
+
+        if (smi_data.addr_src != SI_ACPI) {
+                put_device(smi_data.dev);
+                return;
+        }
+
+        handle = smi_data.addr_info.acpi_info.acpi_handle;
+
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry(temp, &driver_data.ipmi_devices, head) {
+                /*
+                 * if the corresponding ACPI handle is already added
+                 * to the device list, don't add it again.
+                 */
+                if (temp->handle == handle)
+                        goto out;
+        }
+
+        ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL);
+
+        if (!ipmi_device)
+                goto out;
+
+        pnp_dev = to_pnp_dev(smi_data.dev);
+        ipmi_device->handle = handle;
+        ipmi_device->pnp_dev = pnp_dev;
+
+        err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs,
+                                        ipmi_device, &user);
+        if (err) {
+                dev_warn(&pnp_dev->dev, "Can't create IPMI user interface\n");
+                kfree(ipmi_device);
+                goto out;
+        }
+        acpi_add_ipmi_device(ipmi_device);
+        ipmi_device->user_interface = user;
+        ipmi_device->ipmi_ifnum = iface;
+        mutex_unlock(&driver_data.ipmi_lock);
+        memcpy(&ipmi_device->smi_data, &smi_data, sizeof(struct ipmi_smi_info));
+        return;
+
+out:
+        mutex_unlock(&driver_data.ipmi_lock);
+        put_device(smi_data.dev);
+        return;
+}
+
+static void ipmi_bmc_gone(int iface)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry_safe(ipmi_device, temp,
+                                &driver_data.ipmi_devices, head) {
+                if (ipmi_device->ipmi_ifnum != iface)
+                        continue;
+
+                acpi_remove_ipmi_device(ipmi_device);
+                put_device(ipmi_device->smi_data.dev);
+                kfree(ipmi_device);
+                break;
+        }
+        mutex_unlock(&driver_data.ipmi_lock);
+}
+/* --------------------------------------------------------------------------
+ *                      Address Space Management
+ * -------------------------------------------------------------------------- */
+/*
+ * This is the IPMI opregion space handler.
+ * @function: indicates the read/write. In fact as the IPMI message is driven
+ * by command, only write is meaningful.
+ * @address: This contains the netfn/command of IPMI request message.
+ * @bits   : not used.
+ * @value  : it is an in/out parameter. It points to the IPMI message buffer.
+ *           Before the IPMI message is sent, it represents the actual request
+ *           IPMI message. After the IPMI message is finished, it represents
+ *           the response IPMI message returned by IPMI command.
+ * @handler_context: IPMI device context.
+ */
+
+static acpi_status
+acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
+                      u32 bits, acpi_integer *value,
+                      void *handler_context, void *region_context)
+{
+        struct acpi_ipmi_msg *tx_msg;
+        struct acpi_ipmi_device *ipmi_device = handler_context;
+        int err, rem_time;
+        acpi_status status;
+        /*
+         * IPMI opregion message.
+         * IPMI message is firstly written to the BMC and system software
+         * can get the respsonse. So it is unmeaningful for the read access
+         * of IPMI opregion.
+         */
+        if ((function & ACPI_IO_MASK) == ACPI_READ)
+                return AE_TYPE;
+
+        if (!ipmi_device->user_interface)
+                return AE_NOT_EXIST;
+
+        tx_msg = acpi_alloc_ipmi_msg(ipmi_device);
+        if (!tx_msg)
+                return AE_NO_MEMORY;
+
+        acpi_format_ipmi_msg(tx_msg, address, value);
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list);
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        err = ipmi_request_settime(ipmi_device->user_interface,
+                                        &tx_msg->addr,
+                                        tx_msg->tx_msgid,
+                                        &tx_msg->tx_message,
+                                        NULL, 0, 0, 0);
+        if (err) {
+                status = AE_ERROR;
+                goto end_label;
+        }
+        rem_time = wait_for_completion_timeout(&tx_msg->tx_complete,
+                                        IPMI_TIMEOUT);
+        acpi_format_ipmi_response(tx_msg, value, rem_time);
+        status = AE_OK;
+
+end_label:
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_del(&tx_msg->head);
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        kfree(tx_msg);
+        return status;
+}
+
+static void ipmi_remove_space_handler(struct acpi_ipmi_device *ipmi)
+{
+        if (!test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
+                return;
+
+        acpi_remove_address_space_handler(ipmi->handle,
+                                ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler);
+
+        clear_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
+}
+
+static int ipmi_install_space_handler(struct acpi_ipmi_device *ipmi)
+{
+        acpi_status status;
+
+        if (test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
+                return 0;
+
+        status = acpi_install_address_space_handler(ipmi->handle,
+                                                    ACPI_ADR_SPACE_IPMI,
+                                                    &acpi_ipmi_space_handler,
+                                                    NULL, ipmi);
+        if (ACPI_FAILURE(status)) {
+                struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+                dev_warn(&pnp_dev->dev, "Can't register IPMI opregion space "
+                        "handle\n");
+                return -EINVAL;
+        }
+        set_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
+        return 0;
+}
+
+static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device)
+{
+
+        INIT_LIST_HEAD(&ipmi_device->head);
+
+        mutex_init(&ipmi_device->tx_msg_lock);
+        INIT_LIST_HEAD(&ipmi_device->tx_msg_list);
+        ipmi_install_space_handler(ipmi_device);
+
+        list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices);
+}
+
+static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device)
+{
+        /*
+         * If the IPMI user interface is created, it should be
+         * destroyed.
+         */
+        if (ipmi_device->user_interface) {
+                ipmi_destroy_user(ipmi_device->user_interface);
+                ipmi_device->user_interface = NULL;
+        }
+        /* flush the Tx_msg list */
+        if (!list_empty(&ipmi_device->tx_msg_list))
+                ipmi_flush_tx_msg(ipmi_device);
+
+        list_del(&ipmi_device->head);
+        ipmi_remove_space_handler(ipmi_device);
+}
+
+static int __init acpi_ipmi_init(void)
+{
+        int result = 0;
+
+        if (acpi_disabled)
+                return result;
+
+        mutex_init(&driver_data.ipmi_lock);
+
+        result = ipmi_smi_watcher_register(&driver_data.bmc_events);
+
+        return result;
+}
+
+static void __exit acpi_ipmi_exit(void)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+
+        if (acpi_disabled)
+                return;
+
+        ipmi_smi_watcher_unregister(&driver_data.bmc_events);
+
+        /*
+         * When one smi_watcher is unregistered, it is only deleted
+         * from the smi_watcher list. But the smi_gone callback function
+         * is not called. So explicitly uninstall the ACPI IPMI oregion
+         * handler and free it.
+         */
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry_safe(ipmi_device, temp,
+                                &driver_data.ipmi_devices, head) {
+                acpi_remove_ipmi_device(ipmi_device);
+                put_device(ipmi_device->smi_data.dev);
+                kfree(ipmi_device);
+        }
+        mutex_unlock(&driver_data.ipmi_lock);
+}
+
+module_init(acpi_ipmi_init);
+module_exit(acpi_ipmi_exit);
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 6afceb3d403..a43fa1a57d5 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -298,7 +298,7 @@ static ssize_t acpi_pad_rrtime_store(struct device *dev,
 static ssize_t acpi_pad_rrtime_show(struct device *dev,
         struct device_attribute *attr, char *buf)
 {
-        return scnprintf(buf, PAGE_SIZE, "%d", round_robin_time);
+        return scnprintf(buf, PAGE_SIZE, "%d\n", round_robin_time);
 }
 static DEVICE_ATTR(rrtime, S_IRUGO|S_IWUSR,
         acpi_pad_rrtime_show,
@@ -321,7 +321,7 @@ static ssize_t acpi_pad_idlepct_store(struct device *dev,
 static ssize_t acpi_pad_idlepct_show(struct device *dev,
         struct device_attribute *attr, char *buf)
 {
-        return scnprintf(buf, PAGE_SIZE, "%d", idle_pct);
+        return scnprintf(buf, PAGE_SIZE, "%d\n", idle_pct);
 }
 static DEVICE_ATTR(idlepct, S_IRUGO|S_IWUSR,
         acpi_pad_idlepct_show,
@@ -342,8 +342,11 @@ static ssize_t acpi_pad_idlecpus_store(struct device *dev,
 static ssize_t acpi_pad_idlecpus_show(struct device *dev,
         struct device_attribute *attr, char *buf)
 {
-        return cpumask_scnprintf(buf, PAGE_SIZE,
-                to_cpumask(pad_busy_cpus_bits));
+        int n = 0;
+        n = cpumask_scnprintf(buf, PAGE_SIZE-2, to_cpumask(pad_busy_cpus_bits));
+        buf[n++] = '\n';
+        buf[n] = '\0';
+        return n;
 }
 static DEVICE_ATTR(idlecpus, S_IRUGO|S_IWUSR,
         acpi_pad_idlecpus_show,
@@ -453,7 +456,7 @@ static void acpi_pad_notify(acpi_handle handle, u32 event,
                         dev_name(&device->dev), event, 0);
                 break;
         default:
-                printk(KERN_WARNING"Unsupported event [0x%x]\n", event);
+                printk(KERN_WARNING "Unsupported event [0x%x]\n", event);
                 break;
         }
 }
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index a7e1d1aa410..a1224712fd0 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -10,11 +10,11 @@ obj-y	+= acpi.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
+         dsinit.o dsargs.o dscontrol.o dswload2.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
+         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.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\
@@ -45,4 +45,4 @@ 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
+                utosi.o utxferror.o utdecode.o
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 3e50c74ed4a..e0ba17f0a7c 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acconfig.h b/drivers/acpi/acpica/acconfig.h
index b17d8de9f6f..ab87396c2c0 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 72e9d5eb083..eb0b1f8dee6 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 894a0ff2a94..2d1b7ffa377 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 NAMEOF_ARG_NTE      "__A0"
 
 /*
- * dsopcode - support for late evaluation
+ * dsargs - execution of dynamic arguments for static objects
  */
 acpi_status
 acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc);
@@ -62,6 +62,20 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc);
 
 acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc);
 
+/*
+ * dscontrol - support for execution control opcodes
+ */
+acpi_status
+acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
+                              union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state,
+                            union acpi_parse_object *op);
+
+/*
+ * dsopcode - support for late operand evaluation
+ */
 acpi_status
 acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
                                    union acpi_parse_object *op);
@@ -86,17 +100,6 @@ acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
 acpi_status acpi_ds_initialize_region(acpi_handle obj_handle);
 
 /*
- * dsctrl - Parser/Interpreter interface, control stack routines
- */
-acpi_status
-acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
-                              union acpi_parse_object *op);
-
-acpi_status
-acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state,
-                            union acpi_parse_object *op);
-
-/*
  * dsexec - Parser/Interpreter interface, method execution callbacks
  */
 acpi_status
@@ -136,23 +139,26 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
                            struct acpi_walk_state *walk_state);
 
 /*
- * dsload - Parser/Interpreter interface, namespace load callbacks
+ * dsload - Parser/Interpreter interface, pass 1 namespace load callbacks
  */
 acpi_status
+acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number);
+
+acpi_status
 acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
                        union acpi_parse_object **out_op);
 
 acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state);
 
+/*
+ * dsload - Parser/Interpreter interface, pass 2 namespace load callbacks
+ */
 acpi_status
 acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                        union acpi_parse_object **out_op);
 
 acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state);
 
-acpi_status
-acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number);
-
 /*
  * dsmthdat - method data (locals/args)
  */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index a6f99cc37a1..41d247daf46 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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,6 @@ acpi_status acpi_ev_initialize_events(void);
 
 acpi_status acpi_ev_install_xrupt_handlers(void);
 
-acpi_status acpi_ev_install_fadt_gpes(void);
-
 u32 acpi_ev_fixed_event_detect(void);
 
 /*
@@ -82,9 +80,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_raw_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_raw_disable_gpe(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);
@@ -93,6 +91,8 @@ struct acpi_gpe_event_info *acpi_ev_low_get_gpe_info(u32 gpe_number,
                                                      struct acpi_gpe_block_info
                                                      *gpe_block);
 
+acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
 /*
  * evgpeblk - Upper-level GPE block support
  */
@@ -107,12 +107,13 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 acpi_status
 acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                              struct acpi_gpe_block_info *gpe_block,
-                             void *ignored);
+                             void *context);
 
 acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);
 
 u32
-acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,
+acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
+                     struct acpi_gpe_event_info *gpe_event_info,
                      u32 gpe_number);
 
 /*
@@ -126,10 +127,6 @@ acpi_status
 acpi_ev_match_gpe_method(acpi_handle obj_handle,
                          u32 level, void *context, void **return_value);
 
-acpi_status
-acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
-                          u32 level, void *context, void **return_value);
-
 /*
  * evgpeutil - GPE utilities
  */
@@ -138,6 +135,10 @@ acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
 
 u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
 
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context);
+
 struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);
 
 acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index ad88fcae4eb..d69750b83b3 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,6 +146,9 @@ u8 acpi_gbl_system_awake_and_running;
 
 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;
@@ -225,8 +228,10 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_present;
  */
 ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock;      /* For GPE data structs and registers */
 ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
+ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */
 #define acpi_gbl_gpe_lock       &_acpi_gbl_gpe_lock
 #define acpi_gbl_hardware_lock  &_acpi_gbl_hardware_lock
+#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock
 
 /*****************************************************************************
  *
@@ -268,6 +273,10 @@ ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS];
 ACPI_EXTERN u8 acpi_gbl_last_owner_id_index;
 ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset;
 
+/* Initialization sequencing */
+
+ACPI_EXTERN u8 acpi_gbl_reg_methods_executed;
+
 /* Misc */
 
 ACPI_EXTERN u32 acpi_gbl_original_mode;
@@ -370,7 +379,9 @@ 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];
-ACPI_EXTERN u8 acpi_all_gpes_initialized;
+ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
+ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
+ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
 
 /*****************************************************************************
  *
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 167470ad2d2..e7213beaafc 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,7 @@ 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, u8 action);
+acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action);
 
 acpi_status
 acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 049e203bd62..3731e1c34b8 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 2ceb0c05b2d..c7f743ca395 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,25 +89,6 @@ union acpi_parse_object;
 #define ACPI_MAX_MUTEX                  7
 #define ACPI_NUM_MUTEX                  ACPI_MAX_MUTEX+1
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
-#ifdef DEFINE_ACPI_GLOBALS
-
-/* Debug names for the mutexes above */
-
-static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = {
-        "ACPI_MTX_Interpreter",
-        "ACPI_MTX_Namespace",
-        "ACPI_MTX_Tables",
-        "ACPI_MTX_Events",
-        "ACPI_MTX_Caches",
-        "ACPI_MTX_Memory",
-        "ACPI_MTX_CommandComplete",
-        "ACPI_MTX_CommandReady"
-};
-
-#endif
-#endif
-
 /* Lock structure for reader/writer interfaces */
 
 struct acpi_rw_lock {
@@ -408,17 +389,23 @@ struct acpi_predefined_data {
 
 /* Dispatch info for each GPE -- either a method or handler, cannot be both */
 
-struct acpi_handler_info {
-        acpi_event_handler address;     /* Address of handler, if any */
+struct acpi_gpe_handler_info {
+        acpi_gpe_handler address;       /* Address of handler, if any */
         void *context;          /* Context to be passed to handler */
         struct acpi_namespace_node *method_node;        /* Method node for this GPE level (saved) */
-        u8 orig_flags;          /* Original misc info about this GPE */
-        u8 orig_enabled;        /* Set if the GPE was originally enabled */
+        u8 original_flags;      /* Original (pre-handler) GPE info */
+        u8 originally_enabled;  /* True if GPE was originally enabled */
+};
+
+struct acpi_gpe_notify_object {
+        struct acpi_namespace_node *node;
+        struct acpi_gpe_notify_object *next;
 };
 
 union acpi_gpe_dispatch_info {
         struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
+        struct acpi_gpe_notify_object device;   /* List of _PRW devices for implicit notify */
 };
 
 /*
@@ -458,7 +445,7 @@ struct acpi_gpe_block_info {
         u32 register_count;     /* Number of register pairs in block */
         u16 gpe_count;          /* Number of individual GPEs in block */
         u8 block_base_number;   /* Base GPE number for this block */
-        u8 initialized;         /* If set, the GPE block has been initialized */
+        u8 initialized;         /* TRUE if this block is initialized */
 };
 
 /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 8d5c9e0a495..b7491ee1fba 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index d44d3bc5b84..79a598c67fe 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acobject.h b/drivers/acpi/acpica/acobject.h
index bdbfaf22bd1..1055769f2f0 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,12 +93,10 @@
 
 #define AOPOBJ_AML_CONSTANT         0x01        /* Integer is an AML constant */
 #define AOPOBJ_STATIC_POINTER       0x02        /* Data is part of an ACPI table, don't delete */
-#define AOPOBJ_DATA_VALID           0x04        /* Object is intialized and data is valid */
+#define AOPOBJ_DATA_VALID           0x04        /* Object is initialized and data is valid */
 #define AOPOBJ_OBJECT_INITIALIZED   0x08        /* Region is initialized, _REG was run */
 #define AOPOBJ_SETUP_COMPLETE       0x10        /* Region setup is complete */
 #define AOPOBJ_INVALID              0x20        /* Host OS won't allow a Region address */
-#define AOPOBJ_MODULE_LEVEL         0x40        /* Method is actually module-level code */
-#define AOPOBJ_MODIFIED_NAMESPACE   0x80        /* Method modified the namespace */
 
 /******************************************************************************
  *
@@ -175,7 +173,7 @@ struct acpi_object_region {
 };
 
 struct acpi_object_method {
-        ACPI_OBJECT_COMMON_HEADER u8 method_flags;
+        ACPI_OBJECT_COMMON_HEADER u8 info_flags;
         u8 param_count;
         u8 sync_level;
         union acpi_operand_object *mutex;
@@ -183,13 +181,21 @@ struct acpi_object_method {
         union {
                 ACPI_INTERNAL_METHOD implementation;
                 union acpi_operand_object *handler;
-        } extra;
+        } dispatch;
 
         u32 aml_length;
         u8 thread_count;
         acpi_owner_id owner_id;
 };
 
+/* Flags for info_flags field above */
+
+#define ACPI_METHOD_MODULE_LEVEL        0x01    /* Method is actually module-level code */
+#define ACPI_METHOD_INTERNAL_ONLY       0x02    /* Method is implemented internally (_OSI) */
+#define ACPI_METHOD_SERIALIZED          0x04    /* Method is serialized */
+#define ACPI_METHOD_SERIALIZED_PENDING  0x08    /* Method is to be marked serialized */
+#define ACPI_METHOD_MODIFIED_NAMESPACE  0x10    /* Method modified the namespace */
+
 /******************************************************************************
  *
  * Objects that can be notified.  All share a common notify_info area.
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index 8c15ff43f42..bb2ccfad737 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acparser.h b/drivers/acpi/acpica/acparser.h
index d0bb0fd3e57..5ea1e06afa2 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 10998d369ad..94e73c97cf8 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 528bcbaf4ce..f08b55b7f3a 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 6e5dd97949f..1623b245dde 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/actables.h b/drivers/acpi/acpica/actables.h
index 62a576e3436..967f08124eb 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/acutils.h b/drivers/acpi/acpica/acutils.h
index 72e4183c193..99c140d8e34 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 1f484ba228f..f4f0998d396 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -480,16 +480,10 @@ typedef enum {
         AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
 } AML_ACCESS_ATTRIBUTE;
 
-/* Bit fields in method_flags byte */
+/* Bit fields in the AML method_flags byte */
 
 #define AML_METHOD_ARG_COUNT        0x07
 #define AML_METHOD_SERIALIZED       0x08
 #define AML_METHOD_SYNC_LEVEL       0xF0
 
-/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */
-
-#define AML_METHOD_INTERNAL_ONLY    0x01
-#define AML_METHOD_RESERVED1        0x02
-#define AML_METHOD_RESERVED2        0x04
-
 #endif                          /* __AMLCODE_H__ */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 0e5798fcbb1..59122cde247 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dsargs.c b/drivers/acpi/acpica/dsargs.c
new file mode 100644
index 00000000000..8c7b99728aa
--- /dev/null
+++ b/drivers/acpi/acpica/dsargs.c
@@ -0,0 +1,391 @@
+/******************************************************************************
+ *
+ * Module Name: dsargs - Support for execution of dynamic arguments for static
+ *                       objects (regions, fields, buffer fields, etc.)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, 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 "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acnamesp.h"
+
+#define _COMPONENT          ACPI_DISPATCHER
+ACPI_MODULE_NAME("dsargs")
+
+/* Local prototypes */
+static acpi_status
+acpi_ds_execute_arguments(struct acpi_namespace_node *node,
+                          struct acpi_namespace_node *scope_node,
+                          u32 aml_length, u8 *aml_start);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_execute_arguments
+ *
+ * PARAMETERS:  Node                - Object NS node
+ *              scope_node          - Parent NS node
+ *              aml_length          - Length of executable AML
+ *              aml_start           - Pointer to the AML
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Late (deferred) execution of region or field arguments
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ds_execute_arguments(struct acpi_namespace_node *node,
+                          struct acpi_namespace_node *scope_node,
+                          u32 aml_length, u8 *aml_start)
+{
+        acpi_status status;
+        union acpi_parse_object *op;
+        struct acpi_walk_state *walk_state;
+
+        ACPI_FUNCTION_TRACE(ds_execute_arguments);
+
+        /* Allocate a new parser op to be the root of the parsed tree */
+
+        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
+        if (!op) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        /* Save the Node for use in acpi_ps_parse_aml */
+
+        op->common.node = scope_node;
+
+        /* Create and initialize a new parser state */
+
+        walk_state = acpi_ds_create_walk_state(0, NULL, NULL, NULL);
+        if (!walk_state) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
+
+        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
+                                       aml_length, NULL, ACPI_IMODE_LOAD_PASS1);
+        if (ACPI_FAILURE(status)) {
+                acpi_ds_delete_walk_state(walk_state);
+                goto cleanup;
+        }
+
+        /* Mark this parse as a deferred opcode */
+
+        walk_state->parse_flags = ACPI_PARSE_DEFERRED_OP;
+        walk_state->deferred_node = node;
+
+        /* Pass1: Parse the entire declaration */
+
+        status = acpi_ps_parse_aml(walk_state);
+        if (ACPI_FAILURE(status)) {
+                goto cleanup;
+        }
+
+        /* Get and init the Op created above */
+
+        op->common.node = node;
+        acpi_ps_delete_parse_tree(op);
+
+        /* Evaluate the deferred arguments */
+
+        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
+        if (!op) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        op->common.node = scope_node;
+
+        /* Create and initialize a new parser state */
+
+        walk_state = acpi_ds_create_walk_state(0, NULL, NULL, NULL);
+        if (!walk_state) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
+
+        /* Execute the opcode and arguments */
+
+        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
+                                       aml_length, NULL, ACPI_IMODE_EXECUTE);
+        if (ACPI_FAILURE(status)) {
+                acpi_ds_delete_walk_state(walk_state);
+                goto cleanup;
+        }
+
+        /* Mark this execution as a deferred opcode */
+
+        walk_state->deferred_node = node;
+        status = acpi_ps_parse_aml(walk_state);
+
+      cleanup:
+        acpi_ps_delete_parse_tree(op);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_get_buffer_field_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid buffer_field object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get buffer_field Buffer and Index. This implements the late
+ *              evaluation of these field attributes.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)
+{
+        union acpi_operand_object *extra_desc;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_field_arguments, obj_desc);
+
+        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Get the AML pointer (method object) and buffer_field node */
+
+        extra_desc = acpi_ns_get_secondary_object(obj_desc);
+        node = obj_desc->buffer_field.node;
+
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_BUFFER_FIELD,
+                                                      node, NULL));
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BufferField Arg Init\n",
+                          acpi_ut_get_node_name(node)));
+
+        /* Execute the AML code for the term_arg arguments */
+
+        status = acpi_ds_execute_arguments(node, node->parent,
+                                           extra_desc->extra.aml_length,
+                                           extra_desc->extra.aml_start);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_get_bank_field_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid bank_field object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get bank_field bank_value. This implements the late
+ *              evaluation of these field attributes.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)
+{
+        union acpi_operand_object *extra_desc;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_bank_field_arguments, obj_desc);
+
+        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Get the AML pointer (method object) and bank_field node */
+
+        extra_desc = acpi_ns_get_secondary_object(obj_desc);
+        node = obj_desc->bank_field.node;
+
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
+                        (ACPI_TYPE_LOCAL_BANK_FIELD, node, NULL));
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BankField Arg Init\n",
+                          acpi_ut_get_node_name(node)));
+
+        /* Execute the AML code for the term_arg arguments */
+
+        status = acpi_ds_execute_arguments(node, node->parent,
+                                           extra_desc->extra.aml_length,
+                                           extra_desc->extra.aml_start);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_get_buffer_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid Buffer object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get Buffer length and initializer byte list. This implements
+ *              the late evaluation of these attributes.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
+{
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_arguments, obj_desc);
+
+        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Get the Buffer node */
+
+        node = obj_desc->buffer.node;
+        if (!node) {
+                ACPI_ERROR((AE_INFO,
+                            "No pointer back to namespace node in buffer object %p",
+                            obj_desc));
+                return_ACPI_STATUS(AE_AML_INTERNAL);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Buffer Arg Init\n"));
+
+        /* Execute the AML code for the term_arg arguments */
+
+        status = acpi_ds_execute_arguments(node, node,
+                                           obj_desc->buffer.aml_length,
+                                           obj_desc->buffer.aml_start);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_get_package_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid Package object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get Package length and initializer byte list. This implements
+ *              the late evaluation of these attributes.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
+{
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_package_arguments, obj_desc);
+
+        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Get the Package node */
+
+        node = obj_desc->package.node;
+        if (!node) {
+                ACPI_ERROR((AE_INFO,
+                            "No pointer back to namespace node in package %p",
+                            obj_desc));
+                return_ACPI_STATUS(AE_AML_INTERNAL);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Package Arg Init\n"));
+
+        /* Execute the AML code for the term_arg arguments */
+
+        status = acpi_ds_execute_arguments(node, node,
+                                           obj_desc->package.aml_length,
+                                           obj_desc->package.aml_start);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_get_region_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid region object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get region address and length. This implements the late
+ *              evaluation of these region attributes.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
+{
+        struct acpi_namespace_node *node;
+        acpi_status status;
+        union acpi_operand_object *extra_desc;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_region_arguments, obj_desc);
+
+        if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        extra_desc = acpi_ns_get_secondary_object(obj_desc);
+        if (!extra_desc) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Get the Region node */
+
+        node = obj_desc->region.node;
+
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
+                        (ACPI_TYPE_REGION, node, NULL));
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] OpRegion Arg Init at AML %p\n",
+                          acpi_ut_get_node_name(node),
+                          extra_desc->extra.aml_start));
+
+        /* Execute the argument AML */
+
+        status = acpi_ds_execute_arguments(node, node->parent,
+                                           extra_desc->extra.aml_length,
+                                           extra_desc->extra.aml_start);
+        return_ACPI_STATUS(status);
+}
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
new file mode 100644
index 00000000000..26c49fff58d
--- /dev/null
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -0,0 +1,410 @@
+/******************************************************************************
+ *
+ * Module Name: dscontrol - Support for execution control opcodes -
+ *                          if/else/while/return
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, 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 "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+
+#define _COMPONENT          ACPI_DISPATCHER
+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
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Handles all control ops encountered during control method
+ *              execution.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
+                              union acpi_parse_object *op)
+{
+        acpi_status status = AE_OK;
+        union acpi_generic_state *control_state;
+
+        ACPI_FUNCTION_NAME(ds_exec_begin_control_op);
+
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n",
+                          op, op->common.aml_opcode, walk_state));
+
+        switch (op->common.aml_opcode) {
+        case AML_WHILE_OP:
+
+                /*
+                 * If this is an additional iteration of a while loop, continue.
+                 * There is no need to allocate a new control state.
+                 */
+                if (walk_state->control_state) {
+                        if (walk_state->control_state->control.
+                            aml_predicate_start ==
+                            (walk_state->parser_state.aml - 1)) {
+
+                                /* Reset the state to start-of-loop */
+
+                                walk_state->control_state->common.state =
+                                    ACPI_CONTROL_CONDITIONAL_EXECUTING;
+                                break;
+                        }
+                }
+
+                /*lint -fallthrough */
+
+        case AML_IF_OP:
+
+                /*
+                 * IF/WHILE: Create a new control state to manage these
+                 * constructs. We need to manage these as a stack, in order
+                 * to handle nesting.
+                 */
+                control_state = acpi_ut_create_control_state();
+                if (!control_state) {
+                        status = AE_NO_MEMORY;
+                        break;
+                }
+                /*
+                 * Save a pointer to the predicate for multiple executions
+                 * of a loop
+                 */
+                control_state->control.aml_predicate_start =
+                    walk_state->parser_state.aml - 1;
+                control_state->control.package_end =
+                    walk_state->parser_state.pkg_end;
+                control_state->control.opcode = op->common.aml_opcode;
+
+                /* Push the control state on this walk's control stack */
+
+                acpi_ut_push_generic_state(&walk_state->control_state,
+                                           control_state);
+                break;
+
+        case AML_ELSE_OP:
+
+                /* Predicate is in the state object */
+                /* If predicate is true, the IF was executed, ignore ELSE part */
+
+                if (walk_state->last_predicate) {
+                        status = AE_CTRL_TRUE;
+                }
+
+                break;
+
+        case AML_RETURN_OP:
+
+                break;
+
+        default:
+                break;
+        }
+
+        return (status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_exec_end_control_op
+ *
+ * PARAMETERS:  walk_list       - The list that owns the walk stack
+ *              Op              - The control Op
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Handles all control ops encountered during control method
+ *              execution.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
+                            union acpi_parse_object * op)
+{
+        acpi_status status = AE_OK;
+        union acpi_generic_state *control_state;
+
+        ACPI_FUNCTION_NAME(ds_exec_end_control_op);
+
+        switch (op->common.aml_opcode) {
+        case AML_IF_OP:
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[IF_OP] Op=%p\n", op));
+
+                /*
+                 * Save the result of the predicate in case there is an
+                 * ELSE to come
+                 */
+                walk_state->last_predicate =
+                    (u8)walk_state->control_state->common.value;
+
+                /*
+                 * Pop the control state that was created at the start
+                 * of the IF and free it
+                 */
+                control_state =
+                    acpi_ut_pop_generic_state(&walk_state->control_state);
+                acpi_ut_delete_generic_state(control_state);
+                break;
+
+        case AML_ELSE_OP:
+
+                break;
+
+        case AML_WHILE_OP:
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[WHILE_OP] Op=%p\n", op));
+
+                control_state = walk_state->control_state;
+                if (control_state->common.value) {
+
+                        /* Predicate was true, the body of the loop was just executed */
+
+                        /*
+                         * This loop counter mechanism allows the interpreter to escape
+                         * possibly infinite loops. This can occur in poorly written AML
+                         * when the hardware does not respond within a while loop and the
+                         * loop does not implement a timeout.
+                         */
+                        control_state->control.loop_count++;
+                        if (control_state->control.loop_count >
+                            ACPI_MAX_LOOP_ITERATIONS) {
+                                status = AE_AML_INFINITE_LOOP;
+                                break;
+                        }
+
+                        /*
+                         * Go back and evaluate the predicate and maybe execute the loop
+                         * another time
+                         */
+                        status = AE_CTRL_PENDING;
+                        walk_state->aml_last_while =
+                            control_state->control.aml_predicate_start;
+                        break;
+                }
+
+                /* Predicate was false, terminate this while loop */
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "[WHILE_OP] termination! Op=%p\n", op));
+
+                /* Pop this control state and free it */
+
+                control_state =
+                    acpi_ut_pop_generic_state(&walk_state->control_state);
+                acpi_ut_delete_generic_state(control_state);
+                break;
+
+        case AML_RETURN_OP:
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "[RETURN_OP] Op=%p Arg=%p\n", op,
+                                  op->common.value.arg));
+
+                /*
+                 * One optional operand -- the return value
+                 * It can be either an immediate operand or a result that
+                 * has been bubbled up the tree
+                 */
+                if (op->common.value.arg) {
+
+                        /* Since we have a real Return(), delete any implicit return */
+
+                        acpi_ds_clear_implicit_return(walk_state);
+
+                        /* Return statement has an immediate operand */
+
+                        status =
+                            acpi_ds_create_operands(walk_state,
+                                                    op->common.value.arg);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        /*
+                         * If value being returned is a Reference (such as
+                         * an arg or local), resolve it now because it may
+                         * cease to exist at the end of the method.
+                         */
+                        status =
+                            acpi_ex_resolve_to_value(&walk_state->operands[0],
+                                                     walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        /*
+                         * Get the return value and save as the last result
+                         * 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];
+                } else if (walk_state->result_count) {
+
+                        /* Since we have a real Return(), delete any implicit return */
+
+                        acpi_ds_clear_implicit_return(walk_state);
+
+                        /*
+                         * The return value has come from a previous calculation.
+                         *
+                         * If value being returned is a Reference (such as
+                         * an arg or local), resolve it now because it may
+                         * cease to exist at the end of the method.
+                         *
+                         * Allow references created by the Index operator to return
+                         * unchanged.
+                         */
+                        if ((ACPI_GET_DESCRIPTOR_TYPE
+                             (walk_state->results->results.obj_desc[0]) ==
+                             ACPI_DESC_TYPE_OPERAND)
+                            && ((walk_state->results->results.obj_desc[0])->
+                                common.type == ACPI_TYPE_LOCAL_REFERENCE)
+                            && ((walk_state->results->results.obj_desc[0])->
+                                reference.class != ACPI_REFCLASS_INDEX)) {
+                                status =
+                                    acpi_ex_resolve_to_value(&walk_state->
+                                                             results->results.
+                                                             obj_desc[0],
+                                                             walk_state);
+                                if (ACPI_FAILURE(status)) {
+                                        return (status);
+                                }
+                        }
+
+                        walk_state->return_desc =
+                            walk_state->results->results.obj_desc[0];
+                } else {
+                        /* No return operand */
+
+                        if (walk_state->num_operands) {
+                                acpi_ut_remove_reference(walk_state->
+                                                         operands[0]);
+                        }
+
+                        walk_state->operands[0] = NULL;
+                        walk_state->num_operands = 0;
+                        walk_state->return_desc = NULL;
+                }
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "Completed RETURN_OP State=%p, RetVal=%p\n",
+                                  walk_state, walk_state->return_desc));
+
+                /* End the control method execution right now */
+
+                status = AE_CTRL_TERMINATE;
+                break;
+
+        case AML_NOOP_OP:
+
+                /* Just do nothing! */
+                break;
+
+        case AML_BREAK_POINT_OP:
+
+                /*
+                 * Set the single-step flag. This will cause the debugger (if present)
+                 * to break to the console within the AML debugger at the start of the
+                 * next AML instruction.
+                 */
+                ACPI_DEBUGGER_EXEC(acpi_gbl_cm_single_step = TRUE);
+                ACPI_DEBUGGER_EXEC(acpi_os_printf
+                                   ("**break** Executed AML BreakPoint opcode\n"));
+
+                /* Call to the OSL in case OS wants a piece of the action */
+
+                status = acpi_os_signal(ACPI_SIGNAL_BREAKPOINT,
+                                        "Executed AML Breakpoint opcode");
+                break;
+
+        case AML_BREAK_OP:
+        case AML_CONTINUE_OP:   /* ACPI 2.0 */
+
+                /* Pop and delete control states until we find a while */
+
+                while (walk_state->control_state &&
+                       (walk_state->control_state->control.opcode !=
+                        AML_WHILE_OP)) {
+                        control_state =
+                            acpi_ut_pop_generic_state(&walk_state->
+                                                      control_state);
+                        acpi_ut_delete_generic_state(control_state);
+                }
+
+                /* No while found? */
+
+                if (!walk_state->control_state) {
+                        return (AE_AML_NO_WHILE);
+                }
+
+                /* Was: walk_state->aml_last_while = walk_state->control_state->Control.aml_predicate_start; */
+
+                walk_state->aml_last_while =
+                    walk_state->control_state->control.package_end;
+
+                /* Return status depending on opcode */
+
+                if (op->common.aml_opcode == AML_BREAK_OP) {
+                        status = AE_CTRL_BREAK;
+                } else {
+                        status = AE_CTRL_CONTINUE;
+                }
+                break;
+
+        default:
+
+                ACPI_ERROR((AE_INFO, "Unknown control opcode=0x%X Op=%p",
+                            op->common.aml_opcode, op));
+
+                status = AE_AML_BAD_OPCODE;
+                break;
+        }
+
+        return (status);
+}
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 347bee1726f..34be60c0e44 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dsinit.c b/drivers/acpi/acpica/dsinit.c
index cc4a38c5755..a7718bf2b9a 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index d94dd8974b5..5d797751e20 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
@@ -201,7 +200,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
         /*
          * If this method is serialized, we need to acquire the method mutex.
          */
-        if (obj_desc->method.method_flags & AML_METHOD_SERIALIZED) {
+        if (obj_desc->method.info_flags & ACPI_METHOD_SERIALIZED) {
                 /*
                  * Create a mutex for the method if it is defined to be Serialized
                  * and a mutex has not already been created. We defer the mutex creation
@@ -413,8 +412,9 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 
         /* Invoke an internal method if necessary */
 
-        if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
-                status = obj_desc->method.extra.implementation(next_walk_state);
+        if (obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
+                status =
+                    obj_desc->method.dispatch.implementation(next_walk_state);
                 if (status == AE_OK) {
                         status = AE_CTRL_TERMINATE;
                 }
@@ -579,11 +579,14 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                 /*
                  * Delete any namespace objects created anywhere within the
-                 * namespace by the execution of this method. Unless this method
-                 * is a module-level executable code method, in which case we
-                 * want make the objects permanent.
+                 * namespace by the execution of this method. Unless:
+                 * 1) This method is a module-level executable code method, in which
+                 *    case we want make the objects permanent.
+                 * 2) There are other threads executing the method, in which case we
+                 *    will wait until the last thread has completed.
                  */
-                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                if (!(method_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL)
+                    && (method_desc->method.thread_count == 1)) {
 
                         /* Delete any direct children of (created by) this method */
 
@@ -593,12 +596,17 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                         /*
                          * Delete any objects that were created by this method
                          * elsewhere in the namespace (if any were created).
+                         * Use of the ACPI_METHOD_MODIFIED_NAMESPACE optimizes the
+                         * deletion such that we don't have to perform an entire
+                         * namespace walk for every control method execution.
                          */
                         if (method_desc->method.
-                            flags & AOPOBJ_MODIFIED_NAMESPACE) {
+                            info_flags & ACPI_METHOD_MODIFIED_NAMESPACE) {
                                 acpi_ns_delete_namespace_by_owner(method_desc->
                                                                   method.
                                                                   owner_id);
+                                method_desc->method.info_flags &=
+                                    ~ACPI_METHOD_MODIFIED_NAMESPACE;
                         }
                 }
         }
@@ -629,19 +637,43 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                  * Serialized if it appears that the method is incorrectly written and
                  * does not support multiple thread execution. The best example of this
                  * is if such a method creates namespace objects and blocks. A second
-                 * thread will fail with an AE_ALREADY_EXISTS exception
+                 * thread will fail with an AE_ALREADY_EXISTS exception.
                  *
                  * This code is here because we must wait until the last thread exits
-                 * before creating the synchronization semaphore.
+                 * before marking the method as serialized.
                  */
-                if ((method_desc->method.method_flags & AML_METHOD_SERIALIZED)
-                    && (!method_desc->method.mutex)) {
-                        (void)acpi_ds_create_method_mutex(method_desc);
+                if (method_desc->method.
+                    info_flags & ACPI_METHOD_SERIALIZED_PENDING) {
+                        if (walk_state) {
+                                ACPI_INFO((AE_INFO,
+                                           "Marking method %4.4s as Serialized because of AE_ALREADY_EXISTS error",
+                                           walk_state->method_node->name.
+                                           ascii));
+                        }
+
+                        /*
+                         * Method tried to create an object twice and was marked as
+                         * "pending serialized". The probable cause is that the method
+                         * cannot handle reentrancy.
+                         *
+                         * The method was created as not_serialized, but it tried to create
+                         * a named object and then blocked, causing the second thread
+                         * entrance to begin and then fail. Workaround this problem by
+                         * marking the method permanently as Serialized when the last
+                         * thread exits here.
+                         */
+                        method_desc->method.info_flags &=
+                            ~ACPI_METHOD_SERIALIZED_PENDING;
+                        method_desc->method.info_flags |=
+                            ACPI_METHOD_SERIALIZED;
+                        method_desc->method.sync_level = 0;
                 }
 
                 /* No more threads, we can free the owner_id */
 
-                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                if (!
+                    (method_desc->method.
+                     info_flags & ACPI_METHOD_MODULE_LEVEL)) {
                         acpi_ut_release_owner_id(&method_desc->method.owner_id);
                 }
         }
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 8095306fcd8..905ce29a92e 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 8e85f54a8e0..f42e17e5c25 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 7c0e7422717..c627a288e02 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -1,12 +1,11 @@
 /******************************************************************************
  *
- * Module Name: dsopcode - Dispatcher Op Region support and handling of
- *                         "control" opcodes
+ * Module Name: dsopcode - Dispatcher suport for regions and fields
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,11 +56,6 @@ ACPI_MODULE_NAME("dsopcode")
 
 /* Local prototypes */
 static acpi_status
-acpi_ds_execute_arguments(struct acpi_namespace_node *node,
-                          struct acpi_namespace_node *scope_node,
-                          u32 aml_length, u8 * aml_start);
-
-static acpi_status
 acpi_ds_init_buffer_field(u16 aml_opcode,
                           union acpi_operand_object *obj_desc,
                           union acpi_operand_object *buffer_desc,
@@ -71,361 +65,6 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ds_execute_arguments
- *
- * PARAMETERS:  Node                - Object NS node
- *              scope_node          - Parent NS node
- *              aml_length          - Length of executable AML
- *              aml_start           - Pointer to the AML
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Late (deferred) execution of region or field arguments
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ds_execute_arguments(struct acpi_namespace_node *node,
-                          struct acpi_namespace_node *scope_node,
-                          u32 aml_length, u8 * aml_start)
-{
-        acpi_status status;
-        union acpi_parse_object *op;
-        struct acpi_walk_state *walk_state;
-
-        ACPI_FUNCTION_TRACE(ds_execute_arguments);
-
-        /*
-         * Allocate a new parser op to be the root of the parsed tree
-         */
-        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
-        if (!op) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        /* Save the Node for use in acpi_ps_parse_aml */
-
-        op->common.node = scope_node;
-
-        /* Create and initialize a new parser state */
-
-        walk_state = acpi_ds_create_walk_state(0, NULL, NULL, NULL);
-        if (!walk_state) {
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-
-        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
-                                       aml_length, NULL, ACPI_IMODE_LOAD_PASS1);
-        if (ACPI_FAILURE(status)) {
-                acpi_ds_delete_walk_state(walk_state);
-                goto cleanup;
-        }
-
-        /* Mark this parse as a deferred opcode */
-
-        walk_state->parse_flags = ACPI_PARSE_DEFERRED_OP;
-        walk_state->deferred_node = node;
-
-        /* Pass1: Parse the entire declaration */
-
-        status = acpi_ps_parse_aml(walk_state);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-
-        /* Get and init the Op created above */
-
-        op->common.node = node;
-        acpi_ps_delete_parse_tree(op);
-
-        /* Evaluate the deferred arguments */
-
-        op = acpi_ps_alloc_op(AML_INT_EVAL_SUBTREE_OP);
-        if (!op) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        op->common.node = scope_node;
-
-        /* Create and initialize a new parser state */
-
-        walk_state = acpi_ds_create_walk_state(0, NULL, NULL, NULL);
-        if (!walk_state) {
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-
-        /* Execute the opcode and arguments */
-
-        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
-                                       aml_length, NULL, ACPI_IMODE_EXECUTE);
-        if (ACPI_FAILURE(status)) {
-                acpi_ds_delete_walk_state(walk_state);
-                goto cleanup;
-        }
-
-        /* Mark this execution as a deferred opcode */
-
-        walk_state->deferred_node = node;
-        status = acpi_ps_parse_aml(walk_state);
-
-      cleanup:
-        acpi_ps_delete_parse_tree(op);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_get_buffer_field_arguments
- *
- * PARAMETERS:  obj_desc        - A valid buffer_field object
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Get buffer_field Buffer and Index. This implements the late
- *              evaluation of these field attributes.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)
-{
-        union acpi_operand_object *extra_desc;
-        struct acpi_namespace_node *node;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_field_arguments, obj_desc);
-
-        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Get the AML pointer (method object) and buffer_field node */
-
-        extra_desc = acpi_ns_get_secondary_object(obj_desc);
-        node = obj_desc->buffer_field.node;
-
-        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
-                        (ACPI_TYPE_BUFFER_FIELD, node, NULL));
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BufferField Arg Init\n",
-                          acpi_ut_get_node_name(node)));
-
-        /* Execute the AML code for the term_arg arguments */
-
-        status = acpi_ds_execute_arguments(node, node->parent,
-                                           extra_desc->extra.aml_length,
-                                           extra_desc->extra.aml_start);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_get_bank_field_arguments
- *
- * PARAMETERS:  obj_desc        - A valid bank_field object
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Get bank_field bank_value. This implements the late
- *              evaluation of these field attributes.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)
-{
-        union acpi_operand_object *extra_desc;
-        struct acpi_namespace_node *node;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_get_bank_field_arguments, obj_desc);
-
-        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Get the AML pointer (method object) and bank_field node */
-
-        extra_desc = acpi_ns_get_secondary_object(obj_desc);
-        node = obj_desc->bank_field.node;
-
-        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
-                        (ACPI_TYPE_LOCAL_BANK_FIELD, node, NULL));
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BankField Arg Init\n",
-                          acpi_ut_get_node_name(node)));
-
-        /* Execute the AML code for the term_arg arguments */
-
-        status = acpi_ds_execute_arguments(node, node->parent,
-                                           extra_desc->extra.aml_length,
-                                           extra_desc->extra.aml_start);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_get_buffer_arguments
- *
- * PARAMETERS:  obj_desc        - A valid Buffer object
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Get Buffer length and initializer byte list.  This implements
- *              the late evaluation of these attributes.
- *
- ******************************************************************************/
-
-acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
-{
-        struct acpi_namespace_node *node;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_arguments, obj_desc);
-
-        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Get the Buffer node */
-
-        node = obj_desc->buffer.node;
-        if (!node) {
-                ACPI_ERROR((AE_INFO,
-                            "No pointer back to namespace node in buffer object %p",
-                            obj_desc));
-                return_ACPI_STATUS(AE_AML_INTERNAL);
-        }
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Buffer Arg Init\n"));
-
-        /* Execute the AML code for the term_arg arguments */
-
-        status = acpi_ds_execute_arguments(node, node,
-                                           obj_desc->buffer.aml_length,
-                                           obj_desc->buffer.aml_start);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_get_package_arguments
- *
- * PARAMETERS:  obj_desc        - A valid Package object
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Get Package length and initializer byte list.  This implements
- *              the late evaluation of these attributes.
- *
- ******************************************************************************/
-
-acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
-{
-        struct acpi_namespace_node *node;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_get_package_arguments, obj_desc);
-
-        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Get the Package node */
-
-        node = obj_desc->package.node;
-        if (!node) {
-                ACPI_ERROR((AE_INFO,
-                            "No pointer back to namespace node in package %p",
-                            obj_desc));
-                return_ACPI_STATUS(AE_AML_INTERNAL);
-        }
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Package Arg Init\n"));
-
-        /* Execute the AML code for the term_arg arguments */
-
-        status = acpi_ds_execute_arguments(node, node,
-                                           obj_desc->package.aml_length,
-                                           obj_desc->package.aml_start);
-        return_ACPI_STATUS(status);
-}
-
-/*****************************************************************************
- *
- * FUNCTION:    acpi_ds_get_region_arguments
- *
- * PARAMETERS:  obj_desc        - A valid region object
- *
- * RETURN:      Status.
- *
- * DESCRIPTION: Get region address and length.  This implements the late
- *              evaluation of these region attributes.
- *
- ****************************************************************************/
-
-acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
-{
-        struct acpi_namespace_node *node;
-        acpi_status status;
-        union acpi_operand_object *extra_desc;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_get_region_arguments, obj_desc);
-
-        if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        extra_desc = acpi_ns_get_secondary_object(obj_desc);
-        if (!extra_desc) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-
-        /* Get the Region node */
-
-        node = obj_desc->region.node;
-
-        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
-                        (ACPI_TYPE_REGION, node, NULL));
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] OpRegion Arg Init at AML %p\n",
-                          acpi_ut_get_node_name(node),
-                          extra_desc->extra.aml_start));
-
-        /* Execute the argument AML */
-
-        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);
-        }
-
-        /* Validate the region address/length via the host OS */
-
-        status = acpi_os_validate_address(obj_desc->region.space_id,
-                                          obj_desc->region.address,
-                                          (acpi_size) obj_desc->region.length,
-                                          acpi_ut_get_node_name(node));
-
-        if (ACPI_FAILURE(status)) {
-                /*
-                 * Invalid address/length. We will emit an error message and mark
-                 * the region as invalid, so that it will cause an additional error if
-                 * it is ever used. Then return AE_OK.
-                 */
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "During address validation of OpRegion [%4.4s]",
-                                node->name.ascii));
-                obj_desc->common.flags |= AOPOBJ_INVALID;
-                status = AE_OK;
-        }
-
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ds_initialize_region
  *
  * PARAMETERS:  obj_handle      - Region namespace node
@@ -826,8 +465,9 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Get region address and length
- *              Called from acpi_ds_exec_end_op during data_table_region parse tree walk
+ * DESCRIPTION: Get region address and length.
+ *              Called from acpi_ds_exec_end_op during data_table_region parse
+ *              tree walk.
  *
  ******************************************************************************/
 
@@ -1114,360 +754,3 @@ acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
         acpi_ut_remove_reference(operand_desc);
         return_ACPI_STATUS(status);
 }
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_exec_begin_control_op
- *
- * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              Op              - The control Op
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Handles all control ops encountered during control method
- *              execution.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
-                              union acpi_parse_object *op)
-{
-        acpi_status status = AE_OK;
-        union acpi_generic_state *control_state;
-
-        ACPI_FUNCTION_NAME(ds_exec_begin_control_op);
-
-        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n", op,
-                          op->common.aml_opcode, walk_state));
-
-        switch (op->common.aml_opcode) {
-        case AML_WHILE_OP:
-
-                /*
-                 * If this is an additional iteration of a while loop, continue.
-                 * There is no need to allocate a new control state.
-                 */
-                if (walk_state->control_state) {
-                        if (walk_state->control_state->control.aml_predicate_start
-                                == (walk_state->parser_state.aml - 1)) {
-
-                                /* Reset the state to start-of-loop */
-
-                                walk_state->control_state->common.state =
-                                    ACPI_CONTROL_CONDITIONAL_EXECUTING;
-                                break;
-                        }
-                }
-
-                /*lint -fallthrough */
-
-        case AML_IF_OP:
-
-                /*
-                 * IF/WHILE: Create a new control state to manage these
-                 * constructs. We need to manage these as a stack, in order
-                 * to handle nesting.
-                 */
-                control_state = acpi_ut_create_control_state();
-                if (!control_state) {
-                        status = AE_NO_MEMORY;
-                        break;
-                }
-                /*
-                 * Save a pointer to the predicate for multiple executions
-                 * of a loop
-                 */
-                control_state->control.aml_predicate_start =
-                    walk_state->parser_state.aml - 1;
-                control_state->control.package_end =
-                    walk_state->parser_state.pkg_end;
-                control_state->control.opcode = op->common.aml_opcode;
-
-                /* Push the control state on this walk's control stack */
-
-                acpi_ut_push_generic_state(&walk_state->control_state,
-                                           control_state);
-                break;
-
-        case AML_ELSE_OP:
-
-                /* Predicate is in the state object */
-                /* If predicate is true, the IF was executed, ignore ELSE part */
-
-                if (walk_state->last_predicate) {
-                        status = AE_CTRL_TRUE;
-                }
-
-                break;
-
-        case AML_RETURN_OP:
-
-                break;
-
-        default:
-                break;
-        }
-
-        return (status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_exec_end_control_op
- *
- * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              Op              - The control Op
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Handles all control ops encountered during control method
- *              execution.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
-                            union acpi_parse_object * op)
-{
-        acpi_status status = AE_OK;
-        union acpi_generic_state *control_state;
-
-        ACPI_FUNCTION_NAME(ds_exec_end_control_op);
-
-        switch (op->common.aml_opcode) {
-        case AML_IF_OP:
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[IF_OP] Op=%p\n", op));
-
-                /*
-                 * Save the result of the predicate in case there is an
-                 * ELSE to come
-                 */
-                walk_state->last_predicate =
-                    (u8) walk_state->control_state->common.value;
-
-                /*
-                 * Pop the control state that was created at the start
-                 * of the IF and free it
-                 */
-                control_state =
-                    acpi_ut_pop_generic_state(&walk_state->control_state);
-                acpi_ut_delete_generic_state(control_state);
-                break;
-
-        case AML_ELSE_OP:
-
-                break;
-
-        case AML_WHILE_OP:
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[WHILE_OP] Op=%p\n", op));
-
-                control_state = walk_state->control_state;
-                if (control_state->common.value) {
-
-                        /* Predicate was true, the body of the loop was just executed */
-
-                        /*
-                         * This loop counter mechanism allows the interpreter to escape
-                         * possibly infinite loops. This can occur in poorly written AML
-                         * when the hardware does not respond within a while loop and the
-                         * loop does not implement a timeout.
-                         */
-                        control_state->control.loop_count++;
-                        if (control_state->control.loop_count >
-                                ACPI_MAX_LOOP_ITERATIONS) {
-                                status = AE_AML_INFINITE_LOOP;
-                                break;
-                        }
-
-                        /*
-                         * Go back and evaluate the predicate and maybe execute the loop
-                         * another time
-                         */
-                        status = AE_CTRL_PENDING;
-                        walk_state->aml_last_while =
-                            control_state->control.aml_predicate_start;
-                        break;
-                }
-
-                /* Predicate was false, terminate this while loop */
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "[WHILE_OP] termination! Op=%p\n", op));
-
-                /* Pop this control state and free it */
-
-                control_state =
-                    acpi_ut_pop_generic_state(&walk_state->control_state);
-                acpi_ut_delete_generic_state(control_state);
-                break;
-
-        case AML_RETURN_OP:
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "[RETURN_OP] Op=%p Arg=%p\n", op,
-                                  op->common.value.arg));
-
-                /*
-                 * One optional operand -- the return value
-                 * It can be either an immediate operand or a result that
-                 * has been bubbled up the tree
-                 */
-                if (op->common.value.arg) {
-
-                        /* Since we have a real Return(), delete any implicit return */
-
-                        acpi_ds_clear_implicit_return(walk_state);
-
-                        /* Return statement has an immediate operand */
-
-                        status =
-                            acpi_ds_create_operands(walk_state,
-                                                    op->common.value.arg);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
-
-                        /*
-                         * If value being returned is a Reference (such as
-                         * an arg or local), resolve it now because it may
-                         * cease to exist at the end of the method.
-                         */
-                        status =
-                            acpi_ex_resolve_to_value(&walk_state->operands[0],
-                                                     walk_state);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
-
-                        /*
-                         * Get the return value and save as the last result
-                         * 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];
-                } else if (walk_state->result_count) {
-
-                        /* Since we have a real Return(), delete any implicit return */
-
-                        acpi_ds_clear_implicit_return(walk_state);
-
-                        /*
-                         * The return value has come from a previous calculation.
-                         *
-                         * If value being returned is a Reference (such as
-                         * an arg or local), resolve it now because it may
-                         * cease to exist at the end of the method.
-                         *
-                         * Allow references created by the Index operator to return unchanged.
-                         */
-                        if ((ACPI_GET_DESCRIPTOR_TYPE
-                             (walk_state->results->results.obj_desc[0]) ==
-                             ACPI_DESC_TYPE_OPERAND)
-                            && ((walk_state->results->results.obj_desc[0])->
-                                common.type == ACPI_TYPE_LOCAL_REFERENCE)
-                            && ((walk_state->results->results.obj_desc[0])->
-                                reference.class != ACPI_REFCLASS_INDEX)) {
-                                status =
-                                    acpi_ex_resolve_to_value(&walk_state->
-                                                             results->results.
-                                                             obj_desc[0],
-                                                             walk_state);
-                                if (ACPI_FAILURE(status)) {
-                                        return (status);
-                                }
-                        }
-
-                        walk_state->return_desc =
-                            walk_state->results->results.obj_desc[0];
-                } else {
-                        /* No return operand */
-
-                        if (walk_state->num_operands) {
-                                acpi_ut_remove_reference(walk_state->
-                                                         operands[0]);
-                        }
-
-                        walk_state->operands[0] = NULL;
-                        walk_state->num_operands = 0;
-                        walk_state->return_desc = NULL;
-                }
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "Completed RETURN_OP State=%p, RetVal=%p\n",
-                                  walk_state, walk_state->return_desc));
-
-                /* End the control method execution right now */
-
-                status = AE_CTRL_TERMINATE;
-                break;
-
-        case AML_NOOP_OP:
-
-                /* Just do nothing! */
-                break;
-
-        case AML_BREAK_POINT_OP:
-
-                /*
-                 * Set the single-step flag. This will cause the debugger (if present)
-                 * to break to the console within the AML debugger at the start of the
-                 * next AML instruction.
-                 */
-                ACPI_DEBUGGER_EXEC(acpi_gbl_cm_single_step = TRUE);
-                ACPI_DEBUGGER_EXEC(acpi_os_printf
-                                   ("**break** Executed AML BreakPoint opcode\n"));
-
-                /* Call to the OSL in case OS wants a piece of the action */
-
-                status = acpi_os_signal(ACPI_SIGNAL_BREAKPOINT,
-                                        "Executed AML Breakpoint opcode");
-                break;
-
-        case AML_BREAK_OP:
-        case AML_CONTINUE_OP:   /* ACPI 2.0 */
-
-                /* Pop and delete control states until we find a while */
-
-                while (walk_state->control_state &&
-                       (walk_state->control_state->control.opcode !=
-                        AML_WHILE_OP)) {
-                        control_state =
-                            acpi_ut_pop_generic_state(&walk_state->
-                                                      control_state);
-                        acpi_ut_delete_generic_state(control_state);
-                }
-
-                /* No while found? */
-
-                if (!walk_state->control_state) {
-                        return (AE_AML_NO_WHILE);
-                }
-
-                /* Was: walk_state->aml_last_while = walk_state->control_state->Control.aml_predicate_start; */
-
-                walk_state->aml_last_while =
-                    walk_state->control_state->control.package_end;
-
-                /* Return status depending on opcode */
-
-                if (op->common.aml_opcode == AML_BREAK_OP) {
-                        status = AE_CTRL_BREAK;
-                } else {
-                        status = AE_CTRL_CONTINUE;
-                }
-                break;
-
-        default:
-
-                ACPI_ERROR((AE_INFO, "Unknown control opcode=0x%X Op=%p",
-                            op->common.aml_opcode, op));
-
-                status = AE_AML_BAD_OPCODE;
-                break;
-        }
-
-        return (status);
-}
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 15135c25aa9..2c477ce172f 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 6b0b5d08d97..fe40e4c6554 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dswload.c b/drivers/acpi/acpica/dswload.c
index 140a9d00295..23a3b1ab20c 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -1,11 +1,11 @@
 /******************************************************************************
  *
- * Module Name: dswload - Dispatcher namespace load callbacks
+ * Module Name: dswload - Dispatcher first pass namespace load callbacks
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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,6 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
-#include "acevents.h"
 
 #ifdef ACPI_ASL_COMPILER
 #include <acpi/acdisasm.h>
@@ -537,670 +536,3 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
 
         return_ACPI_STATUS(status);
 }
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_load2_begin_op
- *
- * PARAMETERS:  walk_state      - Current state of the parse tree walk
- *              out_op          - Wher to return op if a new one is created
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Descending callback used during the loading of ACPI tables.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
-                       union acpi_parse_object **out_op)
-{
-        union acpi_parse_object *op;
-        struct acpi_namespace_node *node;
-        acpi_status status;
-        acpi_object_type object_type;
-        char *buffer_ptr;
-        u32 flags;
-
-        ACPI_FUNCTION_TRACE(ds_load2_begin_op);
-
-        op = walk_state->op;
-        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
-                          walk_state));
-
-        if (op) {
-                if ((walk_state->control_state) &&
-                    (walk_state->control_state->common.state ==
-                     ACPI_CONTROL_CONDITIONAL_EXECUTING)) {
-
-                        /* We are executing a while loop outside of a method */
-
-                        status = acpi_ds_exec_begin_op(walk_state, out_op);
-                        return_ACPI_STATUS(status);
-                }
-
-                /* We only care about Namespace opcodes here */
-
-                if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
-                     (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
-                    (!(walk_state->op_info->flags & AML_NAMED))) {
-                        return_ACPI_STATUS(AE_OK);
-                }
-
-                /* Get the name we are going to enter or lookup in the namespace */
-
-                if (walk_state->opcode == AML_INT_NAMEPATH_OP) {
-
-                        /* For Namepath op, get the path string */
-
-                        buffer_ptr = op->common.value.string;
-                        if (!buffer_ptr) {
-
-                                /* No name, just exit */
-
-                                return_ACPI_STATUS(AE_OK);
-                        }
-                } else {
-                        /* Get name from the op */
-
-                        buffer_ptr = ACPI_CAST_PTR(char, &op->named.name);
-                }
-        } else {
-                /* Get the namestring from the raw AML */
-
-                buffer_ptr =
-                    acpi_ps_get_next_namestring(&walk_state->parser_state);
-        }
-
-        /* Map the opcode into an internal object type */
-
-        object_type = walk_state->op_info->object_type;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                          "State=%p Op=%p Type=%X\n", walk_state, op,
-                          object_type));
-
-        switch (walk_state->opcode) {
-        case AML_FIELD_OP:
-        case AML_BANK_FIELD_OP:
-        case AML_INDEX_FIELD_OP:
-
-                node = NULL;
-                status = AE_OK;
-                break;
-
-        case AML_INT_NAMEPATH_OP:
-                /*
-                 * The name_path is an object reference to an existing object.
-                 * Don't enter the name into the namespace, but look it up
-                 * for use later.
-                 */
-                status =
-                    acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
-                                   object_type, ACPI_IMODE_EXECUTE,
-                                   ACPI_NS_SEARCH_PARENT, walk_state, &(node));
-                break;
-
-        case AML_SCOPE_OP:
-
-                /* Special case for Scope(\) -> refers to the Root node */
-
-                if (op && (op->named.node == acpi_gbl_root_node)) {
-                        node = op->named.node;
-
-                        status =
-                            acpi_ds_scope_stack_push(node, object_type,
-                                                     walk_state);
-                        if (ACPI_FAILURE(status)) {
-                                return_ACPI_STATUS(status);
-                        }
-                } else {
-                        /*
-                         * The Path is an object reference to an existing object.
-                         * Don't enter the name into the namespace, but look it up
-                         * for use later.
-                         */
-                        status =
-                            acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
-                                           object_type, ACPI_IMODE_EXECUTE,
-                                           ACPI_NS_SEARCH_PARENT, walk_state,
-                                           &(node));
-                        if (ACPI_FAILURE(status)) {
-#ifdef ACPI_ASL_COMPILER
-                                if (status == AE_NOT_FOUND) {
-                                        status = AE_OK;
-                                } else {
-                                        ACPI_ERROR_NAMESPACE(buffer_ptr,
-                                                             status);
-                                }
-#else
-                                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
-#endif
-                                return_ACPI_STATUS(status);
-                        }
-                }
-
-                /*
-                 * We must check to make sure that the target is
-                 * one of the opcodes that actually opens a scope
-                 */
-                switch (node->type) {
-                case ACPI_TYPE_ANY:
-                case ACPI_TYPE_LOCAL_SCOPE:     /* Scope */
-                case ACPI_TYPE_DEVICE:
-                case ACPI_TYPE_POWER:
-                case ACPI_TYPE_PROCESSOR:
-                case ACPI_TYPE_THERMAL:
-
-                        /* These are acceptable types */
-                        break;
-
-                case ACPI_TYPE_INTEGER:
-                case ACPI_TYPE_STRING:
-                case ACPI_TYPE_BUFFER:
-
-                        /*
-                         * These types we will allow, but we will change the type.
-                         * This enables some existing code of the form:
-                         *
-                         *  Name (DEB, 0)
-                         *  Scope (DEB) { ... }
-                         */
-                        ACPI_WARNING((AE_INFO,
-                                      "Type override - [%4.4s] had invalid type (%s) "
-                                      "for Scope operator, changed to type ANY\n",
-                                      acpi_ut_get_node_name(node),
-                                      acpi_ut_get_type_name(node->type)));
-
-                        node->type = ACPI_TYPE_ANY;
-                        walk_state->scope_info->common.value = ACPI_TYPE_ANY;
-                        break;
-
-                default:
-
-                        /* All other types are an error */
-
-                        ACPI_ERROR((AE_INFO,
-                                    "Invalid type (%s) for target of "
-                                    "Scope operator [%4.4s] (Cannot override)",
-                                    acpi_ut_get_type_name(node->type),
-                                    acpi_ut_get_node_name(node)));
-
-                        return (AE_AML_OPERAND_TYPE);
-                }
-                break;
-
-        default:
-
-                /* All other opcodes */
-
-                if (op && op->common.node) {
-
-                        /* This op/node was previously entered into the namespace */
-
-                        node = op->common.node;
-
-                        if (acpi_ns_opens_scope(object_type)) {
-                                status =
-                                    acpi_ds_scope_stack_push(node, object_type,
-                                                             walk_state);
-                                if (ACPI_FAILURE(status)) {
-                                        return_ACPI_STATUS(status);
-                                }
-                        }
-
-                        return_ACPI_STATUS(AE_OK);
-                }
-
-                /*
-                 * Enter the named type into the internal namespace. We enter the name
-                 * as we go downward in the parse tree. Any necessary subobjects that
-                 * involve arguments to the opcode must be created as we go back up the
-                 * parse tree later.
-                 *
-                 * Note: Name may already exist if we are executing a deferred opcode.
-                 */
-                if (walk_state->deferred_node) {
-
-                        /* This name is already in the namespace, get the node */
-
-                        node = walk_state->deferred_node;
-                        status = AE_OK;
-                        break;
-                }
-
-                flags = ACPI_NS_NO_UPSEARCH;
-                if (walk_state->pass_number == ACPI_IMODE_EXECUTE) {
-
-                        /* Execution mode, node cannot already exist, node is temporary */
-
-                        flags |= ACPI_NS_ERROR_IF_FOUND;
-
-                        if (!
-                            (walk_state->
-                             parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
-                                flags |= ACPI_NS_TEMPORARY;
-                        }
-                }
-
-                /* Add new entry or lookup existing entry */
-
-                status =
-                    acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
-                                   object_type, ACPI_IMODE_LOAD_PASS2, flags,
-                                   walk_state, &node);
-
-                if (ACPI_SUCCESS(status) && (flags & ACPI_NS_TEMPORARY)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                          "***New Node [%4.4s] %p is temporary\n",
-                                          acpi_ut_get_node_name(node), node));
-                }
-                break;
-        }
-
-        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
-                return_ACPI_STATUS(status);
-        }
-
-        if (!op) {
-
-                /* Create a new op */
-
-                op = acpi_ps_alloc_op(walk_state->opcode);
-                if (!op) {
-                        return_ACPI_STATUS(AE_NO_MEMORY);
-                }
-
-                /* Initialize the new op */
-
-                if (node) {
-                        op->named.name = node->name.integer;
-                }
-                *out_op = op;
-        }
-
-        /*
-         * Put the Node in the "op" object that the parser uses, so we
-         * can get it again quickly when this scope is closed
-         */
-        op->common.node = node;
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_load2_end_op
- *
- * PARAMETERS:  walk_state      - Current state of the parse tree walk
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Ascending callback used during the loading of the namespace,
- *              both control methods and everything else.
- *
- ******************************************************************************/
-
-acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
-{
-        union acpi_parse_object *op;
-        acpi_status status = AE_OK;
-        acpi_object_type object_type;
-        struct acpi_namespace_node *node;
-        union acpi_parse_object *arg;
-        struct acpi_namespace_node *new_node;
-#ifndef ACPI_NO_METHOD_EXECUTION
-        u32 i;
-        u8 region_space;
-#endif
-
-        ACPI_FUNCTION_TRACE(ds_load2_end_op);
-
-        op = walk_state->op;
-        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
-                          walk_state->op_info->name, op, walk_state));
-
-        /* Check if opcode had an associated namespace object */
-
-        if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        if (op->common.aml_opcode == AML_SCOPE_OP) {
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "Ending scope Op=%p State=%p\n", op,
-                                  walk_state));
-        }
-
-        object_type = walk_state->op_info->object_type;
-
-        /*
-         * Get the Node/name from the earlier lookup
-         * (It was saved in the *op structure)
-         */
-        node = op->common.node;
-
-        /*
-         * Put the Node on the object stack (Contains the ACPI Name of
-         * this object)
-         */
-        walk_state->operands[0] = (void *)node;
-        walk_state->num_operands = 1;
-
-        /* Pop the scope stack */
-
-        if (acpi_ns_opens_scope(object_type) &&
-            (op->common.aml_opcode != AML_INT_METHODCALL_OP)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "(%s) Popping scope for Op %p\n",
-                                  acpi_ut_get_type_name(object_type), op));
-
-                status = acpi_ds_scope_stack_pop(walk_state);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
-                }
-        }
-
-        /*
-         * Named operations are as follows:
-         *
-         * AML_ALIAS
-         * AML_BANKFIELD
-         * AML_CREATEBITFIELD
-         * AML_CREATEBYTEFIELD
-         * AML_CREATEDWORDFIELD
-         * AML_CREATEFIELD
-         * AML_CREATEQWORDFIELD
-         * AML_CREATEWORDFIELD
-         * AML_DATA_REGION
-         * AML_DEVICE
-         * AML_EVENT
-         * AML_FIELD
-         * AML_INDEXFIELD
-         * AML_METHOD
-         * AML_METHODCALL
-         * AML_MUTEX
-         * AML_NAME
-         * AML_NAMEDFIELD
-         * AML_OPREGION
-         * AML_POWERRES
-         * AML_PROCESSOR
-         * AML_SCOPE
-         * AML_THERMALZONE
-         */
-
-        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                          "Create-Load [%s] State=%p Op=%p NamedObj=%p\n",
-                          acpi_ps_get_opcode_name(op->common.aml_opcode),
-                          walk_state, op, node));
-
-        /* Decode the opcode */
-
-        arg = op->common.value.arg;
-
-        switch (walk_state->op_info->type) {
-#ifndef ACPI_NO_METHOD_EXECUTION
-
-        case AML_TYPE_CREATE_FIELD:
-                /*
-                 * Create the field object, but the field buffer and index must
-                 * be evaluated later during the execution phase
-                 */
-                status = acpi_ds_create_buffer_field(op, walk_state);
-                break;
-
-        case AML_TYPE_NAMED_FIELD:
-                /*
-                 * If we are executing a method, initialize the field
-                 */
-                if (walk_state->method_node) {
-                        status = acpi_ds_init_field_objects(op, walk_state);
-                }
-
-                switch (op->common.aml_opcode) {
-                case AML_INDEX_FIELD_OP:
-
-                        status =
-                            acpi_ds_create_index_field(op,
-                                                       (acpi_handle) arg->
-                                                       common.node, walk_state);
-                        break;
-
-                case AML_BANK_FIELD_OP:
-
-                        status =
-                            acpi_ds_create_bank_field(op, arg->common.node,
-                                                      walk_state);
-                        break;
-
-                case AML_FIELD_OP:
-
-                        status =
-                            acpi_ds_create_field(op, arg->common.node,
-                                                 walk_state);
-                        break;
-
-                default:
-                        /* All NAMED_FIELD opcodes must be handled above */
-                        break;
-                }
-                break;
-
-        case AML_TYPE_NAMED_SIMPLE:
-
-                status = acpi_ds_create_operands(walk_state, arg);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
-                }
-
-                switch (op->common.aml_opcode) {
-                case AML_PROCESSOR_OP:
-
-                        status = acpi_ex_create_processor(walk_state);
-                        break;
-
-                case AML_POWER_RES_OP:
-
-                        status = acpi_ex_create_power_resource(walk_state);
-                        break;
-
-                case AML_MUTEX_OP:
-
-                        status = acpi_ex_create_mutex(walk_state);
-                        break;
-
-                case AML_EVENT_OP:
-
-                        status = acpi_ex_create_event(walk_state);
-                        break;
-
-                case AML_ALIAS_OP:
-
-                        status = acpi_ex_create_alias(walk_state);
-                        break;
-
-                default:
-                        /* Unknown opcode */
-
-                        status = AE_OK;
-                        goto cleanup;
-                }
-
-                /* Delete operands */
-
-                for (i = 1; i < walk_state->num_operands; i++) {
-                        acpi_ut_remove_reference(walk_state->operands[i]);
-                        walk_state->operands[i] = NULL;
-                }
-
-                break;
-#endif                          /* ACPI_NO_METHOD_EXECUTION */
-
-        case AML_TYPE_NAMED_COMPLEX:
-
-                switch (op->common.aml_opcode) {
-#ifndef ACPI_NO_METHOD_EXECUTION
-                case AML_REGION_OP:
-                case AML_DATA_REGION_OP:
-
-                        if (op->common.aml_opcode == AML_REGION_OP) {
-                                region_space = (acpi_adr_space_type)
-                                    ((op->common.value.arg)->common.value.
-                                     integer);
-                        } else {
-                                region_space = REGION_DATA_TABLE;
-                        }
-
-                        /*
-                         * The op_region is not fully parsed at this time. The only valid
-                         * argument is the space_id. (We must save the address of the
-                         * AML of the address and length operands)
-                         *
-                         * If we have a valid region, initialize it. The namespace is
-                         * unlocked at this point.
-                         *
-                         * Need to unlock interpreter if it is locked (if we are running
-                         * a control method), in order to allow _REG methods to be run
-                         * during acpi_ev_initialize_region.
-                         */
-                        if (walk_state->method_node) {
-                                /*
-                                 * Executing a method: initialize the region and unlock
-                                 * the interpreter
-                                 */
-                                status =
-                                    acpi_ex_create_region(op->named.data,
-                                                          op->named.length,
-                                                          region_space,
-                                                          walk_state);
-                                if (ACPI_FAILURE(status)) {
-                                        return (status);
-                                }
-
-                                acpi_ex_exit_interpreter();
-                        }
-
-                        status =
-                            acpi_ev_initialize_region
-                            (acpi_ns_get_attached_object(node), FALSE);
-                        if (walk_state->method_node) {
-                                acpi_ex_enter_interpreter();
-                        }
-
-                        if (ACPI_FAILURE(status)) {
-                                /*
-                                 *  If AE_NOT_EXIST is returned, it is not fatal
-                                 *  because many regions get created before a handler
-                                 *  is installed for said region.
-                                 */
-                                if (AE_NOT_EXIST == status) {
-                                        status = AE_OK;
-                                }
-                        }
-                        break;
-
-                case AML_NAME_OP:
-
-                        status = acpi_ds_create_node(walk_state, node, op);
-                        break;
-
-                case AML_METHOD_OP:
-                        /*
-                         * method_op pkg_length name_string method_flags term_list
-                         *
-                         * Note: We must create the method node/object pair as soon as we
-                         * see the method declaration. This allows later pass1 parsing
-                         * of invocations of the method (need to know the number of
-                         * arguments.)
-                         */
-                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                          "LOADING-Method: State=%p Op=%p NamedObj=%p\n",
-                                          walk_state, op, op->named.node));
-
-                        if (!acpi_ns_get_attached_object(op->named.node)) {
-                                walk_state->operands[0] =
-                                    ACPI_CAST_PTR(void, op->named.node);
-                                walk_state->num_operands = 1;
-
-                                status =
-                                    acpi_ds_create_operands(walk_state,
-                                                            op->common.value.
-                                                            arg);
-                                if (ACPI_SUCCESS(status)) {
-                                        status =
-                                            acpi_ex_create_method(op->named.
-                                                                  data,
-                                                                  op->named.
-                                                                  length,
-                                                                  walk_state);
-                                }
-                                walk_state->operands[0] = NULL;
-                                walk_state->num_operands = 0;
-
-                                if (ACPI_FAILURE(status)) {
-                                        return_ACPI_STATUS(status);
-                                }
-                        }
-                        break;
-
-#endif                          /* ACPI_NO_METHOD_EXECUTION */
-
-                default:
-                        /* All NAMED_COMPLEX opcodes must be handled above */
-                        break;
-                }
-                break;
-
-        case AML_CLASS_INTERNAL:
-
-                /* case AML_INT_NAMEPATH_OP: */
-                break;
-
-        case AML_CLASS_METHOD_CALL:
-
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",
-                                  walk_state, op, node));
-
-                /*
-                 * Lookup the method name and save the Node
-                 */
-                status =
-                    acpi_ns_lookup(walk_state->scope_info,
-                                   arg->common.value.string, ACPI_TYPE_ANY,
-                                   ACPI_IMODE_LOAD_PASS2,
-                                   ACPI_NS_SEARCH_PARENT |
-                                   ACPI_NS_DONT_OPEN_SCOPE, walk_state,
-                                   &(new_node));
-                if (ACPI_SUCCESS(status)) {
-                        /*
-                         * Make sure that what we found is indeed a method
-                         * We didn't search for a method on purpose, to see if the name
-                         * would resolve
-                         */
-                        if (new_node->type != ACPI_TYPE_METHOD) {
-                                status = AE_AML_OPERAND_TYPE;
-                        }
-
-                        /* We could put the returned object (Node) on the object stack for
-                         * later, but for now, we will put it in the "op" object that the
-                         * parser uses, so we can get it again at the end of this scope
-                         */
-                        op->common.node = new_node;
-                } else {
-                        ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
-                }
-                break;
-
-        default:
-                break;
-        }
-
-      cleanup:
-
-        /* Remove the Node pushed at the very beginning */
-
-        walk_state->operands[0] = NULL;
-        walk_state->num_operands = 0;
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
new file mode 100644
index 00000000000..4be4e921dfe
--- /dev/null
+++ b/drivers/acpi/acpica/dswload2.c
@@ -0,0 +1,720 @@
+/******************************************************************************
+ *
+ * Module Name: dswload2 - Dispatcher second pass namespace load callbacks
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, 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 "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acevents.h"
+
+#define _COMPONENT          ACPI_DISPATCHER
+ACPI_MODULE_NAME("dswload2")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_load2_begin_op
+ *
+ * PARAMETERS:  walk_state      - Current state of the parse tree walk
+ *              out_op          - Wher to return op if a new one is created
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Descending callback used during the loading of ACPI tables.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
+                       union acpi_parse_object **out_op)
+{
+        union acpi_parse_object *op;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+        acpi_object_type object_type;
+        char *buffer_ptr;
+        u32 flags;
+
+        ACPI_FUNCTION_TRACE(ds_load2_begin_op);
+
+        op = walk_state->op;
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
+                          walk_state));
+
+        if (op) {
+                if ((walk_state->control_state) &&
+                    (walk_state->control_state->common.state ==
+                     ACPI_CONTROL_CONDITIONAL_EXECUTING)) {
+
+                        /* We are executing a while loop outside of a method */
+
+                        status = acpi_ds_exec_begin_op(walk_state, out_op);
+                        return_ACPI_STATUS(status);
+                }
+
+                /* We only care about Namespace opcodes here */
+
+                if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
+                     (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
+                    (!(walk_state->op_info->flags & AML_NAMED))) {
+                        return_ACPI_STATUS(AE_OK);
+                }
+
+                /* Get the name we are going to enter or lookup in the namespace */
+
+                if (walk_state->opcode == AML_INT_NAMEPATH_OP) {
+
+                        /* For Namepath op, get the path string */
+
+                        buffer_ptr = op->common.value.string;
+                        if (!buffer_ptr) {
+
+                                /* No name, just exit */
+
+                                return_ACPI_STATUS(AE_OK);
+                        }
+                } else {
+                        /* Get name from the op */
+
+                        buffer_ptr = ACPI_CAST_PTR(char, &op->named.name);
+                }
+        } else {
+                /* Get the namestring from the raw AML */
+
+                buffer_ptr =
+                    acpi_ps_get_next_namestring(&walk_state->parser_state);
+        }
+
+        /* Map the opcode into an internal object type */
+
+        object_type = walk_state->op_info->object_type;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "State=%p Op=%p Type=%X\n", walk_state, op,
+                          object_type));
+
+        switch (walk_state->opcode) {
+        case AML_FIELD_OP:
+        case AML_BANK_FIELD_OP:
+        case AML_INDEX_FIELD_OP:
+
+                node = NULL;
+                status = AE_OK;
+                break;
+
+        case AML_INT_NAMEPATH_OP:
+                /*
+                 * The name_path is an object reference to an existing object.
+                 * Don't enter the name into the namespace, but look it up
+                 * for use later.
+                 */
+                status =
+                    acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
+                                   object_type, ACPI_IMODE_EXECUTE,
+                                   ACPI_NS_SEARCH_PARENT, walk_state, &(node));
+                break;
+
+        case AML_SCOPE_OP:
+
+                /* Special case for Scope(\) -> refers to the Root node */
+
+                if (op && (op->named.node == acpi_gbl_root_node)) {
+                        node = op->named.node;
+
+                        status =
+                            acpi_ds_scope_stack_push(node, object_type,
+                                                     walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
+                } else {
+                        /*
+                         * The Path is an object reference to an existing object.
+                         * Don't enter the name into the namespace, but look it up
+                         * for use later.
+                         */
+                        status =
+                            acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
+                                           object_type, ACPI_IMODE_EXECUTE,
+                                           ACPI_NS_SEARCH_PARENT, walk_state,
+                                           &(node));
+                        if (ACPI_FAILURE(status)) {
+#ifdef ACPI_ASL_COMPILER
+                                if (status == AE_NOT_FOUND) {
+                                        status = AE_OK;
+                                } else {
+                                        ACPI_ERROR_NAMESPACE(buffer_ptr,
+                                                             status);
+                                }
+#else
+                                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
+#endif
+                                return_ACPI_STATUS(status);
+                        }
+                }
+
+                /*
+                 * We must check to make sure that the target is
+                 * one of the opcodes that actually opens a scope
+                 */
+                switch (node->type) {
+                case ACPI_TYPE_ANY:
+                case ACPI_TYPE_LOCAL_SCOPE:     /* Scope */
+                case ACPI_TYPE_DEVICE:
+                case ACPI_TYPE_POWER:
+                case ACPI_TYPE_PROCESSOR:
+                case ACPI_TYPE_THERMAL:
+
+                        /* These are acceptable types */
+                        break;
+
+                case ACPI_TYPE_INTEGER:
+                case ACPI_TYPE_STRING:
+                case ACPI_TYPE_BUFFER:
+
+                        /*
+                         * These types we will allow, but we will change the type.
+                         * This enables some existing code of the form:
+                         *
+                         *  Name (DEB, 0)
+                         *  Scope (DEB) { ... }
+                         */
+                        ACPI_WARNING((AE_INFO,
+                                      "Type override - [%4.4s] had invalid type (%s) "
+                                      "for Scope operator, changed to type ANY\n",
+                                      acpi_ut_get_node_name(node),
+                                      acpi_ut_get_type_name(node->type)));
+
+                        node->type = ACPI_TYPE_ANY;
+                        walk_state->scope_info->common.value = ACPI_TYPE_ANY;
+                        break;
+
+                default:
+
+                        /* All other types are an error */
+
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid type (%s) for target of "
+                                    "Scope operator [%4.4s] (Cannot override)",
+                                    acpi_ut_get_type_name(node->type),
+                                    acpi_ut_get_node_name(node)));
+
+                        return (AE_AML_OPERAND_TYPE);
+                }
+                break;
+
+        default:
+
+                /* All other opcodes */
+
+                if (op && op->common.node) {
+
+                        /* This op/node was previously entered into the namespace */
+
+                        node = op->common.node;
+
+                        if (acpi_ns_opens_scope(object_type)) {
+                                status =
+                                    acpi_ds_scope_stack_push(node, object_type,
+                                                             walk_state);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                        }
+
+                        return_ACPI_STATUS(AE_OK);
+                }
+
+                /*
+                 * Enter the named type into the internal namespace. We enter the name
+                 * as we go downward in the parse tree. Any necessary subobjects that
+                 * involve arguments to the opcode must be created as we go back up the
+                 * parse tree later.
+                 *
+                 * Note: Name may already exist if we are executing a deferred opcode.
+                 */
+                if (walk_state->deferred_node) {
+
+                        /* This name is already in the namespace, get the node */
+
+                        node = walk_state->deferred_node;
+                        status = AE_OK;
+                        break;
+                }
+
+                flags = ACPI_NS_NO_UPSEARCH;
+                if (walk_state->pass_number == ACPI_IMODE_EXECUTE) {
+
+                        /* Execution mode, node cannot already exist, node is temporary */
+
+                        flags |= ACPI_NS_ERROR_IF_FOUND;
+
+                        if (!
+                            (walk_state->
+                             parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
+                                flags |= ACPI_NS_TEMPORARY;
+                        }
+                }
+
+                /* Add new entry or lookup existing entry */
+
+                status =
+                    acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
+                                   object_type, ACPI_IMODE_LOAD_PASS2, flags,
+                                   walk_state, &node);
+
+                if (ACPI_SUCCESS(status) && (flags & ACPI_NS_TEMPORARY)) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                          "***New Node [%4.4s] %p is temporary\n",
+                                          acpi_ut_get_node_name(node), node));
+                }
+                break;
+        }
+
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
+                return_ACPI_STATUS(status);
+        }
+
+        if (!op) {
+
+                /* Create a new op */
+
+                op = acpi_ps_alloc_op(walk_state->opcode);
+                if (!op) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
+
+                /* Initialize the new op */
+
+                if (node) {
+                        op->named.name = node->name.integer;
+                }
+                *out_op = op;
+        }
+
+        /*
+         * Put the Node in the "op" object that the parser uses, so we
+         * can get it again quickly when this scope is closed
+         */
+        op->common.node = node;
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_load2_end_op
+ *
+ * PARAMETERS:  walk_state      - Current state of the parse tree walk
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Ascending callback used during the loading of the namespace,
+ *              both control methods and everything else.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
+{
+        union acpi_parse_object *op;
+        acpi_status status = AE_OK;
+        acpi_object_type object_type;
+        struct acpi_namespace_node *node;
+        union acpi_parse_object *arg;
+        struct acpi_namespace_node *new_node;
+#ifndef ACPI_NO_METHOD_EXECUTION
+        u32 i;
+        u8 region_space;
+#endif
+
+        ACPI_FUNCTION_TRACE(ds_load2_end_op);
+
+        op = walk_state->op;
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
+                          walk_state->op_info->name, op, walk_state));
+
+        /* Check if opcode had an associated namespace object */
+
+        if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        if (op->common.aml_opcode == AML_SCOPE_OP) {
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "Ending scope Op=%p State=%p\n", op,
+                                  walk_state));
+        }
+
+        object_type = walk_state->op_info->object_type;
+
+        /*
+         * Get the Node/name from the earlier lookup
+         * (It was saved in the *op structure)
+         */
+        node = op->common.node;
+
+        /*
+         * Put the Node on the object stack (Contains the ACPI Name of
+         * this object)
+         */
+        walk_state->operands[0] = (void *)node;
+        walk_state->num_operands = 1;
+
+        /* Pop the scope stack */
+
+        if (acpi_ns_opens_scope(object_type) &&
+            (op->common.aml_opcode != AML_INT_METHODCALL_OP)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "(%s) Popping scope for Op %p\n",
+                                  acpi_ut_get_type_name(object_type), op));
+
+                status = acpi_ds_scope_stack_pop(walk_state);
+                if (ACPI_FAILURE(status)) {
+                        goto cleanup;
+                }
+        }
+
+        /*
+         * Named operations are as follows:
+         *
+         * AML_ALIAS
+         * AML_BANKFIELD
+         * AML_CREATEBITFIELD
+         * AML_CREATEBYTEFIELD
+         * AML_CREATEDWORDFIELD
+         * AML_CREATEFIELD
+         * AML_CREATEQWORDFIELD
+         * AML_CREATEWORDFIELD
+         * AML_DATA_REGION
+         * AML_DEVICE
+         * AML_EVENT
+         * AML_FIELD
+         * AML_INDEXFIELD
+         * AML_METHOD
+         * AML_METHODCALL
+         * AML_MUTEX
+         * AML_NAME
+         * AML_NAMEDFIELD
+         * AML_OPREGION
+         * AML_POWERRES
+         * AML_PROCESSOR
+         * AML_SCOPE
+         * AML_THERMALZONE
+         */
+
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "Create-Load [%s] State=%p Op=%p NamedObj=%p\n",
+                          acpi_ps_get_opcode_name(op->common.aml_opcode),
+                          walk_state, op, node));
+
+        /* Decode the opcode */
+
+        arg = op->common.value.arg;
+
+        switch (walk_state->op_info->type) {
+#ifndef ACPI_NO_METHOD_EXECUTION
+
+        case AML_TYPE_CREATE_FIELD:
+                /*
+                 * Create the field object, but the field buffer and index must
+                 * be evaluated later during the execution phase
+                 */
+                status = acpi_ds_create_buffer_field(op, walk_state);
+                break;
+
+        case AML_TYPE_NAMED_FIELD:
+                /*
+                 * If we are executing a method, initialize the field
+                 */
+                if (walk_state->method_node) {
+                        status = acpi_ds_init_field_objects(op, walk_state);
+                }
+
+                switch (op->common.aml_opcode) {
+                case AML_INDEX_FIELD_OP:
+
+                        status =
+                            acpi_ds_create_index_field(op,
+                                                       (acpi_handle) arg->
+                                                       common.node, walk_state);
+                        break;
+
+                case AML_BANK_FIELD_OP:
+
+                        status =
+                            acpi_ds_create_bank_field(op, arg->common.node,
+                                                      walk_state);
+                        break;
+
+                case AML_FIELD_OP:
+
+                        status =
+                            acpi_ds_create_field(op, arg->common.node,
+                                                 walk_state);
+                        break;
+
+                default:
+                        /* All NAMED_FIELD opcodes must be handled above */
+                        break;
+                }
+                break;
+
+        case AML_TYPE_NAMED_SIMPLE:
+
+                status = acpi_ds_create_operands(walk_state, arg);
+                if (ACPI_FAILURE(status)) {
+                        goto cleanup;
+                }
+
+                switch (op->common.aml_opcode) {
+                case AML_PROCESSOR_OP:
+
+                        status = acpi_ex_create_processor(walk_state);
+                        break;
+
+                case AML_POWER_RES_OP:
+
+                        status = acpi_ex_create_power_resource(walk_state);
+                        break;
+
+                case AML_MUTEX_OP:
+
+                        status = acpi_ex_create_mutex(walk_state);
+                        break;
+
+                case AML_EVENT_OP:
+
+                        status = acpi_ex_create_event(walk_state);
+                        break;
+
+                case AML_ALIAS_OP:
+
+                        status = acpi_ex_create_alias(walk_state);
+                        break;
+
+                default:
+                        /* Unknown opcode */
+
+                        status = AE_OK;
+                        goto cleanup;
+                }
+
+                /* Delete operands */
+
+                for (i = 1; i < walk_state->num_operands; i++) {
+                        acpi_ut_remove_reference(walk_state->operands[i]);
+                        walk_state->operands[i] = NULL;
+                }
+
+                break;
+#endif                          /* ACPI_NO_METHOD_EXECUTION */
+
+        case AML_TYPE_NAMED_COMPLEX:
+
+                switch (op->common.aml_opcode) {
+#ifndef ACPI_NO_METHOD_EXECUTION
+                case AML_REGION_OP:
+                case AML_DATA_REGION_OP:
+
+                        if (op->common.aml_opcode == AML_REGION_OP) {
+                                region_space = (acpi_adr_space_type)
+                                    ((op->common.value.arg)->common.value.
+                                     integer);
+                        } else {
+                                region_space = REGION_DATA_TABLE;
+                        }
+
+                        /*
+                         * The op_region is not fully parsed at this time. The only valid
+                         * argument is the space_id. (We must save the address of the
+                         * AML of the address and length operands)
+                         *
+                         * If we have a valid region, initialize it. The namespace is
+                         * unlocked at this point.
+                         *
+                         * Need to unlock interpreter if it is locked (if we are running
+                         * a control method), in order to allow _REG methods to be run
+                         * during acpi_ev_initialize_region.
+                         */
+                        if (walk_state->method_node) {
+                                /*
+                                 * Executing a method: initialize the region and unlock
+                                 * the interpreter
+                                 */
+                                status =
+                                    acpi_ex_create_region(op->named.data,
+                                                          op->named.length,
+                                                          region_space,
+                                                          walk_state);
+                                if (ACPI_FAILURE(status)) {
+                                        return (status);
+                                }
+
+                                acpi_ex_exit_interpreter();
+                        }
+
+                        status =
+                            acpi_ev_initialize_region
+                            (acpi_ns_get_attached_object(node), FALSE);
+                        if (walk_state->method_node) {
+                                acpi_ex_enter_interpreter();
+                        }
+
+                        if (ACPI_FAILURE(status)) {
+                                /*
+                                 *  If AE_NOT_EXIST is returned, it is not fatal
+                                 *  because many regions get created before a handler
+                                 *  is installed for said region.
+                                 */
+                                if (AE_NOT_EXIST == status) {
+                                        status = AE_OK;
+                                }
+                        }
+                        break;
+
+                case AML_NAME_OP:
+
+                        status = acpi_ds_create_node(walk_state, node, op);
+                        break;
+
+                case AML_METHOD_OP:
+                        /*
+                         * method_op pkg_length name_string method_flags term_list
+                         *
+                         * Note: We must create the method node/object pair as soon as we
+                         * see the method declaration. This allows later pass1 parsing
+                         * of invocations of the method (need to know the number of
+                         * arguments.)
+                         */
+                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                          "LOADING-Method: State=%p Op=%p NamedObj=%p\n",
+                                          walk_state, op, op->named.node));
+
+                        if (!acpi_ns_get_attached_object(op->named.node)) {
+                                walk_state->operands[0] =
+                                    ACPI_CAST_PTR(void, op->named.node);
+                                walk_state->num_operands = 1;
+
+                                status =
+                                    acpi_ds_create_operands(walk_state,
+                                                            op->common.value.
+                                                            arg);
+                                if (ACPI_SUCCESS(status)) {
+                                        status =
+                                            acpi_ex_create_method(op->named.
+                                                                  data,
+                                                                  op->named.
+                                                                  length,
+                                                                  walk_state);
+                                }
+                                walk_state->operands[0] = NULL;
+                                walk_state->num_operands = 0;
+
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                        }
+                        break;
+
+#endif                          /* ACPI_NO_METHOD_EXECUTION */
+
+                default:
+                        /* All NAMED_COMPLEX opcodes must be handled above */
+                        break;
+                }
+                break;
+
+        case AML_CLASS_INTERNAL:
+
+                /* case AML_INT_NAMEPATH_OP: */
+                break;
+
+        case AML_CLASS_METHOD_CALL:
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",
+                                  walk_state, op, node));
+
+                /*
+                 * Lookup the method name and save the Node
+                 */
+                status =
+                    acpi_ns_lookup(walk_state->scope_info,
+                                   arg->common.value.string, ACPI_TYPE_ANY,
+                                   ACPI_IMODE_LOAD_PASS2,
+                                   ACPI_NS_SEARCH_PARENT |
+                                   ACPI_NS_DONT_OPEN_SCOPE, walk_state,
+                                   &(new_node));
+                if (ACPI_SUCCESS(status)) {
+                        /*
+                         * Make sure that what we found is indeed a method
+                         * We didn't search for a method on purpose, to see if the name
+                         * would resolve
+                         */
+                        if (new_node->type != ACPI_TYPE_METHOD) {
+                                status = AE_AML_OPERAND_TYPE;
+                        }
+
+                        /* We could put the returned object (Node) on the object stack for
+                         * later, but for now, we will put it in the "op" object that the
+                         * parser uses, so we can get it again at the end of this scope
+                         */
+                        op->common.node = new_node;
+                } else {
+                        ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
+                }
+                break;
+
+        default:
+                break;
+        }
+
+      cleanup:
+
+        /* Remove the Node pushed at the very beginning */
+
+        walk_state->operands[0] = NULL;
+        walk_state->num_operands = 0;
+        return_ACPI_STATUS(status);
+}
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index d1e701709da..76a661fc1e0 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 83155dd8671..a6c374ef991 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/evevent.c b/drivers/acpi/acpica/evevent.c
index c61c3039c31..d458b041e65 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,9 +217,17 @@ u32 acpi_ev_fixed_event_detect(void)
                      status_bit_mask)
                     && (fixed_enable & acpi_gbl_fixed_event_info[i].
                         enable_bit_mask)) {
+                        /*
+                         * Found an active (signalled) event. Invoke global event
+                         * handler if present.
+                         */
+                        acpi_fixed_event_count[i]++;
+                        if (acpi_gbl_global_event_handler) {
+                                acpi_gbl_global_event_handler
+                                    (ACPI_EVENT_TYPE_FIXED, NULL, i,
+                                     acpi_gbl_global_event_handler_context);
+                        }
 
-                        /* Found an active (signalled) event */
-                        acpi_os_fixed_event_count(i);
                         int_status |= acpi_ev_fixed_event_dispatch(i);
                 }
         }
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index f226eac314d..65c79add3b1 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,8 @@ ACPI_MODULE_NAME("evgpe")
 /* Local prototypes */
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
 
+static void ACPI_SYSTEM_XFACE acpi_ev_asynch_enable_gpe(void *context);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_update_gpe_enable_mask
@@ -102,7 +104,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Clear the given GPE from stale events and enable it.
+ * DESCRIPTION: Clear a GPE of stale events and enable it.
  *
  ******************************************************************************/
 acpi_status
@@ -113,12 +115,13 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
         ACPI_FUNCTION_TRACE(ev_enable_gpe);
 
         /*
-         * We will only allow a GPE to be enabled if it has either an
-         * associated method (_Lxx/_Exx) or a handler. Otherwise, the
-         * GPE will be immediately disabled by acpi_ev_gpe_dispatch the
-         * first time it fires.
+         * We will only allow a GPE to be enabled if it has either an associated
+         * method (_Lxx/_Exx) or a handler, or is using the implicit notify
+         * feature. Otherwise, the GPE will be immediately disabled by
+         * acpi_ev_gpe_dispatch the first time it fires.
          */
-        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)) {
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+            ACPI_GPE_DISPATCH_NONE) {
                 return_ACPI_STATUS(AE_NO_HANDLER);
         }
 
@@ -137,9 +140,9 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_raw_enable_gpe
+ * FUNCTION:    acpi_ev_add_gpe_reference
  *
- * PARAMETERS:  gpe_event_info  - GPE to enable
+ * PARAMETERS:  gpe_event_info          - Add a reference to this GPE
  *
  * RETURN:      Status
  *
@@ -148,16 +151,21 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_raw_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 status = AE_OK;
 
+        ACPI_FUNCTION_TRACE(ev_add_gpe_reference);
+
         if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {
                 return_ACPI_STATUS(AE_LIMIT);
         }
 
         gpe_event_info->runtime_count++;
         if (gpe_event_info->runtime_count == 1) {
+
+                /* Enable on first reference */
+
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
                         status = acpi_ev_enable_gpe(gpe_event_info);
@@ -173,9 +181,9 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_raw_disable_gpe
+ * FUNCTION:    acpi_ev_remove_gpe_reference
  *
- * PARAMETERS:  gpe_event_info  - GPE to disable
+ * PARAMETERS:  gpe_event_info          - Remove a reference to this GPE
  *
  * RETURN:      Status
  *
@@ -184,16 +192,21 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_raw_disable_gpe(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;
 
+        ACPI_FUNCTION_TRACE(ev_remove_gpe_reference);
+
         if (!gpe_event_info->runtime_count) {
                 return_ACPI_STATUS(AE_LIMIT);
         }
 
         gpe_event_info->runtime_count--;
         if (!gpe_event_info->runtime_count) {
+
+                /* Disable on last reference */
+
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
                         status = acpi_hw_low_set_gpe(gpe_event_info,
@@ -360,6 +373,15 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
 
                         gpe_register_info = &gpe_block->register_info[i];
 
+                        /*
+                         * Optimization: If there are no GPEs enabled within this
+                         * register, we can safely ignore the entire register.
+                         */
+                        if (!(gpe_register_info->enable_for_run |
+                              gpe_register_info->enable_for_wake)) {
+                                continue;
+                        }
+
                         /* Read the Status Register */
 
                         status =
@@ -379,7 +401,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         }
 
                         ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                          "Read GPE Register at GPE%X: Status=%02X, Enable=%02X\n",
+                                          "Read GPE Register at GPE%02X: Status=%02X, Enable=%02X\n",
                                           gpe_register_info->base_gpe_number,
                                           status_reg, enable_reg));
 
@@ -405,7 +427,9 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                                          * or method.
                                          */
                                         int_status |=
-                                            acpi_ev_gpe_dispatch(&gpe_block->
+                                            acpi_ev_gpe_dispatch(gpe_block->
+                                                                 node,
+                                                                 &gpe_block->
                                                 event_info[((acpi_size) i * ACPI_GPE_REGISTER_WIDTH) + j], j + gpe_register_info->base_gpe_number);
                                 }
                         }
@@ -435,19 +459,29 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
  *              an interrupt handler.
  *
  ******************************************************************************/
-static void acpi_ev_asynch_enable_gpe(void *context);
 
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 {
-        struct acpi_gpe_event_info *gpe_event_info = (void *)context;
+        struct acpi_gpe_event_info *gpe_event_info = context;
         acpi_status status;
-        struct acpi_gpe_event_info local_gpe_event_info;
+        struct acpi_gpe_event_info *local_gpe_event_info;
         struct acpi_evaluate_info *info;
+        struct acpi_gpe_notify_object *notify_object;
 
         ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
 
+        /* Allocate a local GPE block */
+
+        local_gpe_event_info =
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_event_info));
+        if (!local_gpe_event_info) {
+                ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, "while handling a GPE"));
+                return_VOID;
+        }
+
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
+                ACPI_FREE(local_gpe_event_info);
                 return_VOID;
         }
 
@@ -455,6 +489,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 
         if (!acpi_ev_valid_gpe_event(gpe_event_info)) {
                 status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+                ACPI_FREE(local_gpe_event_info);
                 return_VOID;
         }
 
@@ -462,7 +497,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
          * Take a snapshot of the GPE info for this level - we copy the info to
          * prevent a race condition with remove_handler/remove_block.
          */
-        ACPI_MEMCPY(&local_gpe_event_info, gpe_event_info,
+        ACPI_MEMCPY(local_gpe_event_info, gpe_event_info,
                     sizeof(struct acpi_gpe_event_info));
 
         status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
@@ -470,12 +505,34 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                 return_VOID;
         }
 
-        /*
-         * Must check for control method type dispatch one more time to avoid a
-         * race with ev_gpe_install_handler
-         */
-        if ((local_gpe_event_info.flags & ACPI_GPE_DISPATCH_MASK) ==
-            ACPI_GPE_DISPATCH_METHOD) {
+        /* Do the correct dispatch - normal method or implicit notify */
+
+        switch (local_gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
+        case ACPI_GPE_DISPATCH_NOTIFY:
+
+                /*
+                 * Implicit notify.
+                 * Dispatch a DEVICE_WAKE notify to the appropriate handler.
+                 * NOTE: the request is queued for execution after this method
+                 * completes. The notify handlers are NOT invoked synchronously
+                 * from this thread -- because handlers may in turn run other
+                 * control methods.
+                 */
+                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;
+
+        case ACPI_GPE_DISPATCH_METHOD:
 
                 /* Allocate the evaluation information block */
 
@@ -488,7 +545,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                          * control method that corresponds to this GPE
                          */
                         info->prefix_node =
-                            local_gpe_event_info.dispatch.method_node;
+                            local_gpe_event_info->dispatch.method_node;
                         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
                         status = acpi_ns_evaluate(info);
@@ -499,46 +556,98 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "while evaluating GPE method [%4.4s]",
                                         acpi_ut_get_node_name
-                                        (local_gpe_event_info.dispatch.
+                                        (local_gpe_event_info->dispatch.
                                          method_node)));
                 }
+
+                break;
+
+        default:
+                return_VOID;    /* Should never happen */
         }
+
         /* Defer enabling of GPE until all notify handlers are done */
-        acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_asynch_enable_gpe,
-                                gpe_event_info);
+
+        status = acpi_os_execute(OSL_NOTIFY_HANDLER,
+                                 acpi_ev_asynch_enable_gpe,
+                                 local_gpe_event_info);
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(local_gpe_event_info);
+        }
         return_VOID;
 }
 
-static void acpi_ev_asynch_enable_gpe(void *context)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_asynch_enable_gpe
+ *
+ * PARAMETERS:  Context (gpe_event_info) - Info for this GPE
+ *              Callback from acpi_os_execute
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Asynchronous clear/enable for GPE. This allows the GPE to
+ *              complete (i.e., finish execution of Notify)
+ *
+ ******************************************************************************/
+
+static void ACPI_SYSTEM_XFACE acpi_ev_asynch_enable_gpe(void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info = context;
+
+        (void)acpi_ev_finish_gpe(gpe_event_info);
+
+        ACPI_FREE(gpe_event_info);
+        return;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_finish_gpe
+ *
+ * PARAMETERS:  gpe_event_info      - Info for this GPE
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Clear/Enable a GPE. Common code that is used after execution
+ *              of a GPE method or a synchronous or asynchronous GPE handler.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info)
+{
         acpi_status status;
+
         if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
             ACPI_GPE_LEVEL_TRIGGERED) {
                 /*
-                 * GPE is level-triggered, we clear the GPE status bit after handling
-                 * the event.
+                 * GPE is level-triggered, we clear the GPE status bit after
+                 * handling the event.
                  */
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        return_VOID;
+                        return (status);
                 }
         }
 
         /*
-         * Enable this GPE, conditionally. This means that the GPE will only be
-         * physically enabled if the enable_for_run bit is set in the event_info
+         * Enable this GPE, conditionally. This means that the GPE will
+         * only be physically enabled if the enable_for_run bit is set
+         * in the event_info.
          */
-        (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_COND_ENABLE);
-
-        return_VOID;
+        (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_CONDITIONAL_ENABLE);
+        return (AE_OK);
 }
 
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_gpe_dispatch
  *
- * PARAMETERS:  gpe_event_info  - Info for this GPE
+ * PARAMETERS:  gpe_device      - Device node. NULL for GPE0/GPE1
+ *              gpe_event_info  - Info for this GPE
  *              gpe_number      - Number relative to the parent GPE block
  *
  * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED
@@ -551,13 +660,22 @@ static void acpi_ev_asynch_enable_gpe(void *context)
  ******************************************************************************/
 
 u32
-acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
+acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
+                    struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 {
         acpi_status status;
+        u32 return_value;
 
         ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
 
-        acpi_os_gpe_count(gpe_number);
+        /* Invoke global event handler if present */
+
+        acpi_gpe_count++;
+        if (acpi_gbl_global_event_handler) {
+                acpi_gbl_global_event_handler(ACPI_EVENT_TYPE_GPE, gpe_device,
+                                              gpe_number,
+                                              acpi_gbl_global_event_handler_context);
+        }
 
         /*
          * If edge-triggered, clear the GPE status bit now. Note that
@@ -568,59 +686,55 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE[0x%2X]",
-                                        gpe_number));
+                                        "Unable to clear GPE%02X", gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
 
         /*
-         * Dispatch the GPE to either an installed handler, or the control method
-         * associated with this GPE (_Lxx or _Exx). If a handler exists, we invoke
-         * it and do not attempt to run the method. If there is neither a handler
-         * nor a method, we disable this GPE to prevent further such pointless
-         * events from firing.
+         * Always disable the GPE so that it does not keep firing before
+         * any asynchronous activity completes (either from the execution
+         * of a GPE method or an asynchronous GPE handler.)
+         *
+         * If there is no handler or method to run, just disable the
+         * GPE and leave it disabled permanently to prevent further such
+         * pointless events from firing.
+         */
+        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to disable GPE%02X", gpe_number));
+                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
+        }
+
+        /*
+         * Dispatch the GPE to either an installed handler or the control
+         * method associated with this GPE (_Lxx or _Exx). If a handler
+         * exists, we invoke it and do not attempt to run the method.
+         * If there is neither a handler nor a method, leave the GPE
+         * disabled.
          */
         switch (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
         case ACPI_GPE_DISPATCH_HANDLER:
 
-                /*
-                 * Invoke the installed handler (at interrupt level)
-                 * Ignore return status for now.
-                 * TBD: leave GPE disabled on error?
-                 */
-                (void)gpe_event_info->dispatch.handler->address(gpe_event_info->
-                                                                dispatch.
-                                                                handler->
-                                                                context);
+                /* Invoke the installed handler (at interrupt level) */
 
-                /* It is now safe to clear level-triggered events. */
+                return_value =
+                    gpe_event_info->dispatch.handler->address(gpe_device,
+                                                              gpe_number,
+                                                              gpe_event_info->
+                                                              dispatch.handler->
+                                                              context);
 
-                if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
-                    ACPI_GPE_LEVEL_TRIGGERED) {
-                        status = acpi_hw_clear_gpe(gpe_event_info);
-                        if (ACPI_FAILURE(status)) {
-                                ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE[0x%2X]",
-                                                gpe_number));
-                                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                        }
+                /* If requested, clear (if level-triggered) and reenable the GPE */
+
+                if (return_value & ACPI_REENABLE_GPE) {
+                        (void)acpi_ev_finish_gpe(gpe_event_info);
                 }
                 break;
 
         case ACPI_GPE_DISPATCH_METHOD:
-
-                /*
-                 * Disable the GPE, so it doesn't keep firing before the method has a
-                 * chance to run (it runs asynchronously with interrupts enabled).
-                 */
-                status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[0x%2X]",
-                                        gpe_number));
-                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                }
+        case ACPI_GPE_DISPATCH_NOTIFY:
 
                 /*
                  * Execute the method associated with the GPE
@@ -631,7 +745,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                          gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to queue handler for GPE[0x%2X] - event disabled",
+                                        "Unable to queue handler for GPE%2X - event disabled",
                                         gpe_number));
                 }
                 break;
@@ -644,20 +758,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  * a GPE to be enabled if it has no handler or method.
                  */
                 ACPI_ERROR((AE_INFO,
-                            "No handler or method for GPE[0x%2X], disabling event",
+                            "No handler or method for GPE%02X, disabling event",
                             gpe_number));
 
-                /*
-                 * Disable the GPE. The GPE will remain disabled a handler
-                 * is installed or ACPICA is restarted.
-                 */
-                status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[0x%2X]",
-                                        gpe_number));
-                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                }
                 break;
         }
 
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 020add3eee1..ca2c41a5331 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -361,9 +361,9 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 
         gpe_block->node = gpe_device;
         gpe_block->gpe_count = (u16)(register_count * ACPI_GPE_REGISTER_WIDTH);
+        gpe_block->initialized = FALSE;
         gpe_block->register_count = register_count;
         gpe_block->block_base_number = gpe_block_base_number;
-        gpe_block->initialized = FALSE;
 
         ACPI_MEMCPY(&gpe_block->block_address, gpe_block_address,
                     sizeof(struct acpi_generic_address));
@@ -386,7 +386,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                 return_ACPI_STATUS(status);
         }
 
-        acpi_all_gpes_initialized = FALSE;
+        acpi_gbl_all_gpes_initialized = FALSE;
 
         /* Find all GPE methods (_Lxx or_Exx) for this block */
 
@@ -423,14 +423,12 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
  *
  * FUNCTION:    acpi_ev_initialize_gpe_block
  *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE block
- *              gpe_block           - Gpe Block info
+ * PARAMETERS:  acpi_gpe_callback
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Initialize and enable a GPE block. First find and run any
- *              _PRT methods associated with the block, then enable the
- *              appropriate GPEs.
+ * DESCRIPTION: Initialize and enable a GPE block. Enable GPEs that have
+ *              associated methods.
  *              Note: Assumes namespace is locked.
  *
  ******************************************************************************/
@@ -450,8 +448,8 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
         ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);
 
         /*
-         * Ignore a null GPE block (e.g., if no GPE block 1 exists) and
-         * GPE blocks that have been initialized already.
+         * Ignore a null GPE block (e.g., if no GPE block 1 exists), and
+         * any GPE blocks that have been initialized already.
          */
         if (!gpe_block || gpe_block->initialized) {
                 return_ACPI_STATUS(AE_OK);
@@ -459,8 +457,8 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
         /*
          * Enable all GPEs that have a corresponding method and have the
-         * ACPI_GPE_CAN_WAKE flag unset.  Any other GPEs within this block must
-         * be enabled via the acpi_enable_gpe() interface.
+         * ACPI_GPE_CAN_WAKE flag unset. Any other GPEs within this block
+         * must be enabled via the acpi_enable_gpe() interface.
          */
         gpe_enabled_count = 0;
 
@@ -472,14 +470,19 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                         gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j;
                         gpe_event_info = &gpe_block->event_info[gpe_index];
 
-                        /* Ignore GPEs that have no corresponding _Lxx/_Exx method */
-
-                        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD)
+                        /*
+                         * Ignore GPEs that have no corresponding _Lxx/_Exx method
+                         * and GPEs that are used to wake the system
+                         */
+                        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+                             ACPI_GPE_DISPATCH_NONE)
+                            || ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
+                                == ACPI_GPE_DISPATCH_HANDLER)
                             || (gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
                                 continue;
                         }
 
-                        status = acpi_raw_enable_gpe(gpe_event_info);
+                        status = acpi_ev_add_gpe_reference(gpe_event_info);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not enable GPE 0x%02X",
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 2c7def95f72..ce9aa9f9a97 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,11 +45,27 @@
 #include "accommon.h"
 #include "acevents.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeinit")
 
+/*
+ * Note: History of _PRW support in ACPICA
+ *
+ * Originally (2000 - 2010), the GPE initialization code performed a walk of
+ * the entire namespace to execute the _PRW methods and detect all GPEs
+ * capable of waking the system.
+ *
+ * As of 10/2010, the _PRW method execution has been removed since it is
+ * actually unnecessary. The host OS must in fact execute all _PRW methods
+ * in order to identify the device/power-resource dependencies. We now put
+ * the onus on the host OS to identify the wake GPEs as part of this process
+ * and to inform ACPICA of these GPEs via the acpi_setup_gpe_for_wake interface. This
+ * not only reduces the complexity of the ACPICA initialization code, but in
+ * some cases (on systems with very large namespaces) it should reduce the
+ * kernel boot time as well.
+ */
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_gpe_initialize
@@ -222,7 +238,7 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
         acpi_status status = AE_OK;
 
         /*
-         * 2) Find any _Lxx/_Exx GPE methods that have just been loaded.
+         * Find any _Lxx/_Exx GPE methods that have just been loaded.
          *
          * Any GPEs that correspond to new _Lxx/_Exx methods are immediately
          * enabled.
@@ -235,9 +251,9 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
                 return;
         }
 
+        walk_info.count = 0;
         walk_info.owner_id = table_owner_id;
         walk_info.execute_by_owner_id = TRUE;
-        walk_info.count = 0;
 
         /* Walk the interrupt level descriptor list */
 
@@ -298,7 +314,7 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
  *                  xx     - is the GPE number [in HEX]
  *
  * If walk_info->execute_by_owner_id is TRUE, we only execute examine GPE methods
- *    with that owner.
+ * with that owner.
  *
  ******************************************************************************/
 
@@ -408,10 +424,14 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
                 return_ACPI_STATUS(AE_OK);
         }
 
+        /* Disable the GPE in case it's been enabled already. */
+        (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
+
         /*
          * Add the GPE information from above to the gpe_event_info block for
          * use during dispatch of this GPE.
          */
+        gpe_event_info->flags &= ~(ACPI_GPE_DISPATCH_MASK);
         gpe_event_info->flags |= (u8)(type | ACPI_GPE_DISPATCH_METHOD);
         gpe_event_info->dispatch.method_node = method_node;
 
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 19a0e513ea4..80a81d0c4a8 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -154,6 +154,45 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ev_get_gpe_device
+ *
+ * PARAMETERS:  GPE_WALK_CALLBACK
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Matches the input GPE index (0-current_gpe_count) with a GPE
+ *              block device. NULL if the GPE is one of the FADT-defined GPEs.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context)
+{
+        struct acpi_gpe_device_info *info = context;
+
+        /* Increment Index by the number of GPEs in this block */
+
+        info->next_block_base_index += gpe_block->gpe_count;
+
+        if (info->index < info->next_block_base_index) {
+                /*
+                 * The GPE index is within this block, get the node. Leave the node
+                 * NULL for the FADT-defined GPEs
+                 */
+                if ((gpe_block->node)->type == ACPI_TYPE_DEVICE) {
+                        info->gpe_device = gpe_block->node;
+                }
+
+                info->status = AE_OK;
+                return (AE_CTRL_END);
+        }
+
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ev_get_gpe_xrupt_block
  *
  * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index fcaed9fb44f..7dc80946f7b 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -284,41 +284,39 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
  * RETURN:      ACPI_INTERRUPT_HANDLED
  *
  * DESCRIPTION: Invoked directly from the SCI handler when a global lock
- *              release interrupt occurs. Attempt to acquire the global lock,
- *              if successful, signal the thread waiting for the lock.
+ *              release interrupt occurs.  If there's a thread waiting for
+ *              the global lock, signal it.
  *
  * NOTE: Assumes that the semaphore can be signaled from interrupt level. If
  * this is not possible for some reason, a separate thread will have to be
  * scheduled to do this.
  *
  ******************************************************************************/
+static u8 acpi_ev_global_lock_pending;
 
 static u32 acpi_ev_global_lock_handler(void *context)
 {
-        u8 acquired = FALSE;
+        acpi_status status;
+        acpi_cpu_flags flags;
 
-        /*
-         * Attempt to get the lock.
-         *
-         * If we don't get it now, it will be marked pending and we will
-         * take another interrupt when it becomes free.
-         */
-        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
-        if (acquired) {
+        flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
 
-                /* Got the lock, now wake all threads waiting for it */
+        if (!acpi_ev_global_lock_pending) {
+                goto out;
+        }
 
-                acpi_gbl_global_lock_acquired = TRUE;
-                /* Send a unit to the semaphore */
+        /* Send a unit to the semaphore */
 
-                if (ACPI_FAILURE
-                    (acpi_os_signal_semaphore
-                     (acpi_gbl_global_lock_semaphore, 1))) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not signal Global Lock semaphore"));
-                }
+        status = acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore, 1);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not signal Global Lock semaphore"));
         }
 
+        acpi_ev_global_lock_pending = FALSE;
+
+ out:
+        acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
+
         return (ACPI_INTERRUPT_HANDLED);
 }
 
@@ -415,6 +413,7 @@ static int acpi_ev_global_lock_acquired;
 
 acpi_status acpi_ev_acquire_global_lock(u16 timeout)
 {
+        acpi_cpu_flags flags;
         acpi_status status = AE_OK;
         u8 acquired = FALSE;
 
@@ -467,32 +466,47 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
                 return_ACPI_STATUS(AE_OK);
         }
 
-        /* Attempt to acquire the actual hardware lock */
+        flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
+
+        do {
+
+                /* Attempt to acquire the actual hardware lock */
+
+                ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
+                if (acquired) {
+                        acpi_gbl_global_lock_acquired = TRUE;
+
+                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                          "Acquired hardware Global Lock\n"));
+                        break;
+                }
 
-        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
-        if (acquired) {
+                acpi_ev_global_lock_pending = TRUE;
 
-                /* We got the lock */
+                acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
 
+                /*
+                 * Did not get the lock. The pending bit was set above, and we
+                 * must wait until we get the global lock released interrupt.
+                 */
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Acquired hardware Global Lock\n"));
+                                  "Waiting for hardware Global Lock\n"));
 
-                acpi_gbl_global_lock_acquired = TRUE;
-                return_ACPI_STATUS(AE_OK);
-        }
+                /*
+                 * Wait for handshake with the global lock interrupt handler.
+                 * This interface releases the interpreter if we must wait.
+                 */
+                status = acpi_ex_system_wait_semaphore(
+                                                acpi_gbl_global_lock_semaphore,
+                                                ACPI_WAIT_FOREVER);
 
-        /*
-         * Did not get the lock. The pending bit was set above, and we must now
-         * wait until we get the global lock released interrupt.
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Waiting for hardware Global Lock\n"));
+                flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
 
-        /*
-         * Wait for handshake with the global lock interrupt handler.
-         * This interface releases the interpreter if we must wait.
-         */
-        status = acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,
-                                               ACPI_WAIT_FOREVER);
+        } while (ACPI_SUCCESS(status));
+
+        acpi_ev_global_lock_pending = FALSE;
+
+        acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
 
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 98fd210e87b..bea7223d7a7 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -231,6 +231,8 @@ acpi_status acpi_ev_initialize_op_regions(void)
                 }
         }
 
+        acpi_gbl_reg_methods_executed = TRUE;
+
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 0b47a6dc929..9659cee6093 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -590,9 +590,9 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                                  * See acpi_ns_exec_module_code
                                  */
                                 if (obj_desc->method.
-                                    flags & AOPOBJ_MODULE_LEVEL) {
+                                    info_flags & ACPI_METHOD_MODULE_LEVEL) {
                                         handler_obj =
-                                            obj_desc->method.extra.handler;
+                                            obj_desc->method.dispatch.handler;
                                 }
                                 break;
 
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 8dfbaa96e42..2ebd40e1a3e 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/evxface.c b/drivers/acpi/acpica/evxface.c
index 36af222cac6..e1141402dbe 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,6 +92,57 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_global_event_handler
+ *
+ * PARAMETERS:  Handler         - Pointer to the global event handler function
+ *              Context         - Value passed to the handler on each event
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Saves the pointer to the handler function. The global handler
+ *              is invoked upon each incoming GPE and Fixed Event. It is
+ *              invoked at interrupt level at the time of the event dispatch.
+ *              Can be used to update event counters, etc.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_install_global_event_handler);
+
+        /* Parameter validation */
+
+        if (!handler) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Don't allow two handlers. */
+
+        if (acpi_gbl_global_event_handler) {
+                status = AE_ALREADY_EXISTS;
+                goto cleanup;
+        }
+
+        acpi_gbl_global_event_handler = handler;
+        acpi_gbl_global_event_handler_context = context;
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_global_event_handler)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_fixed_event_handler
@@ -671,10 +722,10 @@ ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
 acpi_status
 acpi_install_gpe_handler(acpi_handle gpe_device,
                          u32 gpe_number,
-                         u32 type, acpi_event_handler address, void *context)
+                         u32 type, acpi_gpe_handler address, void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -693,7 +744,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         /* Allocate memory for the handler object */
 
-        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_handler_info));
+        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_handler_info));
         if (!handler) {
                 status = AE_NO_MEMORY;
                 goto unlock_and_exit;
@@ -722,7 +773,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         handler->address = address;
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
-        handler->orig_flags = gpe_event_info->flags &
+        handler->original_flags = gpe_event_info->flags &
                         (ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
 
         /*
@@ -731,10 +782,10 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
          * disabled now to avoid spurious execution of the handler.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
             && gpe_event_info->runtime_count) {
-                handler->orig_enabled = 1;
-                (void)acpi_raw_disable_gpe(gpe_event_info);
+                handler->originally_enabled = 1;
+                (void)acpi_ev_remove_gpe_reference(gpe_event_info);
         }
 
         /* Install the handler */
@@ -777,10 +828,10 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)
  ******************************************************************************/
 acpi_status
 acpi_remove_gpe_handler(acpi_handle gpe_device,
-                        u32 gpe_number, acpi_event_handler address)
+                        u32 gpe_number, acpi_gpe_handler address)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -835,7 +886,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
         gpe_event_info->dispatch.method_node = handler->method_node;
         gpe_event_info->flags &=
                 ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
-        gpe_event_info->flags |= handler->orig_flags;
+        gpe_event_info->flags |= handler->original_flags;
 
         /*
          * If the GPE was previously associated with a method and it was
@@ -843,9 +894,9 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
          * post-initialization configuration.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
-            && handler->orig_enabled)
-                (void)acpi_raw_enable_gpe(gpe_event_info);
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
+            && handler->originally_enabled)
+                (void)acpi_ev_add_gpe_reference(gpe_event_info);
 
         /* Now we can free the handler object */
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index a1dabe3fd8a..c57b5c707a7 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,18 +43,11 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acevents.h"
-#include "acnamesp.h"
 #include "actables.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
 
-/* Local prototypes */
-static acpi_status
-acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                       struct acpi_gpe_block_info *gpe_block, void *context);
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable
@@ -213,185 +206,6 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_gpe_wakeup
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *              Action          - Enable or Disable
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Set or clear the GPE's wakeup enable mask bit.
- *
- ******************************************************************************/
-acpi_status acpi_gpe_wakeup(acpi_handle gpe_device, u32 gpe_number, u8 action)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_gpe_register_info *gpe_register_info;
-        acpi_cpu_flags flags;
-        u32 register_bit;
-
-        ACPI_FUNCTION_TRACE(acpi_gpe_wakeup);
-
-        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 || !(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        gpe_register_info = gpe_event_info->register_info;
-        if (!gpe_register_info) {
-                status = AE_NOT_EXIST;
-                goto unlock_and_exit;
-        }
-
-        register_bit =
-            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
-
-        /* Perform the action */
-
-        switch (action) {
-        case ACPI_GPE_ENABLE:
-                ACPI_SET_BIT(gpe_register_info->enable_for_wake,
-                             (u8)register_bit);
-                break;
-
-        case ACPI_GPE_DISABLE:
-                ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
-                               (u8)register_bit);
-                break;
-
-        default:
-                ACPI_ERROR((AE_INFO, "%u, Invalid action", action));
-                status = AE_BAD_PARAMETER;
-                break;
-        }
-
-unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_gpe_wakeup)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enable_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
- *              hardware-enabled.
- *
- ******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
-
-        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 = acpi_raw_enable_gpe(gpe_event_info);
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_disable_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove a reference to a GPE. When the last reference is
- *              removed, only then is the GPE disabled (for runtime GPEs), or
- *              the GPE mask bit disabled (for wake GPEs)
- *
- ******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
-
-        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 = acpi_raw_disable_gpe(gpe_event_info) ;
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_gpe_can_wake
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Set the ACPI_GPE_CAN_WAKE flag for the given GPE.  If the GPE
- *              has a corresponding method and is currently enabled, disable it
- *              (GPEs with corresponding methods are enabled unconditionally
- *              during initialization, but GPEs that can wake up are expected
- *              to be initially disabled).
- *
- ******************************************************************************/
-acpi_status acpi_gpe_can_wake(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_gpe_can_wake);
-
-        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) {
-                gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
-        } else {
-                status = AE_BAD_PARAMETER;
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_gpe_can_wake)
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_disable_event
  *
  * PARAMETERS:  Event           - The fixed eventto be enabled
@@ -483,44 +297,6 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_clear_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Clear an ACPI event (general purpose)
- *
- ******************************************************************************/
-acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
-
-        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;
-        }
-
-        status = acpi_hw_clear_gpe(gpe_event_info);
-
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-/*******************************************************************************
- *
  * FUNCTION:    acpi_get_event_status
  *
  * PARAMETERS:  Event           - The fixed event
@@ -575,379 +351,3 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_event_status)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_gpe_status
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *              event_status    - Where the current status of the event will
- *                                be returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get status of an event (general purpose)
- *
- ******************************************************************************/
-acpi_status
-acpi_get_gpe_status(acpi_handle gpe_device,
-                    u32 gpe_number, acpi_event_status *event_status)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
-
-        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;
-        }
-
-        /* Obtain status on the requested GPE number */
-
-        status = acpi_hw_get_gpe_status(gpe_event_info, event_status);
-
-        if (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
-                *event_status |= ACPI_EVENT_FLAG_HANDLE;
-
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_install_gpe_block
- *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *              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
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create and Install a block of GPE registers
- *
- ******************************************************************************/
-acpi_status
-acpi_install_gpe_block(acpi_handle gpe_device,
-                       struct acpi_generic_address *gpe_block_address,
-                       u32 register_count, u32 interrupt_number)
-{
-        acpi_status status = AE_OK;
-        union acpi_operand_object *obj_desc;
-        struct acpi_namespace_node *node;
-        struct acpi_gpe_block_info *gpe_block;
-
-        ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
-
-        if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        node = acpi_ns_validate_handle(gpe_device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        /*
-         * For user-installed GPE Block Devices, the gpe_block_base_number
-         * is always zero
-         */
-        status =
-            acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
-                                     interrupt_number, &gpe_block);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
-        }
-
-        /* Install block in the device_object attached to the node */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc) {
-
-                /*
-                 * No object, create a new one (Device nodes do not always have
-                 * an attached object)
-                 */
-                obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
-                if (!obj_desc) {
-                        status = AE_NO_MEMORY;
-                        goto unlock_and_exit;
-                }
-
-                status =
-                    acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);
-
-                /* Remove local reference to the object */
-
-                acpi_ut_remove_reference(obj_desc);
-
-                if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
-                }
-        }
-
-        /* Now install the GPE block in the device_object */
-
-        obj_desc->device.gpe_block = gpe_block;
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_remove_gpe_block
- *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove a previously installed block of GPE registers
- *
- ******************************************************************************/
-acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
-{
-        union acpi_operand_object *obj_desc;
-        acpi_status status;
-        struct acpi_namespace_node *node;
-
-        ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
-
-        if (!gpe_device) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        node = acpi_ns_validate_handle(gpe_device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        /* Get the device_object attached to the node */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc || !obj_desc->device.gpe_block) {
-                return_ACPI_STATUS(AE_NULL_OBJECT);
-        }
-
-        /* Delete the GPE block (but not the device_object) */
-
-        status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block);
-        if (ACPI_SUCCESS(status)) {
-                obj_desc->device.gpe_block = NULL;
-        }
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_gpe_device
- *
- * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
- *              gpe_device          - Where the parent GPE Device is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Obtain the GPE device associated with the input index. A NULL
- *              gpe device indicates that the gpe number is contained in one of
- *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
- *
- ******************************************************************************/
-acpi_status
-acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
-{
-        struct acpi_gpe_device_info info;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_get_gpe_device);
-
-        if (!gpe_device) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        if (index >= acpi_current_gpe_count) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-
-        /* Setup and walk the GPE list */
-
-        info.index = index;
-        info.status = AE_NOT_EXIST;
-        info.gpe_device = NULL;
-        info.next_block_base_index = 0;
-
-        status = acpi_ev_walk_gpe_list(acpi_ev_get_gpe_device, &info);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        *gpe_device = info.gpe_device;
-        return_ACPI_STATUS(info.status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_get_gpe_device
- *
- * PARAMETERS:  GPE_WALK_CALLBACK
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Matches the input GPE index (0-current_gpe_count) with a GPE
- *              block device. NULL if the GPE is one of the FADT-defined GPEs.
- *
- ******************************************************************************/
-static acpi_status
-acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                       struct acpi_gpe_block_info *gpe_block, void *context)
-{
-        struct acpi_gpe_device_info *info = context;
-
-        /* Increment Index by the number of GPEs in this block */
-
-        info->next_block_base_index += gpe_block->gpe_count;
-
-        if (info->index < info->next_block_base_index) {
-                /*
-                 * The GPE index is within this block, get the node. Leave the node
-                 * NULL for the FADT-defined GPEs
-                 */
-                if ((gpe_block->node)->type == ACPI_TYPE_DEVICE) {
-                        info->gpe_device = gpe_block->node;
-                }
-
-                info->status = AE_OK;
-                return (AE_CTRL_END);
-        }
-
-        return (AE_OK);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_disable_all_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Disable and clear all GPEs in all GPE blocks
- *
- ******************************************************************************/
-
-acpi_status acpi_disable_all_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_disable_all_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_hw_disable_all_gpes();
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_enable_all_runtime_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Enable all "runtime" GPEs, in all GPE blocks
- *
- ******************************************************************************/
-
-acpi_status acpi_enable_all_runtime_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_enable_all_runtime_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_hw_enable_all_runtime_gpes();
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_update_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Enable all GPEs that have associated _Lxx or _Exx methods and
- *              are not pointed to by any device _PRW methods indicating that
- *              these GPEs are generally intended for system or device wakeup
- *              (such GPEs have to be enabled directly when the devices whose
- *              _PRW methods point to them are set up for wakeup signaling).
- *
- ******************************************************************************/
-
-acpi_status acpi_update_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_update_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        } else if (acpi_all_gpes_initialized) {
-                goto unlock;
-        }
-
-        status = acpi_ev_walk_gpe_list(acpi_ev_initialize_gpe_block, NULL);
-        if (ACPI_SUCCESS(status)) {
-                acpi_all_gpes_initialized = TRUE;
-        }
-
-unlock:
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
new file mode 100644
index 00000000000..52aaff3df56
--- /dev/null
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -0,0 +1,696 @@
+/******************************************************************************
+ *
+ * Module Name: evxfgpe - External Interfaces for General Purpose Events (GPEs)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, 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 "acevents.h"
+#include "acnamesp.h"
+
+#define _COMPONENT          ACPI_EVENTS
+ACPI_MODULE_NAME("evxfgpe")
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_update_all_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Complete GPE initialization and enable all GPEs that have
+ *              associated _Lxx or _Exx methods and are not pointed to by any
+ *              device _PRW methods (this indicates that these GPEs are
+ *              generally intended for system or device wakeup. Such GPEs
+ *              have to be enabled directly when the devices whose _PRW
+ *              methods point to them are set up for wakeup signaling.)
+ *
+ * NOTE: Should be called after any GPEs are added to the system. Primarily,
+ * after the system _PRW methods have been run, but also after a GPE Block
+ * Device has been added or if any new GPE methods have been added via a
+ * dynamic table load.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_update_all_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_update_all_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        if (acpi_gbl_all_gpes_initialized) {
+                goto unlock_and_exit;
+        }
+
+        status = acpi_ev_walk_gpe_list(acpi_ev_initialize_gpe_block, NULL);
+        if (ACPI_SUCCESS(status)) {
+                acpi_gbl_all_gpes_initialized = TRUE;
+        }
+
+unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_update_all_gpes)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
+ *              hardware-enabled.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+
+        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 = acpi_ev_add_gpe_reference(gpe_event_info);
+        }
+
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_disable_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a reference to a GPE. When the last reference is
+ *              removed, only then is the GPE disabled (for runtime GPEs), or
+ *              the GPE mask bit disabled (for wake GPEs)
+ *
+ ******************************************************************************/
+
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+
+        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 = acpi_ev_remove_gpe_reference(gpe_event_info) ;
+        }
+
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_setup_gpe_for_wake
+ *
+ * PARAMETERS:  wake_device         - Device associated with the GPE (via _PRW)
+ *              gpe_device          - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number          - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Mark a GPE as having the ability to wake the system. This
+ *              interface is intended to be used as the host executes the
+ *              _PRW methods (Power Resources for Wake) in the system tables.
+ *              Each _PRW appears under a Device Object (The wake_device), and
+ *              contains the info for the wake GPE associated with the
+ *              wake_device.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_setup_gpe_for_wake(acpi_handle wake_device,
+                        acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_namespace_node *device_node;
+        struct acpi_gpe_notify_object *notify_object;
+        acpi_cpu_flags flags;
+        u8 gpe_dispatch_mask;
+
+        ACPI_FUNCTION_TRACE(acpi_setup_gpe_for_wake);
+
+        /* Parameter Validation */
+
+        if (!wake_device) {
+                /*
+                 * By forcing wake_device to be valid, we automatically enable the
+                 * implicit notify feature on all hosts.
+                 */
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        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) {
+                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 (aka
+         * "implicit notify") Note: The GPE is assumed to be
+         * level-triggered (for windows compatibility).
+         */
+        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;
+        }
+
+        /* Validate wake_device is of type Device */
+
+        device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
+        if (device_node->type != ACPI_TYPE_DEVICE) {
+                goto unlock_and_exit;
+        }
+
+        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:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_set_gpe_wake_mask
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *              Action          - Enable or Disable
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Set or clear the GPE's wakeup enable mask bit. The GPE must
+ *              already be marked as a WAKE GPE.
+ *
+ ******************************************************************************/
+
+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;
+        struct acpi_gpe_register_info *gpe_register_info;
+        acpi_cpu_flags flags;
+        u32 register_bit;
+
+        ACPI_FUNCTION_TRACE(acpi_set_gpe_wake_mask);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /*
+         * Ensure that we have a valid GPE number and that this GPE is in
+         * fact a wake GPE
+         */
+        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 (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+                status = AE_TYPE;
+                goto unlock_and_exit;
+        }
+
+        gpe_register_info = gpe_event_info->register_info;
+        if (!gpe_register_info) {
+                status = AE_NOT_EXIST;
+                goto unlock_and_exit;
+        }
+
+        register_bit =
+            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
+
+        /* Perform the action */
+
+        switch (action) {
+        case ACPI_GPE_ENABLE:
+                ACPI_SET_BIT(gpe_register_info->enable_for_wake,
+                             (u8)register_bit);
+                break;
+
+        case ACPI_GPE_DISABLE:
+                ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
+                               (u8)register_bit);
+                break;
+
+        default:
+                ACPI_ERROR((AE_INFO, "%u, Invalid action", action));
+                status = AE_BAD_PARAMETER;
+                break;
+        }
+
+unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_set_gpe_wake_mask)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_clear_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Clear an ACPI event (general purpose)
+ *
+ ******************************************************************************/
+acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_OK;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
+
+        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;
+        }
+
+        status = acpi_hw_clear_gpe(gpe_event_info);
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_gpe_status
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *              event_status    - Where the current status of the event will
+ *                                be returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get the current status of a GPE (signalled/not_signalled)
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_gpe_status(acpi_handle gpe_device,
+                    u32 gpe_number, acpi_event_status *event_status)
+{
+        acpi_status status = AE_OK;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
+
+        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;
+        }
+
+        /* Obtain status on the requested GPE number */
+
+        status = acpi_hw_get_gpe_status(gpe_event_info, event_status);
+
+        if (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
+                *event_status |= ACPI_EVENT_FLAG_HANDLE;
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_disable_all_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Disable and clear all GPEs in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_disable_all_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_disable_all_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_disable_all_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_disable_all_gpes)
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_all_runtime_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Enable all "runtime" GPEs, in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_enable_all_runtime_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_all_runtime_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_enable_all_runtime_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+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
+ *              register_count      - Number of GPE register pairs in the block
+ *              interrupt_number    - H/W interrupt for the block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create and Install a block of GPE registers. The GPEs are not
+ *              enabled here.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_gpe_block(acpi_handle gpe_device,
+                       struct acpi_generic_address *gpe_block_address,
+                       u32 register_count, u32 interrupt_number)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        struct acpi_namespace_node *node;
+        struct acpi_gpe_block_info *gpe_block;
+
+        ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
+
+        if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        node = acpi_ns_validate_handle(gpe_device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /*
+         * For user-installed GPE Block Devices, the gpe_block_base_number
+         * is always zero
+         */
+        status =
+            acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
+                                     interrupt_number, &gpe_block);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+
+        /* Install block in the device_object attached to the node */
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
+
+                /*
+                 * No object, create a new one (Device nodes do not always have
+                 * an attached object)
+                 */
+                obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
+                if (!obj_desc) {
+                        status = AE_NO_MEMORY;
+                        goto unlock_and_exit;
+                }
+
+                status =
+                    acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);
+
+                /* Remove local reference to the object */
+
+                acpi_ut_remove_reference(obj_desc);
+
+                if (ACPI_FAILURE(status)) {
+                        goto unlock_and_exit;
+                }
+        }
+
+        /* Now install the GPE block in the device_object */
+
+        obj_desc->device.gpe_block = gpe_block;
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_remove_gpe_block
+ *
+ * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a previously installed block of GPE registers
+ *
+ ******************************************************************************/
+acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
+{
+        union acpi_operand_object *obj_desc;
+        acpi_status status;
+        struct acpi_namespace_node *node;
+
+        ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
+
+        if (!gpe_device) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        node = acpi_ns_validate_handle(gpe_device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /* Get the device_object attached to the node */
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc || !obj_desc->device.gpe_block) {
+                return_ACPI_STATUS(AE_NULL_OBJECT);
+        }
+
+        /* Delete the GPE block (but not the device_object) */
+
+        status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block);
+        if (ACPI_SUCCESS(status)) {
+                obj_desc->device.gpe_block = NULL;
+        }
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_gpe_device
+ *
+ * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
+ *              gpe_device          - Where the parent GPE Device is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Obtain the GPE device associated with the input index. A NULL
+ *              gpe device indicates that the gpe number is contained in one of
+ *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
+{
+        struct acpi_gpe_device_info info;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_device);
+
+        if (!gpe_device) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        if (index >= acpi_current_gpe_count) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Setup and walk the GPE list */
+
+        info.index = index;
+        info.status = AE_NOT_EXIST;
+        info.gpe_device = NULL;
+        info.next_block_base_index = 0;
+
+        status = acpi_ev_walk_gpe_list(acpi_ev_get_gpe_device, &info);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        *gpe_device = ACPI_CAST_PTR(acpi_handle, info.gpe_device);
+        return_ACPI_STATUS(info.status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index ce9314f7945..c85c8c45599 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,9 +110,39 @@ acpi_install_address_space_handler(acpi_handle device,
                 goto unlock_and_exit;
         }
 
-        /* Run all _REG methods for this address space */
+        /*
+         * 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
+         * 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.
+         * This means that for IDs like embedded_controller, this function should be called
+         * only after acpi_enable_subsystem has been called.
+         */
+        switch (space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+        case ACPI_ADR_SPACE_DATA_TABLE:
+
+                if (acpi_gbl_reg_methods_executed) {
+
+                        /* Run all _REG methods for this address space */
+
+                        status = acpi_ev_execute_reg_methods(node, space_id);
+                }
+                break;
+
+        default:
 
-        status = acpi_ev_execute_reg_methods(node, space_id);
+                status = acpi_ev_execute_reg_methods(node, space_id);
+                break;
+        }
 
       unlock_and_exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 18832205b63..745a42b401f 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index b73bc50c5b7..74162a11817 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/excreate.c b/drivers/acpi/acpica/excreate.c
index 3c61b48c73f..e7b372d1766 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -482,13 +482,11 @@ acpi_ex_create_method(u8 * aml_start,
         obj_desc->method.aml_length = aml_length;
 
         /*
-         * Disassemble the method flags. Split off the Arg Count
-         * for efficiency
+         * Disassemble the method flags. Split off the arg_count, Serialized
+         * flag, and sync_level for efficiency.
          */
         method_flags = (u8) operand[1]->integer.value;
 
-        obj_desc->method.method_flags =
-            (u8) (method_flags & ~AML_METHOD_ARG_COUNT);
         obj_desc->method.param_count =
             (u8) (method_flags & AML_METHOD_ARG_COUNT);
 
@@ -497,6 +495,8 @@ acpi_ex_create_method(u8 * aml_start,
          * created for this method when it is parsed.
          */
         if (method_flags & AML_METHOD_SERIALIZED) {
+                obj_desc->method.info_flags = ACPI_METHOD_SERIALIZED;
+
                 /*
                  * ACPI 1.0: sync_level = 0
                  * ACPI 2.0: sync_level = sync_level in method declaration
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index be8c98b480d..c7a2f1edd28 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exdump.c b/drivers/acpi/acpica/exdump.c
index f067bbb0d96..61b8c0e8b74 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -122,7 +122,7 @@ static struct acpi_exdump_info acpi_ex_dump_event[2] = {
 
 static struct acpi_exdump_info acpi_ex_dump_method[9] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},
-        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.method_flags), "Method Flags"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.info_flags), "Info Flags"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count),
          "Parameter Count"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.sync_level), "Sync Level"},
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index f17d2ff0031..0bde2230c02 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 38293fd3e08..f915a7f3f92 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -280,13 +280,13 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
                         ACPI_ERROR((AE_INFO,
-                                    "Region %s(0x%X) not implemented",
+                                    "Region %s (ID=%u) not implemented",
                                     acpi_ut_get_region_name(rgn_desc->region.
                                                             space_id),
                                     rgn_desc->region.space_id));
                 } else if (status == AE_NOT_EXIST) {
                         ACPI_ERROR((AE_INFO,
-                                    "Region %s(0x%X) has no handler",
+                                    "Region %s (ID=%u) has no handler",
                                     acpi_ut_get_region_name(rgn_desc->region.
                                                             space_id),
                                     rgn_desc->region.space_id));
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 95db4be0877..703d88ed0b3 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 6af14e43f83..be1c56ead65 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exnames.c b/drivers/acpi/acpica/exnames.c
index d11e539ef76..49ec049c157 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 84e4d185aa2..236ead14b7f 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 10e104cf0fb..2571b4a310f 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 7a08d23befc..1b48d9d28c9 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 4b50730cf9a..f4a2787e8e9 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exprep.c b/drivers/acpi/acpica/exprep.c
index 7aae29f73d3..cc95e200040 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exregion.c b/drivers/acpi/acpica/exregion.c
index de17e10da0e..f0d5e14f1f2 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 1fa4289a687..55997e46948 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 7ca35ea8ace..db502cd7d93 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exresop.c b/drivers/acpi/acpica/exresop.c
index 8c97cfd6a0f..e3bb00ccdff 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exstore.c b/drivers/acpi/acpica/exstore.c
index 1624436ba4c..c0c8842dd34 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exstoren.c b/drivers/acpi/acpica/exstoren.c
index d4af684620c..a979017d56b 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exstorob.c b/drivers/acpi/acpica/exstorob.c
index e972b667b09..dc665cc554d 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 675aaa91a77..df66e7b686b 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/exutils.c b/drivers/acpi/acpica/exutils.c
index 4093522eed4..8ad93146dd3 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index b44274a0b62..fc380d3d45a 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 14750db2a1b..f610d88a66b 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,10 +62,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  * PARAMETERS:  gpe_event_info      - Info block for the GPE
  *              gpe_register_info   - Info block for the GPE register
  *
- * RETURN:      Status
+ * RETURN:      Register mask with a one in the GPE bit position
  *
- * DESCRIPTION: Compute GPE enable mask with one bit corresponding to the given
- *              GPE set.
+ * DESCRIPTION: Compute the register mask for this GPE. One bit is set in the
+ *              correct position for the input GPE.
  *
  ******************************************************************************/
 
@@ -85,12 +85,12 @@ u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enable or disable a single GPE in its enable register.
+ * DESCRIPTION: Enable or disable a single GPE in the parent enable register.
  *
  ******************************************************************************/
 
 acpi_status
-acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
+acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
 {
         struct acpi_gpe_register_info *gpe_register_info;
         acpi_status status;
@@ -113,14 +113,20 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
                 return (status);
         }
 
-        /* Set ot clear just the bit that corresponds to this GPE */
+        /* Set or clear just the bit that corresponds to this GPE */
 
         register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
                                                 gpe_register_info);
         switch (action) {
-        case ACPI_GPE_COND_ENABLE:
-                if (!(register_bit & gpe_register_info->enable_for_run))
+        case ACPI_GPE_CONDITIONAL_ENABLE:
+
+                /* Only enable if the enable_for_run bit is set */
+
+                if (!(register_bit & gpe_register_info->enable_for_run)) {
                         return (AE_BAD_PARAMETER);
+                }
+
+                /*lint -fallthrough */
 
         case ACPI_GPE_ENABLE:
                 ACPI_SET_BIT(enable_mask, register_bit);
@@ -131,7 +137,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Invalid action\n"));
+                ACPI_ERROR((AE_INFO, "Invalid GPE Action, %u\n", action));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -168,13 +174,13 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
                 return (AE_NOT_EXIST);
         }
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
-                                                gpe_register_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, gpe_register_info);
+
         status = acpi_hw_write(register_bit,
                                &gpe_register_info->status_address);
 
@@ -201,8 +207,8 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
         u32 in_byte;
         u32 register_bit;
         struct acpi_gpe_register_info *gpe_register_info;
-        acpi_status status;
         acpi_event_status local_event_status = 0;
+        acpi_status status;
 
         ACPI_FUNCTION_ENTRY();
 
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index ad21c7d8bf4..050fd227951 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 5d1273b660a..55accb7018b 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 3796811276a..2ac28bbe882 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 1ef8e0bb250..9c8eb71a12f 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index e1d9c777b21..5f160587465 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 50cc3be7772..f75f81ad15c 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80,14 +80,14 @@ acpi_status acpi_reset(void)
 
         if (reset_reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
                 /*
-                 * For I/O space, write directly to the OSL. This bypasses the port
-                 * validation mechanism, which may block a valid write to the reset
-                 * register.
+                 * For I/O space, write directly to the OSL. This
+                 * bypasses the port validation mechanism, which may
+                 * block a valid write to the reset register. Spec
+                 * section 4.7.3.6 requires register width to be 8.
                  */
                 status =
                     acpi_os_write_port((acpi_io_address) reset_reg->address,
-                                       acpi_gbl_FADT.reset_value,
-                                       reset_reg->bit_width);
+                                       acpi_gbl_FADT.reset_value, 8);
         } else {
                 /* Write the reset value to the reset register */
 
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 0cd925be5fc..d93172fd15a 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -163,9 +163,9 @@ acpi_status acpi_ns_root_initialize(void)
 #else
                                 /* Mark this as a very SPECIAL method */
 
-                                obj_desc->method.method_flags =
-                                    AML_METHOD_INTERNAL_ONLY;
-                                obj_desc->method.extra.implementation =
+                                obj_desc->method.info_flags =
+                                    ACPI_METHOD_INTERNAL_ONLY;
+                                obj_desc->method.dispatch.implementation =
                                     acpi_ut_osi_implementation;
 #endif
                                 break;
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 1e5ff803d9a..1d0ef15d158 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,8 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
                          * modified the namespace. This is used for cleanup when the
                          * method exits.
                          */
-                        walk_state->method_desc->method.flags |=
-                            AOPOBJ_MODIFIED_NAMESPACE;
+                        walk_state->method_desc->method.info_flags |=
+                            ACPI_METHOD_MODIFIED_NAMESPACE;
                 }
         }
 
@@ -341,6 +341,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
 {
         struct acpi_namespace_node *child_node = NULL;
         u32 level = 1;
+        acpi_status status;
 
         ACPI_FUNCTION_TRACE(ns_delete_namespace_subtree);
 
@@ -348,6 +349,13 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
                 return_VOID;
         }
 
+        /* Lock namespace for possible update */
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_VOID;
+        }
+
         /*
          * Traverse the tree of objects until we bubble back up
          * to where we started.
@@ -397,6 +405,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
                 }
         }
 
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_VOID;
 }
 
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index a54dc39e304..b683cc2ff9d 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -624,9 +624,22 @@ acpi_ns_dump_objects(acpi_object_type type,
                      acpi_owner_id owner_id, acpi_handle start_handle)
 {
         struct acpi_walk_info info;
+        acpi_status status;
 
         ACPI_FUNCTION_ENTRY();
 
+        /*
+         * Just lock the entire namespace for the duration of the dump.
+         * We don't want any changes to the namespace during this time,
+         * especially the temporary nodes since we are going to display
+         * them also.
+         */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_printf("Could not acquire namespace mutex\n");
+                return;
+        }
+
         info.debug_level = ACPI_LV_TABLES;
         info.owner_id = owner_id;
         info.display_type = display_type;
@@ -636,6 +649,8 @@ acpi_ns_dump_objects(acpi_object_type type,
                                      ACPI_NS_WALK_TEMP_NODES,
                                      acpi_ns_dump_one_object, NULL,
                                      (void *)&info, NULL);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 }
 #endif                          /* ACPI_FUTURE_USAGE */
 
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index d2a97921e24..2ed294b7a4d 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nseval.c b/drivers/acpi/acpica/nseval.c
index f52829cc294..c1bd02b1a05 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -389,7 +389,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
          * acpi_gbl_root_node->Object is NULL at PASS1.
          */
         if ((type == ACPI_TYPE_DEVICE) && parent_node->object) {
-                method_obj->method.extra.handler =
+                method_obj->method.dispatch.handler =
                     parent_node->object->device.handler;
         }
 
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 660a2728908..fd7c6380e29 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -577,9 +577,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
          * as possible (without an NMI being received in the middle of
          * this) - so disable NMIs and initialize the device:
          */
-        acpi_nmi_disable();
         status = acpi_ns_evaluate(info);
-        acpi_nmi_enable();
 
         if (ACPI_SUCCESS(status)) {
                 walk_info->num_INI++;
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index df18be94fef..5f7dc691c18 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsnames.c b/drivers/acpi/acpica/nsnames.c
index d3104af57e1..d5fa520c3de 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 41a9213dd5a..3bb8bf105ea 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 5808c89e9fa..b3234fa795b 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 7096bcda0c7..9fb03fa8ffd 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index d1c13669266..1d76ac85b5e 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 4ef9f43ea92..973883babee 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 41102a84272..28b0d7a62b9 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsutils.c b/drivers/acpi/acpica/nsutils.c
index a7d6ad9c111..cb1b104a69a 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 2cd5be8fe10..345f0c3c6ad 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index ebef8a7fd70..c53f0040e49 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index b01e45a415e..3fd4526f3db 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -603,10 +603,9 @@ acpi_status acpi_install_method(u8 *buffer)
         method_obj->method.param_count = (u8)
             (method_flags & AML_METHOD_ARG_COUNT);
 
-        method_obj->method.method_flags = (u8)
-            (method_flags & ~AML_METHOD_ARG_COUNT);
-
         if (method_flags & AML_METHOD_SERIALIZED) {
+                method_obj->method.info_flags = ACPI_METHOD_SERIALIZED;
+
                 method_obj->method.sync_level = (u8)
                     ((method_flags & AML_METHOD_SYNC_LEVEL) >> 4);
         }
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index a1f04e9b803..db7660f8b86 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/psargs.c b/drivers/acpi/acpica/psargs.c
index 7df1a4c9527..e1fad0ee013 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/psloop.c b/drivers/acpi/acpica/psloop.c
index 2f2e7760938..01dd70d1de5 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -655,7 +655,7 @@ acpi_ps_link_module_code(union acpi_parse_object *parent_op,
                 method_obj->method.aml_start = aml_start;
                 method_obj->method.aml_length = aml_length;
                 method_obj->method.owner_id = owner_id;
-                method_obj->method.flags |= AOPOBJ_MODULE_LEVEL;
+                method_obj->method.info_flags |= ACPI_METHOD_MODULE_LEVEL;
 
                 /*
                  * Save the parent node in next_object. This is cheating, but we
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 2b0c3be2b1b..bed08de7528 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/psparse.c b/drivers/acpi/acpica/psparse.c
index 8d81542194d..9bb0cbd37b5 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,6 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "amlcode.h"
-#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_PARSER
@@ -539,24 +538,16 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                         /* Check for possible multi-thread reentrancy problem */
 
                         if ((status == AE_ALREADY_EXISTS) &&
-                            (!walk_state->method_desc->method.mutex)) {
-                                ACPI_INFO((AE_INFO,
-                                           "Marking method %4.4s as Serialized because of AE_ALREADY_EXISTS error",
-                                           walk_state->method_node->name.
-                                           ascii));
-
+                            (!(walk_state->method_desc->method.
+                               info_flags & ACPI_METHOD_SERIALIZED))) {
                                 /*
-                                 * Method tried to create an object twice. The probable cause is
-                                 * that the method cannot handle reentrancy.
-                                 *
-                                 * The method is marked not_serialized, but it tried to create
-                                 * a named object, causing the second thread entrance to fail.
-                                 * Workaround this problem by marking the method permanently
-                                 * as Serialized.
+                                 * Method is not serialized and tried to create an object
+                                 * twice. The probable cause is that the method cannot
+                                 * handle reentrancy. Mark as "pending serialized" now, and
+                                 * then mark "serialized" when the last thread exits.
                                  */
-                                walk_state->method_desc->method.method_flags |=
-                                    AML_METHOD_SERIALIZED;
-                                walk_state->method_desc->method.sync_level = 0;
+                                walk_state->method_desc->method.info_flags |=
+                                    ACPI_METHOD_SERIALIZED_PENDING;
                         }
                 }
 
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index 40e2b279ea1..a5faa1323a0 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/pstree.c b/drivers/acpi/acpica/pstree.c
index d4b970c3630..f1464c03aa4 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/psutils.c b/drivers/acpi/acpica/psutils.c
index fe29eee5adb..7eda7850342 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/pswalk.c b/drivers/acpi/acpica/pswalk.c
index 8abb9629443..3312d6368bf 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 c42f067cff9..8086805d449 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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,6 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include "actables.h"
-#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psxface")
@@ -285,15 +284,15 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
-        if (info->obj_desc->method.flags & AOPOBJ_MODULE_LEVEL) {
+        if (info->obj_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL) {
                 walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
         }
 
         /* Invoke an internal method if necessary */
 
-        if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
+        if (info->obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
                 status =
-                    info->obj_desc->method.extra.implementation(walk_state);
+                    info->obj_desc->method.dispatch.implementation(walk_state);
                 info->return_object = walk_state->return_desc;
 
                 /* Cleanup states */
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 226c806ae98..9e66f907842 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rscalc.c b/drivers/acpi/acpica/rscalc.c
index d6ebf7ec622..3a8a89ec2ca 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rscreate.c b/drivers/acpi/acpica/rscreate.c
index c80a2eea3a0..4ce6e1147e8 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsdump.c b/drivers/acpi/acpica/rsdump.c
index f859b0386fe..33db7520c74 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index 1fd868b964f..f9ea60872aa 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsio.c b/drivers/acpi/acpica/rsio.c
index 33bff17c0bb..0c7efef008b 100644
--- a/drivers/acpi/acpica/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 545da40d7fa..50b8ad21116 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rslist.c b/drivers/acpi/acpica/rslist.c
index 7335f22aac2..1bfcef736c5 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 887b8ba8c43..7cc6d8625f1 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 f8cd9e87d98..410264b22a2 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 491191e6cf6..231811e5693 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 9f6a6e7e1c8..2ff657a28f2 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index d2ff4325c42..6f5588e62c0 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -384,8 +384,11 @@ static void acpi_tb_convert_fadt(void)
          *
          * The ACPI 1.0 reserved fields that will be zeroed are the bytes located at
          * offset 45, 55, 95, and the word located at offset 109, 110.
+         *
+         * Note: The FADT revision value is unreliable. Only the length can be
+         * trusted.
          */
-        if (acpi_gbl_FADT.header.revision < FADT2_REVISION_ID) {
+        if (acpi_gbl_FADT.header.length <= ACPI_FADT_V2_SIZE) {
                 acpi_gbl_FADT.preferred_profile = 0;
                 acpi_gbl_FADT.pstate_control = 0;
                 acpi_gbl_FADT.cst_control = 0;
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 989d5c86786..a55cb2bb5ab 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 83d7af8d090..48db0944ce4 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 34f9c2bc5e1..0f2d395feab 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 4a8b9e6ea57..4b7085dfc68 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index fd2c07d1d3a..7eb6c6cc1ed 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 8f089628156..0a697351cf6 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 6fef83f04bc..aded299a2fa 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utdebug.c b/drivers/acpi/acpica/utdebug.c
index f21c486929a..a9bcd816dc2 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utdecode.c b/drivers/acpi/acpica/utdecode.c
new file mode 100644
index 00000000000..136a814cec6
--- /dev/null
+++ b/drivers/acpi/acpica/utdecode.c
@@ -0,0 +1,548 @@
+/******************************************************************************
+ *
+ * Module Name: utdecode - Utility decoding routines (value-to-string)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, 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("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
+ */
+const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES] = {
+        ACPI_NS_NORMAL,         /* 00 Any              */
+        ACPI_NS_NORMAL,         /* 01 Number           */
+        ACPI_NS_NORMAL,         /* 02 String           */
+        ACPI_NS_NORMAL,         /* 03 Buffer           */
+        ACPI_NS_NORMAL,         /* 04 Package          */
+        ACPI_NS_NORMAL,         /* 05 field_unit       */
+        ACPI_NS_NEWSCOPE,       /* 06 Device           */
+        ACPI_NS_NORMAL,         /* 07 Event            */
+        ACPI_NS_NEWSCOPE,       /* 08 Method           */
+        ACPI_NS_NORMAL,         /* 09 Mutex            */
+        ACPI_NS_NORMAL,         /* 10 Region           */
+        ACPI_NS_NEWSCOPE,       /* 11 Power            */
+        ACPI_NS_NEWSCOPE,       /* 12 Processor        */
+        ACPI_NS_NEWSCOPE,       /* 13 Thermal          */
+        ACPI_NS_NORMAL,         /* 14 buffer_field     */
+        ACPI_NS_NORMAL,         /* 15 ddb_handle       */
+        ACPI_NS_NORMAL,         /* 16 Debug Object     */
+        ACPI_NS_NORMAL,         /* 17 def_field        */
+        ACPI_NS_NORMAL,         /* 18 bank_field       */
+        ACPI_NS_NORMAL,         /* 19 index_field      */
+        ACPI_NS_NORMAL,         /* 20 Reference        */
+        ACPI_NS_NORMAL,         /* 21 Alias            */
+        ACPI_NS_NORMAL,         /* 22 method_alias     */
+        ACPI_NS_NORMAL,         /* 23 Notify           */
+        ACPI_NS_NORMAL,         /* 24 Address Handler  */
+        ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL,       /* 25 Resource Desc    */
+        ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL,       /* 26 Resource Field   */
+        ACPI_NS_NEWSCOPE,       /* 27 Scope            */
+        ACPI_NS_NORMAL,         /* 28 Extra            */
+        ACPI_NS_NORMAL,         /* 29 Data             */
+        ACPI_NS_NORMAL          /* 30 Invalid          */
+};
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_hex_to_ascii_char
+ *
+ * PARAMETERS:  Integer             - Contains the hex digit
+ *              Position            - bit position of the digit within the
+ *                                    integer (multiple of 4)
+ *
+ * RETURN:      The converted Ascii character
+ *
+ * DESCRIPTION: Convert a hex digit to an Ascii character
+ *
+ ******************************************************************************/
+
+/* Hex to ASCII conversion table */
+
+static const char acpi_gbl_hex_to_ascii[] = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
+{
+
+        return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_region_name
+ *
+ * PARAMETERS:  Space ID            - ID for the region
+ *
+ * RETURN:      Decoded region space_id name
+ *
+ * DESCRIPTION: Translate a Space ID into a name string (Debug only)
+ *
+ ******************************************************************************/
+
+/* Region type decoding */
+
+const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
+        "SystemMemory",
+        "SystemIO",
+        "PCI_Config",
+        "EmbeddedControl",
+        "SMBus",
+        "SystemCMOS",
+        "PCIBARTarget",
+        "IPMI",
+        "DataTable"
+};
+
+char *acpi_ut_get_region_name(u8 space_id)
+{
+
+        if (space_id >= ACPI_USER_REGION_BEGIN) {
+                return ("UserDefinedRegion");
+        } else if (space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) {
+                return ("FunctionalFixedHW");
+        } else if (space_id >= ACPI_NUM_PREDEFINED_REGIONS) {
+                return ("InvalidSpaceId");
+        }
+
+        return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id]));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_event_name
+ *
+ * PARAMETERS:  event_id            - Fixed event ID
+ *
+ * RETURN:      Decoded event ID name
+ *
+ * DESCRIPTION: Translate a Event ID into a name string (Debug only)
+ *
+ ******************************************************************************/
+
+/* Event type decoding */
+
+static const char *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] = {
+        "PM_Timer",
+        "GlobalLock",
+        "PowerButton",
+        "SleepButton",
+        "RealTimeClock",
+};
+
+char *acpi_ut_get_event_name(u32 event_id)
+{
+
+        if (event_id > ACPI_EVENT_MAX) {
+                return ("InvalidEventID");
+        }
+
+        return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_type_name
+ *
+ * PARAMETERS:  Type                - An ACPI object type
+ *
+ * RETURN:      Decoded ACPI object type name
+ *
+ * DESCRIPTION: Translate a Type ID into a name string (Debug only)
+ *
+ ******************************************************************************/
+
+/*
+ * Elements of acpi_gbl_ns_type_names below must match
+ * one-to-one with values of acpi_object_type
+ *
+ * The type ACPI_TYPE_ANY (Untyped) is used as a "don't care" when searching;
+ * when stored in a table it really means that we have thus far seen no
+ * evidence to indicate what type is actually going to be stored for this entry.
+ */
+static const char acpi_gbl_bad_type[] = "UNDEFINED";
+
+/* Printable names of the ACPI object types */
+
+static const char *acpi_gbl_ns_type_names[] = {
+        /* 00 */ "Untyped",
+        /* 01 */ "Integer",
+        /* 02 */ "String",
+        /* 03 */ "Buffer",
+        /* 04 */ "Package",
+        /* 05 */ "FieldUnit",
+        /* 06 */ "Device",
+        /* 07 */ "Event",
+        /* 08 */ "Method",
+        /* 09 */ "Mutex",
+        /* 10 */ "Region",
+        /* 11 */ "Power",
+        /* 12 */ "Processor",
+        /* 13 */ "Thermal",
+        /* 14 */ "BufferField",
+        /* 15 */ "DdbHandle",
+        /* 16 */ "DebugObject",
+        /* 17 */ "RegionField",
+        /* 18 */ "BankField",
+        /* 19 */ "IndexField",
+        /* 20 */ "Reference",
+        /* 21 */ "Alias",
+        /* 22 */ "MethodAlias",
+        /* 23 */ "Notify",
+        /* 24 */ "AddrHandler",
+        /* 25 */ "ResourceDesc",
+        /* 26 */ "ResourceFld",
+        /* 27 */ "Scope",
+        /* 28 */ "Extra",
+        /* 29 */ "Data",
+        /* 30 */ "Invalid"
+};
+
+char *acpi_ut_get_type_name(acpi_object_type type)
+{
+
+        if (type > ACPI_TYPE_INVALID) {
+                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
+        }
+
+        return (ACPI_CAST_PTR(char, acpi_gbl_ns_type_names[type]));
+}
+
+char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
+{
+
+        if (!obj_desc) {
+                return ("[NULL Object Descriptor]");
+        }
+
+        return (acpi_ut_get_type_name(obj_desc->common.type));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_node_name
+ *
+ * PARAMETERS:  Object               - A namespace node
+ *
+ * RETURN:      ASCII name of the node
+ *
+ * DESCRIPTION: Validate the node and return the node's ACPI name.
+ *
+ ******************************************************************************/
+
+char *acpi_ut_get_node_name(void *object)
+{
+        struct acpi_namespace_node *node = (struct acpi_namespace_node *)object;
+
+        /* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */
+
+        if (!object) {
+                return ("NULL");
+        }
+
+        /* Check for Root node */
+
+        if ((object == ACPI_ROOT_OBJECT) || (object == acpi_gbl_root_node)) {
+                return ("\"\\\" ");
+        }
+
+        /* Descriptor must be a namespace node */
+
+        if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
+                return ("####");
+        }
+
+        /*
+         * Ensure name is valid. The name was validated/repaired when the node
+         * was created, but make sure it has not been corrupted.
+         */
+        acpi_ut_repair_name(node->name.ascii);
+
+        /* Return the name */
+
+        return (node->name.ascii);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_descriptor_name
+ *
+ * PARAMETERS:  Object               - An ACPI object
+ *
+ * RETURN:      Decoded name of the descriptor type
+ *
+ * DESCRIPTION: Validate object and return the descriptor type
+ *
+ ******************************************************************************/
+
+/* Printable names of object descriptor types */
+
+static const char *acpi_gbl_desc_type_names[] = {
+        /* 00 */ "Not a Descriptor",
+        /* 01 */ "Cached",
+        /* 02 */ "State-Generic",
+        /* 03 */ "State-Update",
+        /* 04 */ "State-Package",
+        /* 05 */ "State-Control",
+        /* 06 */ "State-RootParseScope",
+        /* 07 */ "State-ParseScope",
+        /* 08 */ "State-WalkScope",
+        /* 09 */ "State-Result",
+        /* 10 */ "State-Notify",
+        /* 11 */ "State-Thread",
+        /* 12 */ "Walk",
+        /* 13 */ "Parser",
+        /* 14 */ "Operand",
+        /* 15 */ "Node"
+};
+
+char *acpi_ut_get_descriptor_name(void *object)
+{
+
+        if (!object) {
+                return ("NULL OBJECT");
+        }
+
+        if (ACPI_GET_DESCRIPTOR_TYPE(object) > ACPI_DESC_TYPE_MAX) {
+                return ("Not a Descriptor");
+        }
+
+        return (ACPI_CAST_PTR(char,
+                              acpi_gbl_desc_type_names[ACPI_GET_DESCRIPTOR_TYPE
+                                                       (object)]));
+
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_reference_name
+ *
+ * PARAMETERS:  Object               - An ACPI reference object
+ *
+ * RETURN:      Decoded name of the type of reference
+ *
+ * DESCRIPTION: Decode a reference object sub-type to a string.
+ *
+ ******************************************************************************/
+
+/* Printable names of reference object sub-types */
+
+static const char *acpi_gbl_ref_class_names[] = {
+        /* 00 */ "Local",
+        /* 01 */ "Argument",
+        /* 02 */ "RefOf",
+        /* 03 */ "Index",
+        /* 04 */ "DdbHandle",
+        /* 05 */ "Named Object",
+        /* 06 */ "Debug"
+};
+
+const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
+{
+
+        if (!object) {
+                return ("NULL Object");
+        }
+
+        if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
+                return ("Not an Operand object");
+        }
+
+        if (object->common.type != ACPI_TYPE_LOCAL_REFERENCE) {
+                return ("Not a Reference object");
+        }
+
+        if (object->reference.class > ACPI_REFCLASS_MAX) {
+                return ("Unknown Reference class");
+        }
+
+        return (acpi_gbl_ref_class_names[object->reference.class]);
+}
+
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+/*
+ * Strings and procedures used for debug only
+ */
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_mutex_name
+ *
+ * PARAMETERS:  mutex_id        - The predefined ID for this mutex.
+ *
+ * RETURN:      Decoded name of the internal mutex
+ *
+ * DESCRIPTION: Translate a mutex ID into a name string (Debug only)
+ *
+ ******************************************************************************/
+
+/* Names for internal mutex objects, used for debug output */
+
+static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = {
+        "ACPI_MTX_Interpreter",
+        "ACPI_MTX_Namespace",
+        "ACPI_MTX_Tables",
+        "ACPI_MTX_Events",
+        "ACPI_MTX_Caches",
+        "ACPI_MTX_Memory",
+        "ACPI_MTX_CommandComplete",
+        "ACPI_MTX_CommandReady"
+};
+
+char *acpi_ut_get_mutex_name(u32 mutex_id)
+{
+
+        if (mutex_id > ACPI_MAX_MUTEX) {
+                return ("Invalid Mutex ID");
+        }
+
+        return (acpi_gbl_mutex_names[mutex_id]);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_notify_name
+ *
+ * PARAMETERS:  notify_value    - Value from the Notify() request
+ *
+ * RETURN:      Decoded name for the notify value
+ *
+ * DESCRIPTION: Translate a Notify Value to a notify namestring.
+ *
+ ******************************************************************************/
+
+/* Names for Notify() values, used for debug output */
+
+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)
+{
+
+        if (notify_value <= ACPI_NOTIFY_MAX) {
+                return (acpi_gbl_notify_value_names[notify_value]);
+        } else if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+                return ("Reserved");
+        } else {                /* Greater or equal to 0x80 */
+
+                return ("**Device Specific**");
+        }
+}
+#endif
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_valid_object_type
+ *
+ * PARAMETERS:  Type            - Object type to be validated
+ *
+ * RETURN:      TRUE if valid object type, FALSE otherwise
+ *
+ * DESCRIPTION: Validate an object type
+ *
+ ******************************************************************************/
+
+u8 acpi_ut_valid_object_type(acpi_object_type type)
+{
+
+        if (type > ACPI_TYPE_LOCAL_MAX) {
+
+                /* Note: Assumes all TYPEs are contiguous (external/local) */
+
+                return (FALSE);
+        }
+
+        return (TRUE);
+}
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index ed794cd033e..31f5a7832ef 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/uteval.c b/drivers/acpi/acpica/uteval.c
index 22f59ef604e..18f73c9d10b 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utglobal.c b/drivers/acpi/acpica/utglobal.c
index e87bc6760be..833a38a9c90 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utglobal")
@@ -107,43 +106,6 @@ const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS] = {
 
 /*******************************************************************************
  *
- * 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";
-                dump_stack();
-        }
-
-        return (ACPI_CAST_PTR(const char, exception));
-}
-
-ACPI_EXPORT_SYMBOL(acpi_format_exception)
-
-/*******************************************************************************
- *
  * Namespace globals
  *
  ******************************************************************************/
@@ -177,71 +139,6 @@ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
         {NULL, ACPI_TYPE_ANY, NULL}
 };
 
-/*
- * Properties of the ACPI Object Types, both internal and external.
- * The table is indexed by values of acpi_object_type
- */
-const u8 acpi_gbl_ns_properties[] = {
-        ACPI_NS_NORMAL,         /* 00 Any              */
-        ACPI_NS_NORMAL,         /* 01 Number           */
-        ACPI_NS_NORMAL,         /* 02 String           */
-        ACPI_NS_NORMAL,         /* 03 Buffer           */
-        ACPI_NS_NORMAL,         /* 04 Package          */
-        ACPI_NS_NORMAL,         /* 05 field_unit       */
-        ACPI_NS_NEWSCOPE,       /* 06 Device           */
-        ACPI_NS_NORMAL,         /* 07 Event            */
-        ACPI_NS_NEWSCOPE,       /* 08 Method           */
-        ACPI_NS_NORMAL,         /* 09 Mutex            */
-        ACPI_NS_NORMAL,         /* 10 Region           */
-        ACPI_NS_NEWSCOPE,       /* 11 Power            */
-        ACPI_NS_NEWSCOPE,       /* 12 Processor        */
-        ACPI_NS_NEWSCOPE,       /* 13 Thermal          */
-        ACPI_NS_NORMAL,         /* 14 buffer_field     */
-        ACPI_NS_NORMAL,         /* 15 ddb_handle       */
-        ACPI_NS_NORMAL,         /* 16 Debug Object     */
-        ACPI_NS_NORMAL,         /* 17 def_field        */
-        ACPI_NS_NORMAL,         /* 18 bank_field       */
-        ACPI_NS_NORMAL,         /* 19 index_field      */
-        ACPI_NS_NORMAL,         /* 20 Reference        */
-        ACPI_NS_NORMAL,         /* 21 Alias            */
-        ACPI_NS_NORMAL,         /* 22 method_alias     */
-        ACPI_NS_NORMAL,         /* 23 Notify           */
-        ACPI_NS_NORMAL,         /* 24 Address Handler  */
-        ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL,       /* 25 Resource Desc    */
-        ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL,       /* 26 Resource Field   */
-        ACPI_NS_NEWSCOPE,       /* 27 Scope            */
-        ACPI_NS_NORMAL,         /* 28 Extra            */
-        ACPI_NS_NORMAL,         /* 29 Data             */
-        ACPI_NS_NORMAL          /* 30 Invalid          */
-};
-
-/* Hex to ASCII conversion table */
-
-static const char acpi_gbl_hex_to_ascii[] = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_hex_to_ascii_char
- *
- * PARAMETERS:  Integer             - Contains the hex digit
- *              Position            - bit position of the digit within the
- *                                    integer (multiple of 4)
- *
- * RETURN:      The converted Ascii character
- *
- * DESCRIPTION: Convert a hex digit to an Ascii character
- *
- ******************************************************************************/
-
-char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
-{
-
-        return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
-}
-
 /******************************************************************************
  *
  * Event and Hardware globals
@@ -341,386 +238,6 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_get_region_name
- *
- * PARAMETERS:  None.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Translate a Space ID into a name string (Debug only)
- *
- ******************************************************************************/
-
-/* Region type decoding */
-
-const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
-        "SystemMemory",
-        "SystemIO",
-        "PCI_Config",
-        "EmbeddedControl",
-        "SMBus",
-        "SystemCMOS",
-        "PCIBARTarget",
-        "IPMI",
-        "DataTable"
-};
-
-char *acpi_ut_get_region_name(u8 space_id)
-{
-
-        if (space_id >= ACPI_USER_REGION_BEGIN) {
-                return ("UserDefinedRegion");
-        } else if (space_id >= ACPI_NUM_PREDEFINED_REGIONS) {
-                return ("InvalidSpaceId");
-        }
-
-        return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id]));
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_event_name
- *
- * PARAMETERS:  None.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Translate a Event ID into a name string (Debug only)
- *
- ******************************************************************************/
-
-/* Event type decoding */
-
-static const char *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] = {
-        "PM_Timer",
-        "GlobalLock",
-        "PowerButton",
-        "SleepButton",
-        "RealTimeClock",
-};
-
-char *acpi_ut_get_event_name(u32 event_id)
-{
-
-        if (event_id > ACPI_EVENT_MAX) {
-                return ("InvalidEventID");
-        }
-
-        return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_type_name
- *
- * PARAMETERS:  None.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Translate a Type ID into a name string (Debug only)
- *
- ******************************************************************************/
-
-/*
- * Elements of acpi_gbl_ns_type_names below must match
- * one-to-one with values of acpi_object_type
- *
- * The type ACPI_TYPE_ANY (Untyped) is used as a "don't care" when searching;
- * when stored in a table it really means that we have thus far seen no
- * evidence to indicate what type is actually going to be stored for this entry.
- */
-static const char acpi_gbl_bad_type[] = "UNDEFINED";
-
-/* Printable names of the ACPI object types */
-
-static const char *acpi_gbl_ns_type_names[] = {
-        /* 00 */ "Untyped",
-        /* 01 */ "Integer",
-        /* 02 */ "String",
-        /* 03 */ "Buffer",
-        /* 04 */ "Package",
-        /* 05 */ "FieldUnit",
-        /* 06 */ "Device",
-        /* 07 */ "Event",
-        /* 08 */ "Method",
-        /* 09 */ "Mutex",
-        /* 10 */ "Region",
-        /* 11 */ "Power",
-        /* 12 */ "Processor",
-        /* 13 */ "Thermal",
-        /* 14 */ "BufferField",
-        /* 15 */ "DdbHandle",
-        /* 16 */ "DebugObject",
-        /* 17 */ "RegionField",
-        /* 18 */ "BankField",
-        /* 19 */ "IndexField",
-        /* 20 */ "Reference",
-        /* 21 */ "Alias",
-        /* 22 */ "MethodAlias",
-        /* 23 */ "Notify",
-        /* 24 */ "AddrHandler",
-        /* 25 */ "ResourceDesc",
-        /* 26 */ "ResourceFld",
-        /* 27 */ "Scope",
-        /* 28 */ "Extra",
-        /* 29 */ "Data",
-        /* 30 */ "Invalid"
-};
-
-char *acpi_ut_get_type_name(acpi_object_type type)
-{
-
-        if (type > ACPI_TYPE_INVALID) {
-                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
-        }
-
-        return (ACPI_CAST_PTR(char, acpi_gbl_ns_type_names[type]));
-}
-
-char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
-{
-
-        if (!obj_desc) {
-                return ("[NULL Object Descriptor]");
-        }
-
-        return (acpi_ut_get_type_name(obj_desc->common.type));
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_node_name
- *
- * PARAMETERS:  Object               - A namespace node
- *
- * RETURN:      Pointer to a string
- *
- * DESCRIPTION: Validate the node and return the node's ACPI name.
- *
- ******************************************************************************/
-
-char *acpi_ut_get_node_name(void *object)
-{
-        struct acpi_namespace_node *node = (struct acpi_namespace_node *)object;
-
-        /* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */
-
-        if (!object) {
-                return ("NULL");
-        }
-
-        /* Check for Root node */
-
-        if ((object == ACPI_ROOT_OBJECT) || (object == acpi_gbl_root_node)) {
-                return ("\"\\\" ");
-        }
-
-        /* Descriptor must be a namespace node */
-
-        if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
-                return ("####");
-        }
-
-        /* Name must be a valid ACPI name */
-
-        if (!acpi_ut_valid_acpi_name(node->name.integer)) {
-                node->name.integer = acpi_ut_repair_name(node->name.ascii);
-        }
-
-        /* Return the name */
-
-        return (node->name.ascii);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_descriptor_name
- *
- * PARAMETERS:  Object               - An ACPI object
- *
- * RETURN:      Pointer to a string
- *
- * DESCRIPTION: Validate object and return the descriptor type
- *
- ******************************************************************************/
-
-/* Printable names of object descriptor types */
-
-static const char *acpi_gbl_desc_type_names[] = {
-        /* 00 */ "Invalid",
-        /* 01 */ "Cached",
-        /* 02 */ "State-Generic",
-        /* 03 */ "State-Update",
-        /* 04 */ "State-Package",
-        /* 05 */ "State-Control",
-        /* 06 */ "State-RootParseScope",
-        /* 07 */ "State-ParseScope",
-        /* 08 */ "State-WalkScope",
-        /* 09 */ "State-Result",
-        /* 10 */ "State-Notify",
-        /* 11 */ "State-Thread",
-        /* 12 */ "Walk",
-        /* 13 */ "Parser",
-        /* 14 */ "Operand",
-        /* 15 */ "Node"
-};
-
-char *acpi_ut_get_descriptor_name(void *object)
-{
-
-        if (!object) {
-                return ("NULL OBJECT");
-        }
-
-        if (ACPI_GET_DESCRIPTOR_TYPE(object) > ACPI_DESC_TYPE_MAX) {
-                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
-        }
-
-        return (ACPI_CAST_PTR(char,
-                              acpi_gbl_desc_type_names[ACPI_GET_DESCRIPTOR_TYPE
-                                                       (object)]));
-
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_reference_name
- *
- * PARAMETERS:  Object               - An ACPI reference object
- *
- * RETURN:      Pointer to a string
- *
- * DESCRIPTION: Decode a reference object sub-type to a string.
- *
- ******************************************************************************/
-
-/* Printable names of reference object sub-types */
-
-static const char *acpi_gbl_ref_class_names[] = {
-        /* 00 */ "Local",
-        /* 01 */ "Argument",
-        /* 02 */ "RefOf",
-        /* 03 */ "Index",
-        /* 04 */ "DdbHandle",
-        /* 05 */ "Named Object",
-        /* 06 */ "Debug"
-};
-
-const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
-{
-        if (!object)
-                return "NULL Object";
-
-        if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND)
-                return "Not an Operand object";
-
-        if (object->common.type != ACPI_TYPE_LOCAL_REFERENCE)
-                return "Not a Reference object";
-
-        if (object->reference.class > ACPI_REFCLASS_MAX)
-                return "Unknown Reference class";
-
-        return acpi_gbl_ref_class_names[object->reference.class];
-}
-
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
-/*
- * Strings and procedures used for debug only
- */
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_mutex_name
- *
- * PARAMETERS:  mutex_id        - The predefined ID for this mutex.
- *
- * RETURN:      String containing the name of the mutex. Always returns a valid
- *              pointer.
- *
- * DESCRIPTION: Translate a mutex ID into a name string (Debug only)
- *
- ******************************************************************************/
-
-char *acpi_ut_get_mutex_name(u32 mutex_id)
-{
-
-        if (mutex_id > ACPI_MAX_MUTEX) {
-                return ("Invalid Mutex ID");
-        }
-
-        return (acpi_gbl_mutex_names[mutex_id]);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_get_notify_name
- *
- * PARAMETERS:  notify_value    - Value from the Notify() request
- *
- * RETURN:      String corresponding to the Notify Value.
- *
- * DESCRIPTION: Translate a Notify Value to a notify namestring.
- *
- ******************************************************************************/
-
-/* Names for Notify() values, used for debug output */
-
-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)
-{
-
-        if (notify_value <= ACPI_NOTIFY_MAX) {
-                return (acpi_gbl_notify_value_names[notify_value]);
-        } else if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
-                return ("Reserved");
-        } else {                /* Greater or equal to 0x80 */
-
-                return ("**Device Specific**");
-        }
-}
-#endif
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_valid_object_type
- *
- * PARAMETERS:  Type            - Object type to be validated
- *
- * RETURN:      TRUE if valid object type, FALSE otherwise
- *
- * DESCRIPTION: Validate an object type
- *
- ******************************************************************************/
-
-u8 acpi_ut_valid_object_type(acpi_object_type type)
-{
-
-        if (type > ACPI_TYPE_LOCAL_MAX) {
-
-                /* Note: Assumes all TYPEs are contiguous (external/local) */
-
-                return (FALSE);
-        }
-
-        return (TRUE);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_init_globals
  *
  * PARAMETERS:  None
@@ -768,7 +285,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_gpe_fadt_blocks[0] = NULL;
         acpi_gbl_gpe_fadt_blocks[1] = NULL;
         acpi_current_gpe_count = 0;
-        acpi_all_gpes_initialized = FALSE;
+        acpi_gbl_all_gpes_initialized = FALSE;
 
         /* Global handlers */
 
@@ -778,6 +295,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_init_handler = NULL;
         acpi_gbl_table_handler = NULL;
         acpi_gbl_interface_handler = NULL;
+        acpi_gbl_global_event_handler = NULL;
 
         /* Global Lock support */
 
@@ -805,6 +323,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;
         acpi_gbl_osi_data = 0;
         acpi_gbl_osi_mutex = NULL;
+        acpi_gbl_reg_methods_executed = FALSE;
 
         /* Hardware oriented */
 
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index d2906328535..b679ea69354 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utinit.c b/drivers/acpi/acpica/utinit.c
index c1b1c803ea9..191b6828cce 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utlock.c b/drivers/acpi/acpica/utlock.c
index b081cd46a15..f6bb75c6faf 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utmath.c b/drivers/acpi/acpica/utmath.c
index 49cf7b7fd81..ce481da9bb4 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utmisc.c b/drivers/acpi/acpica/utmisc.c
index c7d0e05ef5a..c33a852d4f4 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utmutex.c b/drivers/acpi/acpica/utmutex.c
index d9efa495b43..a946c689f03 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,7 @@ acpi_status acpi_ut_mutex_initialize(void)
 
         spin_lock_init(acpi_gbl_gpe_lock);
         spin_lock_init(acpi_gbl_hardware_lock);
+        spin_lock_init(acpi_ev_global_lock_pending_lock);
 
         /* Mutex for _OSI support */
         status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index fd1fa2749ea..188340a017b 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utosi.c b/drivers/acpi/acpica/utosi.c
index 18c59a85fdc..1fb10cb8f11 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utresrc.c b/drivers/acpi/acpica/utresrc.c
index 7965919000b..84e05184424 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utstate.c b/drivers/acpi/acpica/utstate.c
index d35d109b8da..30c21e1a936 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utxface.c b/drivers/acpi/acpica/utxface.c
index 1f484c9a688..98ad125e14f 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 6f12e314fba..916ae097c43 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, 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/apei/Kconfig b/drivers/acpi/apei/Kconfig
index fca34ccfd29..66a03caa2ad 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -1,5 +1,6 @@
 config ACPI_APEI
         bool "ACPI Platform Error Interface (APEI)"
+        select PSTORE
         depends on X86
         help
           APEI allows to report errors (for example from the chipset)
@@ -21,6 +22,13 @@ config ACPI_APEI_GHES
           by firmware to produce more valuable hardware error
           information for Linux.
 
+config ACPI_APEI_PCIEAER
+        bool "APEI PCIe AER logging/recovering support"
+        depends on ACPI_APEI && PCIEAER
+        help
+          PCIe AER errors may be reported via APEI firmware first mode.
+          Turn on this option to enable the corresponding support.
+
 config ACPI_APEI_EINJ
         tristate "APEI Error INJection (EINJ)"
         depends on ACPI_APEI && DEBUG_FS
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index 18df1e94027..ef0581f2094 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -109,6 +109,8 @@ static inline u32 apei_estatus_len(struct acpi_hest_generic_status *estatus)
                 return sizeof(*estatus) + estatus->data_length;
 }
 
+void apei_estatus_print(const char *pfx,
+                        const struct acpi_hest_generic_status *estatus);
 int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus);
 int apei_estatus_check(const struct acpi_hest_generic_status *estatus);
 #endif
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index f4cf2fc4c8c..5d4189464d6 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -29,6 +29,7 @@
 #include <linux/time.h>
 #include <linux/cper.h>
 #include <linux/acpi.h>
+#include <linux/aer.h>
 
 /*
  * CPER record ID need to be unique even after reboot, because record
@@ -46,6 +47,326 @@ u64 cper_next_record_id(void)
 }
 EXPORT_SYMBOL_GPL(cper_next_record_id);
 
+static const char *cper_severity_strs[] = {
+        "recoverable",
+        "fatal",
+        "corrected",
+        "info",
+};
+
+static const char *cper_severity_str(unsigned int severity)
+{
+        return severity < ARRAY_SIZE(cper_severity_strs) ?
+                cper_severity_strs[severity] : "unknown";
+}
+
+/*
+ * cper_print_bits - print strings for set bits
+ * @pfx: prefix for each line, including log level and prefix string
+ * @bits: bit mask
+ * @strs: string array, indexed by bit position
+ * @strs_size: size of the string array: @strs
+ *
+ * For each set bit in @bits, print the corresponding string in @strs.
+ * If the output length is longer than 80, multiple line will be
+ * printed, with @pfx is printed at the beginning of each line.
+ */
+void cper_print_bits(const char *pfx, unsigned int bits,
+                     const char *strs[], unsigned int strs_size)
+{
+        int i, len = 0;
+        const char *str;
+        char buf[84];
+
+        for (i = 0; i < strs_size; i++) {
+                if (!(bits & (1U << i)))
+                        continue;
+                str = strs[i];
+                if (!str)
+                        continue;
+                if (len && len + strlen(str) + 2 > 80) {
+                        printk("%s\n", buf);
+                        len = 0;
+                }
+                if (!len)
+                        len = snprintf(buf, sizeof(buf), "%s%s", pfx, str);
+                else
+                        len += snprintf(buf+len, sizeof(buf)-len, ", %s", str);
+        }
+        if (len)
+                printk("%s\n", buf);
+}
+
+static const char *cper_proc_type_strs[] = {
+        "IA32/X64",
+        "IA64",
+};
+
+static const char *cper_proc_isa_strs[] = {
+        "IA32",
+        "IA64",
+        "X64",
+};
+
+static const char *cper_proc_error_type_strs[] = {
+        "cache error",
+        "TLB error",
+        "bus error",
+        "micro-architectural error",
+};
+
+static const char *cper_proc_op_strs[] = {
+        "unknown or generic",
+        "data read",
+        "data write",
+        "instruction execution",
+};
+
+static const char *cper_proc_flag_strs[] = {
+        "restartable",
+        "precise IP",
+        "overflow",
+        "corrected",
+};
+
+static void cper_print_proc_generic(const char *pfx,
+                                    const struct cper_sec_proc_generic *proc)
+{
+        if (proc->validation_bits & CPER_PROC_VALID_TYPE)
+                printk("%s""processor_type: %d, %s\n", pfx, proc->proc_type,
+                       proc->proc_type < ARRAY_SIZE(cper_proc_type_strs) ?
+                       cper_proc_type_strs[proc->proc_type] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_ISA)
+                printk("%s""processor_isa: %d, %s\n", pfx, proc->proc_isa,
+                       proc->proc_isa < ARRAY_SIZE(cper_proc_isa_strs) ?
+                       cper_proc_isa_strs[proc->proc_isa] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_ERROR_TYPE) {
+                printk("%s""error_type: 0x%02x\n", pfx, proc->proc_error_type);
+                cper_print_bits(pfx, proc->proc_error_type,
+                                cper_proc_error_type_strs,
+                                ARRAY_SIZE(cper_proc_error_type_strs));
+        }
+        if (proc->validation_bits & CPER_PROC_VALID_OPERATION)
+                printk("%s""operation: %d, %s\n", pfx, proc->operation,
+                       proc->operation < ARRAY_SIZE(cper_proc_op_strs) ?
+                       cper_proc_op_strs[proc->operation] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_FLAGS) {
+                printk("%s""flags: 0x%02x\n", pfx, proc->flags);
+                cper_print_bits(pfx, proc->flags, cper_proc_flag_strs,
+                                ARRAY_SIZE(cper_proc_flag_strs));
+        }
+        if (proc->validation_bits & CPER_PROC_VALID_LEVEL)
+                printk("%s""level: %d\n", pfx, proc->level);
+        if (proc->validation_bits & CPER_PROC_VALID_VERSION)
+                printk("%s""version_info: 0x%016llx\n", pfx, proc->cpu_version);
+        if (proc->validation_bits & CPER_PROC_VALID_ID)
+                printk("%s""processor_id: 0x%016llx\n", pfx, proc->proc_id);
+        if (proc->validation_bits & CPER_PROC_VALID_TARGET_ADDRESS)
+                printk("%s""target_address: 0x%016llx\n",
+                       pfx, proc->target_addr);
+        if (proc->validation_bits & CPER_PROC_VALID_REQUESTOR_ID)
+                printk("%s""requestor_id: 0x%016llx\n",
+                       pfx, proc->requestor_id);
+        if (proc->validation_bits & CPER_PROC_VALID_RESPONDER_ID)
+                printk("%s""responder_id: 0x%016llx\n",
+                       pfx, proc->responder_id);
+        if (proc->validation_bits & CPER_PROC_VALID_IP)
+                printk("%s""IP: 0x%016llx\n", pfx, proc->ip);
+}
+
+static const char *cper_mem_err_type_strs[] = {
+        "unknown",
+        "no error",
+        "single-bit ECC",
+        "multi-bit ECC",
+        "single-symbol chipkill ECC",
+        "multi-symbol chipkill ECC",
+        "master abort",
+        "target abort",
+        "parity error",
+        "watchdog timeout",
+        "invalid address",
+        "mirror Broken",
+        "memory sparing",
+        "scrub corrected error",
+        "scrub uncorrected error",
+};
+
+static void cper_print_mem(const char *pfx, const struct cper_sec_mem_err *mem)
+{
+        if (mem->validation_bits & CPER_MEM_VALID_ERROR_STATUS)
+                printk("%s""error_status: 0x%016llx\n", pfx, mem->error_status);
+        if (mem->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS)
+                printk("%s""physical_address: 0x%016llx\n",
+                       pfx, mem->physical_addr);
+        if (mem->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS_MASK)
+                printk("%s""physical_address_mask: 0x%016llx\n",
+                       pfx, mem->physical_addr_mask);
+        if (mem->validation_bits & CPER_MEM_VALID_NODE)
+                printk("%s""node: %d\n", pfx, mem->node);
+        if (mem->validation_bits & CPER_MEM_VALID_CARD)
+                printk("%s""card: %d\n", pfx, mem->card);
+        if (mem->validation_bits & CPER_MEM_VALID_MODULE)
+                printk("%s""module: %d\n", pfx, mem->module);
+        if (mem->validation_bits & CPER_MEM_VALID_BANK)
+                printk("%s""bank: %d\n", pfx, mem->bank);
+        if (mem->validation_bits & CPER_MEM_VALID_DEVICE)
+                printk("%s""device: %d\n", pfx, mem->device);
+        if (mem->validation_bits & CPER_MEM_VALID_ROW)
+                printk("%s""row: %d\n", pfx, mem->row);
+        if (mem->validation_bits & CPER_MEM_VALID_COLUMN)
+                printk("%s""column: %d\n", pfx, mem->column);
+        if (mem->validation_bits & CPER_MEM_VALID_BIT_POSITION)
+                printk("%s""bit_position: %d\n", pfx, mem->bit_pos);
+        if (mem->validation_bits & CPER_MEM_VALID_REQUESTOR_ID)
+                printk("%s""requestor_id: 0x%016llx\n", pfx, mem->requestor_id);
+        if (mem->validation_bits & CPER_MEM_VALID_RESPONDER_ID)
+                printk("%s""responder_id: 0x%016llx\n", pfx, mem->responder_id);
+        if (mem->validation_bits & CPER_MEM_VALID_TARGET_ID)
+                printk("%s""target_id: 0x%016llx\n", pfx, mem->target_id);
+        if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE) {
+                u8 etype = mem->error_type;
+                printk("%s""error_type: %d, %s\n", pfx, etype,
+                       etype < ARRAY_SIZE(cper_mem_err_type_strs) ?
+                       cper_mem_err_type_strs[etype] : "unknown");
+        }
+}
+
+static const char *cper_pcie_port_type_strs[] = {
+        "PCIe end point",
+        "legacy PCI end point",
+        "unknown",
+        "unknown",
+        "root port",
+        "upstream switch port",
+        "downstream switch port",
+        "PCIe to PCI/PCI-X bridge",
+        "PCI/PCI-X to PCIe bridge",
+        "root complex integrated endpoint device",
+        "root complex event collector",
+};
+
+static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,
+                            const struct acpi_hest_generic_data *gdata)
+{
+        if (pcie->validation_bits & CPER_PCIE_VALID_PORT_TYPE)
+                printk("%s""port_type: %d, %s\n", pfx, pcie->port_type,
+                       pcie->port_type < ARRAY_SIZE(cper_pcie_port_type_strs) ?
+                       cper_pcie_port_type_strs[pcie->port_type] : "unknown");
+        if (pcie->validation_bits & CPER_PCIE_VALID_VERSION)
+                printk("%s""version: %d.%d\n", pfx,
+                       pcie->version.major, pcie->version.minor);
+        if (pcie->validation_bits & CPER_PCIE_VALID_COMMAND_STATUS)
+                printk("%s""command: 0x%04x, status: 0x%04x\n", pfx,
+                       pcie->command, pcie->status);
+        if (pcie->validation_bits & CPER_PCIE_VALID_DEVICE_ID) {
+                const __u8 *p;
+                printk("%s""device_id: %04x:%02x:%02x.%x\n", pfx,
+                       pcie->device_id.segment, pcie->device_id.bus,
+                       pcie->device_id.device, pcie->device_id.function);
+                printk("%s""slot: %d\n", pfx,
+                       pcie->device_id.slot >> CPER_PCIE_SLOT_SHIFT);
+                printk("%s""secondary_bus: 0x%02x\n", pfx,
+                       pcie->device_id.secondary_bus);
+                printk("%s""vendor_id: 0x%04x, device_id: 0x%04x\n", pfx,
+                       pcie->device_id.vendor_id, pcie->device_id.device_id);
+                p = pcie->device_id.class_code;
+                printk("%s""class_code: %02x%02x%02x\n", pfx, p[0], p[1], p[2]);
+        }
+        if (pcie->validation_bits & CPER_PCIE_VALID_SERIAL_NUMBER)
+                printk("%s""serial number: 0x%04x, 0x%04x\n", pfx,
+                       pcie->serial_number.lower, pcie->serial_number.upper);
+        if (pcie->validation_bits & CPER_PCIE_VALID_BRIDGE_CONTROL_STATUS)
+                printk(
+        "%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n",
+        pfx, pcie->bridge.secondary_status, pcie->bridge.control);
+#ifdef CONFIG_ACPI_APEI_PCIEAER
+        if (pcie->validation_bits & CPER_PCIE_VALID_AER_INFO) {
+                struct aer_capability_regs *aer_regs = (void *)pcie->aer_info;
+                cper_print_aer(pfx, gdata->error_severity, aer_regs);
+        }
+#endif
+}
+
+static const char *apei_estatus_section_flag_strs[] = {
+        "primary",
+        "containment warning",
+        "reset",
+        "threshold exceeded",
+        "resource not accessible",
+        "latent error",
+};
+
+static void apei_estatus_print_section(
+        const char *pfx, const struct acpi_hest_generic_data *gdata, int sec_no)
+{
+        uuid_le *sec_type = (uuid_le *)gdata->section_type;
+        __u16 severity;
+
+        severity = gdata->error_severity;
+        printk("%s""section: %d, severity: %d, %s\n", pfx, sec_no, severity,
+               cper_severity_str(severity));
+        printk("%s""flags: 0x%02x\n", pfx, gdata->flags);
+        cper_print_bits(pfx, gdata->flags, apei_estatus_section_flag_strs,
+                        ARRAY_SIZE(apei_estatus_section_flag_strs));
+        if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
+                printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id);
+        if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
+                printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text);
+
+        if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) {
+                struct cper_sec_proc_generic *proc_err = (void *)(gdata + 1);
+                printk("%s""section_type: general processor error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*proc_err))
+                        cper_print_proc_generic(pfx, proc_err);
+                else
+                        goto err_section_too_small;
+        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
+                struct cper_sec_mem_err *mem_err = (void *)(gdata + 1);
+                printk("%s""section_type: memory error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*mem_err))
+                        cper_print_mem(pfx, mem_err);
+                else
+                        goto err_section_too_small;
+        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) {
+                struct cper_sec_pcie *pcie = (void *)(gdata + 1);
+                printk("%s""section_type: PCIe error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*pcie))
+                        cper_print_pcie(pfx, pcie, gdata);
+                else
+                        goto err_section_too_small;
+        } else
+                printk("%s""section type: unknown, %pUl\n", pfx, sec_type);
+
+        return;
+
+err_section_too_small:
+        pr_err(FW_WARN "error section length is too small\n");
+}
+
+void apei_estatus_print(const char *pfx,
+                        const struct acpi_hest_generic_status *estatus)
+{
+        struct acpi_hest_generic_data *gdata;
+        unsigned int data_len, gedata_len;
+        int sec_no = 0;
+        __u16 severity;
+
+        printk("%s""APEI generic hardware error status\n", pfx);
+        severity = estatus->error_severity;
+        printk("%s""severity: %d, %s\n", pfx, severity,
+               cper_severity_str(severity));
+        data_len = estatus->data_length;
+        gdata = (struct acpi_hest_generic_data *)(estatus + 1);
+        while (data_len > sizeof(*gdata)) {
+                gedata_len = gdata->error_data_length;
+                apei_estatus_print_section(pfx, gdata, sec_no);
+                data_len -= gedata_len + sizeof(*gdata);
+                sec_no++;
+        }
+}
+EXPORT_SYMBOL_GPL(apei_estatus_print);
+
 int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus)
 {
         if (estatus->data_length &&
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index cf29df69380..096aebfe7f3 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -39,7 +39,7 @@
 #define EINJ_PFX "EINJ: "
 
 #define SPIN_UNIT               100                     /* 100ns */
-/* Firmware should respond within 1 miliseconds */
+/* Firmware should respond within 1 milliseconds */
 #define FIRMWARE_TIMEOUT        (1 * NSEC_PER_MSEC)
 
 /*
diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index de73caf3ceb..a4cfb64c86a 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -43,12 +43,27 @@ static DEFINE_MUTEX(erst_dbg_mutex);
 
 static int erst_dbg_open(struct inode *inode, struct file *file)
 {
+        int rc, *pos;
+
         if (erst_disable)
                 return -ENODEV;
 
+        pos = (int *)&file->private_data;
+
+        rc = erst_get_record_id_begin(pos);
+        if (rc)
+                return rc;
+
         return nonseekable_open(inode, file);
 }
 
+static int erst_dbg_release(struct inode *inode, struct file *file)
+{
+        erst_get_record_id_end();
+
+        return 0;
+}
+
 static long erst_dbg_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 {
         int rc;
@@ -79,18 +94,20 @@ static long erst_dbg_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf,
                              size_t usize, loff_t *off)
 {
-        int rc;
+        int rc, *pos;
         ssize_t len = 0;
         u64 id;
 
-        if (*off != 0)
+        if (*off)
                 return -EINVAL;
 
         if (mutex_lock_interruptible(&erst_dbg_mutex) != 0)
                 return -EINTR;
 
+        pos = (int *)&filp->private_data;
+
 retry_next:
-        rc = erst_get_next_record_id(&id);
+        rc = erst_get_record_id_next(pos, &id);
         if (rc)
                 goto out;
         /* no more record */
@@ -181,6 +198,7 @@ out:
 static const struct file_operations erst_dbg_ops = {
         .owner          = THIS_MODULE,
         .open           = erst_dbg_open,
+        .release        = erst_dbg_release,
         .read           = erst_dbg_read,
         .write          = erst_dbg_write,
         .unlocked_ioctl = erst_dbg_ioctl,
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 1211c03149e..d6cb0ff6988 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -34,6 +34,7 @@
 #include <linux/cper.h>
 #include <linux/nmi.h>
 #include <linux/hardirq.h>
+#include <linux/pstore.h>
 #include <acpi/apei.h>
 
 #include "apei-internal.h"
@@ -53,7 +54,7 @@
                                      sizeof(struct acpi_table_erst)))
 
 #define SPIN_UNIT               100                     /* 100ns */
-/* Firmware should respond within 1 miliseconds */
+/* Firmware should respond within 1 milliseconds */
 #define FIRMWARE_TIMEOUT        (1 * NSEC_PER_MSEC)
 #define FIRMWARE_MAX_STALL      50                      /* 50us */
 
@@ -86,7 +87,7 @@ static struct erst_erange {
  * It is used to provide exclusive accessing for ERST Error Log
  * Address Range too.
  */
-static DEFINE_SPINLOCK(erst_lock);
+static DEFINE_RAW_SPINLOCK(erst_lock);
 
 static inline int erst_errno(int command_status)
 {
@@ -421,14 +422,30 @@ ssize_t erst_get_record_count(void)
         if (erst_disable)
                 return -ENODEV;
 
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
         count = __erst_get_record_count();
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
 
         return count;
 }
 EXPORT_SYMBOL_GPL(erst_get_record_count);
 
+#define ERST_RECORD_ID_CACHE_SIZE_MIN   16
+#define ERST_RECORD_ID_CACHE_SIZE_MAX   1024
+
+struct erst_record_id_cache {
+        struct mutex lock;
+        u64 *entries;
+        int len;
+        int size;
+        int refcount;
+};
+
+static struct erst_record_id_cache erst_record_id_cache = {
+        .lock = __MUTEX_INITIALIZER(erst_record_id_cache.lock),
+        .refcount = 0,
+};
+
 static int __erst_get_next_record_id(u64 *record_id)
 {
         struct apei_exec_context ctx;
@@ -443,26 +460,179 @@ static int __erst_get_next_record_id(u64 *record_id)
         return 0;
 }
 
+int erst_get_record_id_begin(int *pos)
+{
+        int rc;
+
+        if (erst_disable)
+                return -ENODEV;
+
+        rc = mutex_lock_interruptible(&erst_record_id_cache.lock);
+        if (rc)
+                return rc;
+        erst_record_id_cache.refcount++;
+        mutex_unlock(&erst_record_id_cache.lock);
+
+        *pos = 0;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(erst_get_record_id_begin);
+
+/* erst_record_id_cache.lock must be held by caller */
+static int __erst_record_id_cache_add_one(void)
+{
+        u64 id, prev_id, first_id;
+        int i, rc;
+        u64 *entries;
+        unsigned long flags;
+
+        id = prev_id = first_id = APEI_ERST_INVALID_RECORD_ID;
+retry:
+        raw_spin_lock_irqsave(&erst_lock, flags);
+        rc = __erst_get_next_record_id(&id);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
+        if (rc == -ENOENT)
+                return 0;
+        if (rc)
+                return rc;
+        if (id == APEI_ERST_INVALID_RECORD_ID)
+                return 0;
+        /* can not skip current ID, or loop back to first ID */
+        if (id == prev_id || id == first_id)
+                return 0;
+        if (first_id == APEI_ERST_INVALID_RECORD_ID)
+                first_id = id;
+        prev_id = id;
+
+        entries = erst_record_id_cache.entries;
+        for (i = 0; i < erst_record_id_cache.len; i++) {
+                if (entries[i] == id)
+                        break;
+        }
+        /* record id already in cache, try next */
+        if (i < erst_record_id_cache.len)
+                goto retry;
+        if (erst_record_id_cache.len >= erst_record_id_cache.size) {
+                int new_size, alloc_size;
+                u64 *new_entries;
+
+                new_size = erst_record_id_cache.size * 2;
+                new_size = clamp_val(new_size, ERST_RECORD_ID_CACHE_SIZE_MIN,
+                                     ERST_RECORD_ID_CACHE_SIZE_MAX);
+                if (new_size <= erst_record_id_cache.size) {
+                        if (printk_ratelimit())
+                                pr_warning(FW_WARN ERST_PFX
+                                           "too many record ID!\n");
+                        return 0;
+                }
+                alloc_size = new_size * sizeof(entries[0]);
+                if (alloc_size < PAGE_SIZE)
+                        new_entries = kmalloc(alloc_size, GFP_KERNEL);
+                else
+                        new_entries = vmalloc(alloc_size);
+                if (!new_entries)
+                        return -ENOMEM;
+                memcpy(new_entries, entries,
+                       erst_record_id_cache.len * sizeof(entries[0]));
+                if (erst_record_id_cache.size < PAGE_SIZE)
+                        kfree(entries);
+                else
+                        vfree(entries);
+                erst_record_id_cache.entries = entries = new_entries;
+                erst_record_id_cache.size = new_size;
+        }
+        entries[i] = id;
+        erst_record_id_cache.len++;
+
+        return 1;
+}
+
 /*
  * Get the record ID of an existing error record on the persistent
  * storage. If there is no error record on the persistent storage, the
  * returned record_id is APEI_ERST_INVALID_RECORD_ID.
  */
-int erst_get_next_record_id(u64 *record_id)
+int erst_get_record_id_next(int *pos, u64 *record_id)
 {
-        int rc;
-        unsigned long flags;
+        int rc = 0;
+        u64 *entries;
 
         if (erst_disable)
                 return -ENODEV;
 
-        spin_lock_irqsave(&erst_lock, flags);
-        rc = __erst_get_next_record_id(record_id);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        /* must be enclosed by erst_get_record_id_begin/end */
+        BUG_ON(!erst_record_id_cache.refcount);
+        BUG_ON(*pos < 0 || *pos > erst_record_id_cache.len);
+
+        mutex_lock(&erst_record_id_cache.lock);
+        entries = erst_record_id_cache.entries;
+        for (; *pos < erst_record_id_cache.len; (*pos)++)
+                if (entries[*pos] != APEI_ERST_INVALID_RECORD_ID)
+                        break;
+        /* found next record id in cache */
+        if (*pos < erst_record_id_cache.len) {
+                *record_id = entries[*pos];
+                (*pos)++;
+                goto out_unlock;
+        }
+
+        /* Try to add one more record ID to cache */
+        rc = __erst_record_id_cache_add_one();
+        if (rc < 0)
+                goto out_unlock;
+        /* successfully add one new ID */
+        if (rc == 1) {
+                *record_id = erst_record_id_cache.entries[*pos];
+                (*pos)++;
+                rc = 0;
+        } else {
+                *pos = -1;
+                *record_id = APEI_ERST_INVALID_RECORD_ID;
+        }
+out_unlock:
+        mutex_unlock(&erst_record_id_cache.lock);
 
         return rc;
 }
-EXPORT_SYMBOL_GPL(erst_get_next_record_id);
+EXPORT_SYMBOL_GPL(erst_get_record_id_next);
+
+/* erst_record_id_cache.lock must be held by caller */
+static void __erst_record_id_cache_compact(void)
+{
+        int i, wpos = 0;
+        u64 *entries;
+
+        if (erst_record_id_cache.refcount)
+                return;
+
+        entries = erst_record_id_cache.entries;
+        for (i = 0; i < erst_record_id_cache.len; i++) {
+                if (entries[i] == APEI_ERST_INVALID_RECORD_ID)
+                        continue;
+                if (wpos != i)
+                        memcpy(&entries[wpos], &entries[i], sizeof(entries[i]));
+                wpos++;
+        }
+        erst_record_id_cache.len = wpos;
+}
+
+void erst_get_record_id_end(void)
+{
+        /*
+         * erst_disable != 0 should be detected by invoker via the
+         * return value of erst_get_record_id_begin/next, so this
+         * function should not be called for erst_disable != 0.
+         */
+        BUG_ON(erst_disable);
+
+        mutex_lock(&erst_record_id_cache.lock);
+        erst_record_id_cache.refcount--;
+        BUG_ON(erst_record_id_cache.refcount < 0);
+        __erst_record_id_cache_compact();
+        mutex_unlock(&erst_record_id_cache.lock);
+}
+EXPORT_SYMBOL_GPL(erst_get_record_id_end);
 
 static int __erst_write_to_storage(u64 offset)
 {
@@ -624,17 +794,17 @@ int erst_write(const struct cper_record_header *record)
                 return -EINVAL;
 
         if (erst_erange.attr & ERST_RANGE_NVRAM) {
-                if (!spin_trylock_irqsave(&erst_lock, flags))
+                if (!raw_spin_trylock_irqsave(&erst_lock, flags))
                         return -EBUSY;
                 rc = __erst_write_to_nvram(record);
-                spin_unlock_irqrestore(&erst_lock, flags);
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
                 return rc;
         }
 
         if (record->record_length > erst_erange.size)
                 return -EINVAL;
 
-        if (!spin_trylock_irqsave(&erst_lock, flags))
+        if (!raw_spin_trylock_irqsave(&erst_lock, flags))
                 return -EBUSY;
         memcpy(erst_erange.vaddr, record, record->record_length);
         rcd_erange = erst_erange.vaddr;
@@ -642,7 +812,7 @@ int erst_write(const struct cper_record_header *record)
         memcpy(&rcd_erange->persistence_information, "ER", 2);
 
         rc = __erst_write_to_storage(0);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
 
         return rc;
 }
@@ -696,63 +866,41 @@ ssize_t erst_read(u64 record_id, struct cper_record_header *record,
         if (erst_disable)
                 return -ENODEV;
 
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
         len = __erst_read(record_id, record, buflen);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
         return len;
 }
 EXPORT_SYMBOL_GPL(erst_read);
 
-/*
- * If return value > buflen, the buffer size is not big enough,
- * else if return value = 0, there is no more record to read,
- * else if return value < 0, something goes wrong,
- * else everything is OK, and return value is record length
- */
-ssize_t erst_read_next(struct cper_record_header *record, size_t buflen)
-{
-        int rc;
-        ssize_t len;
-        unsigned long flags;
-        u64 record_id;
-
-        if (erst_disable)
-                return -ENODEV;
-
-        spin_lock_irqsave(&erst_lock, flags);
-        rc = __erst_get_next_record_id(&record_id);
-        if (rc) {
-                spin_unlock_irqrestore(&erst_lock, flags);
-                return rc;
-        }
-        /* no more record */
-        if (record_id == APEI_ERST_INVALID_RECORD_ID) {
-                spin_unlock_irqrestore(&erst_lock, flags);
-                return 0;
-        }
-
-        len = __erst_read(record_id, record, buflen);
-        spin_unlock_irqrestore(&erst_lock, flags);
-
-        return len;
-}
-EXPORT_SYMBOL_GPL(erst_read_next);
-
 int erst_clear(u64 record_id)
 {
-        int rc;
+        int rc, i;
         unsigned long flags;
+        u64 *entries;
 
         if (erst_disable)
                 return -ENODEV;
 
-        spin_lock_irqsave(&erst_lock, flags);
+        rc = mutex_lock_interruptible(&erst_record_id_cache.lock);
+        if (rc)
+                return rc;
+        raw_spin_lock_irqsave(&erst_lock, flags);
         if (erst_erange.attr & ERST_RANGE_NVRAM)
                 rc = __erst_clear_from_nvram(record_id);
         else
                 rc = __erst_clear_from_storage(record_id);
-        spin_unlock_irqrestore(&erst_lock, flags);
-
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
+        if (rc)
+                goto out;
+        entries = erst_record_id_cache.entries;
+        for (i = 0; i < erst_record_id_cache.len; i++) {
+                if (entries[i] == record_id)
+                        entries[i] = APEI_ERST_INVALID_RECORD_ID;
+        }
+        __erst_record_id_cache_compact();
+out:
+        mutex_unlock(&erst_record_id_cache.lock);
         return rc;
 }
 EXPORT_SYMBOL_GPL(erst_clear);
@@ -781,6 +929,128 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
         return 0;
 }
 
+static size_t erst_reader(u64 *id, enum pstore_type_id *type,
+                       struct timespec *time);
+static u64 erst_writer(enum pstore_type_id type, size_t size);
+
+static struct pstore_info erst_info = {
+        .owner          = THIS_MODULE,
+        .name           = "erst",
+        .read           = erst_reader,
+        .write          = erst_writer,
+        .erase          = erst_clear
+};
+
+#define CPER_CREATOR_PSTORE                                             \
+        UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c,     \
+                0x64, 0x90, 0xb8, 0x9d)
+#define CPER_SECTION_TYPE_DMESG                                         \
+        UUID_LE(0xc197e04e, 0xd545, 0x4a70, 0x9c, 0x17, 0xa5, 0x54,     \
+                0x94, 0x19, 0xeb, 0x12)
+#define CPER_SECTION_TYPE_MCE                                           \
+        UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96,     \
+                0x04, 0x4a, 0x38, 0xfc)
+
+struct cper_pstore_record {
+        struct cper_record_header hdr;
+        struct cper_section_descriptor sec_hdr;
+        char data[];
+} __packed;
+
+static size_t erst_reader(u64 *id, enum pstore_type_id *type,
+                       struct timespec *time)
+{
+        int rc;
+        ssize_t len;
+        unsigned long flags;
+        u64 record_id;
+        struct cper_pstore_record *rcd = (struct cper_pstore_record *)
+                                        (erst_info.buf - sizeof(*rcd));
+
+        if (erst_disable)
+                return -ENODEV;
+
+        raw_spin_lock_irqsave(&erst_lock, flags);
+skip:
+        rc = __erst_get_next_record_id(&record_id);
+        if (rc) {
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
+                return rc;
+        }
+        /* no more record */
+        if (record_id == APEI_ERST_INVALID_RECORD_ID) {
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
+                return 0;
+        }
+
+        len = __erst_read(record_id, &rcd->hdr, sizeof(*rcd) +
+                          erst_erange.size);
+        if (uuid_le_cmp(rcd->hdr.creator_id, CPER_CREATOR_PSTORE) != 0)
+                goto skip;
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
+
+        *id = record_id;
+        if (uuid_le_cmp(rcd->sec_hdr.section_type,
+                        CPER_SECTION_TYPE_DMESG) == 0)
+                *type = PSTORE_TYPE_DMESG;
+        else if (uuid_le_cmp(rcd->sec_hdr.section_type,
+                             CPER_SECTION_TYPE_MCE) == 0)
+                *type = PSTORE_TYPE_MCE;
+        else
+                *type = PSTORE_TYPE_UNKNOWN;
+
+        if (rcd->hdr.validation_bits & CPER_VALID_TIMESTAMP)
+                time->tv_sec = rcd->hdr.timestamp;
+        else
+                time->tv_sec = 0;
+        time->tv_nsec = 0;
+
+        return len - sizeof(*rcd);
+}
+
+static u64 erst_writer(enum pstore_type_id type, size_t size)
+{
+        struct cper_pstore_record *rcd = (struct cper_pstore_record *)
+                                        (erst_info.buf - sizeof(*rcd));
+
+        memset(rcd, 0, sizeof(*rcd));
+        memcpy(rcd->hdr.signature, CPER_SIG_RECORD, CPER_SIG_SIZE);
+        rcd->hdr.revision = CPER_RECORD_REV;
+        rcd->hdr.signature_end = CPER_SIG_END;
+        rcd->hdr.section_count = 1;
+        rcd->hdr.error_severity = CPER_SEV_FATAL;
+        /* timestamp valid. platform_id, partition_id are invalid */
+        rcd->hdr.validation_bits = CPER_VALID_TIMESTAMP;
+        rcd->hdr.timestamp = get_seconds();
+        rcd->hdr.record_length = sizeof(*rcd) + size;
+        rcd->hdr.creator_id = CPER_CREATOR_PSTORE;
+        rcd->hdr.notification_type = CPER_NOTIFY_MCE;
+        rcd->hdr.record_id = cper_next_record_id();
+        rcd->hdr.flags = CPER_HW_ERROR_FLAGS_PREVERR;
+
+        rcd->sec_hdr.section_offset = sizeof(*rcd);
+        rcd->sec_hdr.section_length = size;
+        rcd->sec_hdr.revision = CPER_SEC_REV;
+        /* fru_id and fru_text is invalid */
+        rcd->sec_hdr.validation_bits = 0;
+        rcd->sec_hdr.flags = CPER_SEC_PRIMARY;
+        switch (type) {
+        case PSTORE_TYPE_DMESG:
+                rcd->sec_hdr.section_type = CPER_SECTION_TYPE_DMESG;
+                break;
+        case PSTORE_TYPE_MCE:
+                rcd->sec_hdr.section_type = CPER_SECTION_TYPE_MCE;
+                break;
+        default:
+                return -EINVAL;
+        }
+        rcd->sec_hdr.section_severity = CPER_SEV_FATAL;
+
+        erst_write(&rcd->hdr);
+
+        return rcd->hdr.record_id;
+}
+
 static int __init erst_init(void)
 {
         int rc = 0;
@@ -788,6 +1058,7 @@ static int __init erst_init(void)
         struct apei_exec_context ctx;
         struct apei_resources erst_resources;
         struct resource *r;
+        char *buf;
 
         if (acpi_disabled)
                 goto err;
@@ -854,6 +1125,18 @@ static int __init erst_init(void)
         if (!erst_erange.vaddr)
                 goto err_release_erange;
 
+        buf = kmalloc(erst_erange.size, GFP_KERNEL);
+        mutex_init(&erst_info.buf_mutex);
+        if (buf) {
+                erst_info.buf = buf + sizeof(struct cper_pstore_record);
+                erst_info.bufsize = erst_erange.size -
+                                    sizeof(struct cper_pstore_record);
+                if (pstore_register(&erst_info)) {
+                        pr_info(ERST_PFX "Could not register with persistent store\n");
+                        kfree(buf);
+                }
+        }
+
         pr_info(ERST_PFX
         "Error Record Serialization Table (ERST) support is initialized.\n");
 
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 0d505e59214..f703b288115 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -12,10 +12,6 @@
  * For more information about Generic Hardware Error Source, please
  * refer to ACPI Specification version 4.0, section 17.3.2.6
  *
- * Now, only SCI notification type and memory errors are
- * supported. More notification type and hardware error type will be
- * added later.
- *
  * Copyright 2010 Intel Corp.
  *   Author: Huang Ying <ying.huang@intel.com>
  *
@@ -39,14 +35,18 @@
 #include <linux/acpi.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
+#include <linux/timer.h>
 #include <linux/cper.h>
 #include <linux/kdebug.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
+#include <linux/ratelimit.h>
+#include <linux/vmalloc.h>
 #include <acpi/apei.h>
 #include <acpi/atomicio.h>
 #include <acpi/hed.h>
 #include <asm/mce.h>
+#include <asm/tlbflush.h>
 
 #include "apei-internal.h"
 
@@ -55,42 +55,131 @@
 #define GHES_ESTATUS_MAX_SIZE           65536
 
 /*
- * One struct ghes is created for each generic hardware error
- * source.
- *
+ * One struct ghes is created for each generic hardware error source.
  * It provides the context for APEI hardware error timer/IRQ/SCI/NMI
- * handler. Handler for one generic hardware error source is only
- * triggered after the previous one is done. So handler can uses
- * struct ghes without locking.
+ * handler.
  *
  * estatus: memory buffer for error status block, allocated during
  * HEST parsing.
  */
 #define GHES_TO_CLEAR           0x0001
+#define GHES_EXITING            0x0002
 
 struct ghes {
         struct acpi_hest_generic *generic;
         struct acpi_hest_generic_status *estatus;
-        struct list_head list;
         u64 buffer_paddr;
         unsigned long flags;
+        union {
+                struct list_head list;
+                struct timer_list timer;
+                unsigned int irq;
+        };
 };
 
+static int ghes_panic_timeout   __read_mostly = 30;
+
 /*
- * Error source lists, one list for each notification method. The
- * members in lists are struct ghes.
+ * All error sources notified with SCI shares one notifier function,
+ * so they need to be linked and checked one by one.  This is applied
+ * to NMI too.
  *
- * The list members are only added in HEST parsing and deleted during
- * module_exit, that is, single-threaded. So no lock is needed for
- * that.
- *
- * But the mutual exclusion is needed between members adding/deleting
- * and timer/IRQ/SCI/NMI handler, which may traverse the list. RCU is
- * used for that.
+ * RCU is used for these lists, so ghes_list_mutex is only used for
+ * list changing, not for traversing.
  */
 static LIST_HEAD(ghes_sci);
+static LIST_HEAD(ghes_nmi);
 static DEFINE_MUTEX(ghes_list_mutex);
 
+/*
+ * NMI may be triggered on any CPU, so ghes_nmi_lock is used for
+ * mutual exclusion.
+ */
+static DEFINE_RAW_SPINLOCK(ghes_nmi_lock);
+
+/*
+ * Because the memory area used to transfer hardware error information
+ * from BIOS to Linux can be determined only in NMI, IRQ or timer
+ * handler, but general ioremap can not be used in atomic context, so
+ * a special version of atomic ioremap is implemented for that.
+ */
+
+/*
+ * Two virtual pages are used, one for NMI context, the other for
+ * IRQ/PROCESS context
+ */
+#define GHES_IOREMAP_PAGES              2
+#define GHES_IOREMAP_NMI_PAGE(base)     (base)
+#define GHES_IOREMAP_IRQ_PAGE(base)     ((base) + PAGE_SIZE)
+
+/* virtual memory area for atomic ioremap */
+static struct vm_struct *ghes_ioremap_area;
+/*
+ * These 2 spinlock is used to prevent atomic ioremap virtual memory
+ * area from being mapped simultaneously.
+ */
+static DEFINE_RAW_SPINLOCK(ghes_ioremap_lock_nmi);
+static DEFINE_SPINLOCK(ghes_ioremap_lock_irq);
+
+static int ghes_ioremap_init(void)
+{
+        ghes_ioremap_area = __get_vm_area(PAGE_SIZE * GHES_IOREMAP_PAGES,
+                VM_IOREMAP, VMALLOC_START, VMALLOC_END);
+        if (!ghes_ioremap_area) {
+                pr_err(GHES_PFX "Failed to allocate virtual memory area for atomic ioremap.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void ghes_ioremap_exit(void)
+{
+        free_vm_area(ghes_ioremap_area);
+}
+
+static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
+{
+        unsigned long vaddr;
+
+        vaddr = (unsigned long)GHES_IOREMAP_NMI_PAGE(ghes_ioremap_area->addr);
+        ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+                           pfn << PAGE_SHIFT, PAGE_KERNEL);
+
+        return (void __iomem *)vaddr;
+}
+
+static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
+{
+        unsigned long vaddr;
+
+        vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);
+        ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+                           pfn << PAGE_SHIFT, PAGE_KERNEL);
+
+        return (void __iomem *)vaddr;
+}
+
+static void ghes_iounmap_nmi(void __iomem *vaddr_ptr)
+{
+        unsigned long vaddr = (unsigned long __force)vaddr_ptr;
+        void *base = ghes_ioremap_area->addr;
+
+        BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_NMI_PAGE(base));
+        unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
+        __flush_tlb_one(vaddr);
+}
+
+static void ghes_iounmap_irq(void __iomem *vaddr_ptr)
+{
+        unsigned long vaddr = (unsigned long __force)vaddr_ptr;
+        void *base = ghes_ioremap_area->addr;
+
+        BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_IRQ_PAGE(base));
+        unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
+        __flush_tlb_one(vaddr);
+}
+
 static struct ghes *ghes_new(struct acpi_hest_generic *generic)
 {
         struct ghes *ghes;
@@ -101,7 +190,6 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         if (!ghes)
                 return ERR_PTR(-ENOMEM);
         ghes->generic = generic;
-        INIT_LIST_HEAD(&ghes->list);
         rc = acpi_pre_map_gar(&generic->error_status_address);
         if (rc)
                 goto err_free;
@@ -153,27 +241,46 @@ static inline int ghes_severity(int severity)
         case CPER_SEV_FATAL:
                 return GHES_SEV_PANIC;
         default:
-                /* Unkown, go panic */
+                /* Unknown, go panic */
                 return GHES_SEV_PANIC;
         }
 }
 
-/* SCI handler run in work queue, so ioremap can be used here */
-static int ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
-                                 int from_phys)
+static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
+                                  int from_phys)
 {
-        void *vaddr;
-
-        vaddr = ioremap_cache(paddr, len);
-        if (!vaddr)
-                return -ENOMEM;
-        if (from_phys)
-                memcpy(buffer, vaddr, len);
-        else
-                memcpy(vaddr, buffer, len);
-        iounmap(vaddr);
-
-        return 0;
+        void __iomem *vaddr;
+        unsigned long flags = 0;
+        int in_nmi = in_nmi();
+        u64 offset;
+        u32 trunk;
+
+        while (len > 0) {
+                offset = paddr - (paddr & PAGE_MASK);
+                if (in_nmi) {
+                        raw_spin_lock(&ghes_ioremap_lock_nmi);
+                        vaddr = ghes_ioremap_pfn_nmi(paddr >> PAGE_SHIFT);
+                } else {
+                        spin_lock_irqsave(&ghes_ioremap_lock_irq, flags);
+                        vaddr = ghes_ioremap_pfn_irq(paddr >> PAGE_SHIFT);
+                }
+                trunk = PAGE_SIZE - offset;
+                trunk = min(trunk, len);
+                if (from_phys)
+                        memcpy_fromio(buffer, vaddr + offset, trunk);
+                else
+                        memcpy_toio(vaddr + offset, buffer, trunk);
+                len -= trunk;
+                paddr += trunk;
+                buffer += trunk;
+                if (in_nmi) {
+                        ghes_iounmap_nmi(vaddr);
+                        raw_spin_unlock(&ghes_ioremap_lock_nmi);
+                } else {
+                        ghes_iounmap_irq(vaddr);
+                        spin_unlock_irqrestore(&ghes_ioremap_lock_irq, flags);
+                }
+        }
 }
 
 static int ghes_read_estatus(struct ghes *ghes, int silent)
@@ -194,10 +301,8 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
         if (!buf_paddr)
                 return -ENOENT;
 
-        rc = ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
-                                   sizeof(*ghes->estatus), 1);
-        if (rc)
-                return rc;
+        ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
+                              sizeof(*ghes->estatus), 1);
         if (!ghes->estatus->block_status)
                 return -ENOENT;
 
@@ -212,17 +317,15 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
                 goto err_read_block;
         if (apei_estatus_check_header(ghes->estatus))
                 goto err_read_block;
-        rc = ghes_copy_tofrom_phys(ghes->estatus + 1,
-                                   buf_paddr + sizeof(*ghes->estatus),
-                                   len - sizeof(*ghes->estatus), 1);
-        if (rc)
-                return rc;
+        ghes_copy_tofrom_phys(ghes->estatus + 1,
+                              buf_paddr + sizeof(*ghes->estatus),
+                              len - sizeof(*ghes->estatus), 1);
         if (apei_estatus_check(ghes->estatus))
                 goto err_read_block;
         rc = 0;
 
 err_read_block:
-        if (rc && !silent)
+        if (rc && !silent && printk_ratelimit())
                 pr_warning(FW_WARN GHES_PFX
                            "Failed to read error status block!\n");
         return rc;
@@ -255,11 +358,26 @@ static void ghes_do_proc(struct ghes *ghes)
                 }
 #endif
         }
+}
 
-        if (!processed && printk_ratelimit())
-                pr_warning(GHES_PFX
-                "Unknown error record from generic hardware error source: %d\n",
-                           ghes->generic->header.source_id);
+static void ghes_print_estatus(const char *pfx, struct ghes *ghes)
+{
+        /* Not more than 2 messages every 5 seconds */
+        static DEFINE_RATELIMIT_STATE(ratelimit, 5*HZ, 2);
+
+        if (pfx == NULL) {
+                if (ghes_severity(ghes->estatus->error_severity) <=
+                    GHES_SEV_CORRECTED)
+                        pfx = KERN_WARNING HW_ERR;
+                else
+                        pfx = KERN_ERR HW_ERR;
+        }
+        if (__ratelimit(&ratelimit)) {
+                printk(
+        "%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
+        pfx, ghes->generic->header.source_id);
+                apei_estatus_print(pfx, ghes->estatus);
+        }
 }
 
 static int ghes_proc(struct ghes *ghes)
@@ -269,6 +387,7 @@ static int ghes_proc(struct ghes *ghes)
         rc = ghes_read_estatus(ghes, 0);
         if (rc)
                 goto out;
+        ghes_print_estatus(NULL, ghes);
         ghes_do_proc(ghes);
 
 out:
@@ -276,6 +395,42 @@ out:
         return 0;
 }
 
+static void ghes_add_timer(struct ghes *ghes)
+{
+        struct acpi_hest_generic *g = ghes->generic;
+        unsigned long expire;
+
+        if (!g->notify.poll_interval) {
+                pr_warning(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
+                           g->header.source_id);
+                return;
+        }
+        expire = jiffies + msecs_to_jiffies(g->notify.poll_interval);
+        ghes->timer.expires = round_jiffies_relative(expire);
+        add_timer(&ghes->timer);
+}
+
+static void ghes_poll_func(unsigned long data)
+{
+        struct ghes *ghes = (void *)data;
+
+        ghes_proc(ghes);
+        if (!(ghes->flags & GHES_EXITING))
+                ghes_add_timer(ghes);
+}
+
+static irqreturn_t ghes_irq_func(int irq, void *data)
+{
+        struct ghes *ghes = data;
+        int rc;
+
+        rc = ghes_proc(ghes);
+        if (rc)
+                return IRQ_NONE;
+
+        return IRQ_HANDLED;
+}
+
 static int ghes_notify_sci(struct notifier_block *this,
                                   unsigned long event, void *data)
 {
@@ -292,10 +447,63 @@ static int ghes_notify_sci(struct notifier_block *this,
         return ret;
 }
 
+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 = NOTIFY_DONE;
+
+        if (cmd != DIE_NMI)
+                return ret;
+
+        raw_spin_lock(&ghes_nmi_lock);
+        list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
+                if (ghes_read_estatus(ghes, 1)) {
+                        ghes_clear_estatus(ghes);
+                        continue;
+                }
+                sev = ghes_severity(ghes->estatus->error_severity);
+                if (sev > sev_global) {
+                        sev_global = sev;
+                        ghes_global = ghes;
+                }
+                ret = NOTIFY_STOP;
+        }
+
+        if (ret == NOTIFY_DONE)
+                goto out;
+
+        if (sev_global >= GHES_SEV_PANIC) {
+                oops_begin();
+                ghes_print_estatus(KERN_EMERG HW_ERR, ghes_global);
+                /* reboot to log the error! */
+                if (panic_timeout == 0)
+                        panic_timeout = ghes_panic_timeout;
+                panic("Fatal hardware error!");
+        }
+
+        list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
+                if (!(ghes->flags & GHES_TO_CLEAR))
+                        continue;
+                /* Do not print estatus because printk is not NMI safe */
+                ghes_do_proc(ghes);
+                ghes_clear_estatus(ghes);
+        }
+
+out:
+        raw_spin_unlock(&ghes_nmi_lock);
+        return ret;
+}
+
 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 int __devinit ghes_probe(struct platform_device *ghes_dev)
 {
         struct acpi_hest_generic *generic;
@@ -306,18 +514,27 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)
         if (!generic->enabled)
                 return -ENODEV;
 
-        if (generic->error_block_length <
-            sizeof(struct acpi_hest_generic_status)) {
-                pr_warning(FW_BUG GHES_PFX
-"Invalid error block length: %u for generic hardware error source: %d\n",
-                           generic->error_block_length,
+        switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+        case ACPI_HEST_NOTIFY_SCI:
+        case ACPI_HEST_NOTIFY_NMI:
+                break;
+        case ACPI_HEST_NOTIFY_LOCAL:
+                pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
                            generic->header.source_id);
                 goto err;
+        default:
+                pr_warning(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
+                           generic->notify.type, generic->header.source_id);
+                goto err;
         }
-        if (generic->records_to_preallocate == 0) {
-                pr_warning(FW_BUG GHES_PFX
-"Invalid records to preallocate: %u for generic hardware error source: %d\n",
-                           generic->records_to_preallocate,
+
+        rc = -EIO;
+        if (generic->error_block_length <
+            sizeof(struct acpi_hest_generic_status)) {
+                pr_warning(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
+                           generic->error_block_length,
                            generic->header.source_id);
                 goto err;
         }
@@ -327,38 +544,43 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)
                 ghes = NULL;
                 goto err;
         }
-        if (generic->notify.type == ACPI_HEST_NOTIFY_SCI) {
+        switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+                ghes->timer.function = ghes_poll_func;
+                ghes->timer.data = (unsigned long)ghes;
+                init_timer_deferrable(&ghes->timer);
+                ghes_add_timer(ghes);
+                break;
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+                /* External interrupt vector is GSI */
+                if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) {
+                        pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n",
+                               generic->header.source_id);
+                        goto err;
+                }
+                if (request_irq(ghes->irq, ghes_irq_func,
+                                0, "GHES IRQ", ghes)) {
+                        pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
+                               generic->header.source_id);
+                        goto err;
+                }
+                break;
+        case ACPI_HEST_NOTIFY_SCI:
                 mutex_lock(&ghes_list_mutex);
                 if (list_empty(&ghes_sci))
                         register_acpi_hed_notifier(&ghes_notifier_sci);
                 list_add_rcu(&ghes->list, &ghes_sci);
                 mutex_unlock(&ghes_list_mutex);
-        } else {
-                unsigned char *notify = NULL;
-
-                switch (generic->notify.type) {
-                case ACPI_HEST_NOTIFY_POLLED:
-                        notify = "POLL";
-                        break;
-                case ACPI_HEST_NOTIFY_EXTERNAL:
-                case ACPI_HEST_NOTIFY_LOCAL:
-                        notify = "IRQ";
-                        break;
-                case ACPI_HEST_NOTIFY_NMI:
-                        notify = "NMI";
-                        break;
-                }
-                if (notify) {
-                        pr_warning(GHES_PFX
-"Generic hardware error source: %d notified via %s is not supported!\n",
-                                   generic->header.source_id, notify);
-                } else {
-                        pr_warning(FW_WARN GHES_PFX
-"Unknown notification type: %u for generic hardware error source: %d\n",
-                        generic->notify.type, generic->header.source_id);
-                }
-                rc = -ENODEV;
-                goto err;
+                break;
+        case ACPI_HEST_NOTIFY_NMI:
+                mutex_lock(&ghes_list_mutex);
+                if (list_empty(&ghes_nmi))
+                        register_die_notifier(&ghes_notifier_nmi);
+                list_add_rcu(&ghes->list, &ghes_nmi);
+                mutex_unlock(&ghes_list_mutex);
+                break;
+        default:
+                BUG();
         }
         platform_set_drvdata(ghes_dev, ghes);
 
@@ -379,7 +601,14 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)
         ghes = platform_get_drvdata(ghes_dev);
         generic = ghes->generic;
 
+        ghes->flags |= GHES_EXITING;
         switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+                del_timer_sync(&ghes->timer);
+                break;
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+                free_irq(ghes->irq, ghes);
+                break;
         case ACPI_HEST_NOTIFY_SCI:
                 mutex_lock(&ghes_list_mutex);
                 list_del_rcu(&ghes->list);
@@ -387,12 +616,23 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)
                         unregister_acpi_hed_notifier(&ghes_notifier_sci);
                 mutex_unlock(&ghes_list_mutex);
                 break;
+        case ACPI_HEST_NOTIFY_NMI:
+                mutex_lock(&ghes_list_mutex);
+                list_del_rcu(&ghes->list);
+                if (list_empty(&ghes_nmi))
+                        unregister_die_notifier(&ghes_notifier_nmi);
+                mutex_unlock(&ghes_list_mutex);
+                /*
+                 * To synchronize with NMI handler, ghes can only be
+                 * freed after NMI handler finishes.
+                 */
+                synchronize_rcu();
+                break;
         default:
                 BUG();
                 break;
         }
 
-        synchronize_rcu();
         ghes_fini(ghes);
         kfree(ghes);
 
@@ -412,6 +652,8 @@ static struct platform_driver ghes_platform_driver = {
 
 static int __init ghes_init(void)
 {
+        int rc;
+
         if (acpi_disabled)
                 return -ENODEV;
 
@@ -420,12 +662,25 @@ static int __init ghes_init(void)
                 return -EINVAL;
         }
 
-        return platform_driver_register(&ghes_platform_driver);
+        rc = ghes_ioremap_init();
+        if (rc)
+                goto err;
+
+        rc = platform_driver_register(&ghes_platform_driver);
+        if (rc)
+                goto err_ioremap_exit;
+
+        return 0;
+err_ioremap_exit:
+        ghes_ioremap_exit();
+err:
+        return rc;
 }
 
 static void __exit ghes_exit(void)
 {
         platform_driver_unregister(&ghes_platform_driver);
+        ghes_ioremap_exit();
 }
 
 module_init(ghes_init);
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 1a3508a7fe0..abda3786a5d 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -46,9 +46,9 @@ EXPORT_SYMBOL_GPL(hest_disable);
 
 /* HEST table parsing */
 
-static struct acpi_table_hest *hest_tab;
+static struct acpi_table_hest *__read_mostly hest_tab;
 
-static int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
+static const int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
         [ACPI_HEST_TYPE_IA32_CHECK] = -1,       /* need further calculation */
         [ACPI_HEST_TYPE_IA32_CORRECTED_CHECK] = -1,
         [ACPI_HEST_TYPE_IA32_NMI] = sizeof(struct acpi_hest_ia_nmi),
@@ -126,7 +126,7 @@ struct ghes_arr {
         unsigned int count;
 };
 
-static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
+static int __init hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
 {
         int *count = data;
 
@@ -135,7 +135,7 @@ static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
         return 0;
 }
 
-static int hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
+static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
 {
         struct platform_device *ghes_dev;
         struct ghes_arr *ghes_arr = data;
@@ -165,7 +165,7 @@ err:
         return rc;
 }
 
-static int hest_ghes_dev_register(unsigned int ghes_count)
+static int __init hest_ghes_dev_register(unsigned int ghes_count)
 {
         int rc, i;
         struct ghes_arr ghes_arr;
@@ -195,24 +195,24 @@ static int __init setup_hest_disable(char *str)
 
 __setup("hest_disable", setup_hest_disable);
 
-static int __init hest_init(void)
+void __init acpi_hest_init(void)
 {
         acpi_status status;
         int rc = -ENODEV;
         unsigned int ghes_count = 0;
 
-        if (acpi_disabled)
-                goto err;
-
         if (hest_disable) {
-                pr_info(HEST_PFX "HEST tabling parsing is disabled.\n");
-                goto err;
+                pr_info(HEST_PFX "Table parsing disabled.\n");
+                return;
         }
 
+        if (acpi_disabled)
+                goto err;
+
         status = acpi_get_table(ACPI_SIG_HEST, 0,
                                 (struct acpi_table_header **)&hest_tab);
         if (status == AE_NOT_FOUND) {
-                pr_info(HEST_PFX "Table is not found!\n");
+                pr_info(HEST_PFX "Table not found.\n");
                 goto err;
         } else if (ACPI_FAILURE(status)) {
                 const char *msg = acpi_format_exception(status);
@@ -226,15 +226,11 @@ static int __init hest_init(void)
                 goto err;
 
         rc = hest_ghes_dev_register(ghes_count);
-        if (rc)
-                goto err;
-
-        pr_info(HEST_PFX "HEST table parsing is initialized.\n");
+        if (!rc) {
+                pr_info(HEST_PFX "Table parsing has been initialized.\n");
+                return;
+        }
 
-        return 0;
 err:
         hest_disable = 1;
-        return rc;
 }
-
-subsys_initcall(hest_init);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 95649d37307..fcc13ac0aa1 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -33,6 +33,7 @@
 #include <linux/async.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
+#include <linux/suspend.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
@@ -102,6 +103,7 @@ struct acpi_battery {
         struct mutex lock;
         struct power_supply bat;
         struct acpi_device *device;
+        struct notifier_block pm_nb;
         unsigned long update_time;
         int rate_now;
         int capacity_now;
@@ -631,6 +633,17 @@ static int acpi_battery_update(struct acpi_battery *battery)
         return result;
 }
 
+static void acpi_battery_refresh(struct acpi_battery *battery)
+{
+        if (!battery->bat.dev)
+                return;
+
+        acpi_battery_get_info(battery);
+        /* The battery may have changed its reporting units. */
+        sysfs_remove_battery(battery);
+        sysfs_add_battery(battery);
+}
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -868,6 +881,8 @@ static int acpi_battery_add_fs(struct acpi_device *device)
         struct proc_dir_entry *entry = NULL;
         int i;
 
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_battery_dir);
@@ -914,6 +929,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
         if (!battery)
                 return;
         old = battery->bat.dev;
+        if (event == ACPI_BATTERY_NOTIFY_INFO)
+                acpi_battery_refresh(battery);
         acpi_battery_update(battery);
         acpi_bus_generate_proc_event(device, event,
                                      acpi_battery_present(battery));
@@ -925,6 +942,21 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
                 power_supply_changed(&battery->bat);
 }
 
+static int battery_notify(struct notifier_block *nb,
+                               unsigned long mode, void *_unused)
+{
+        struct acpi_battery *battery = container_of(nb, struct acpi_battery,
+                                                    pm_nb);
+        switch (mode) {
+        case PM_POST_SUSPEND:
+                sysfs_remove_battery(battery);
+                sysfs_add_battery(battery);
+                break;
+        }
+
+        return 0;
+}
+
 static int acpi_battery_add(struct acpi_device *device)
 {
         int result = 0;
@@ -957,6 +989,10 @@ static int acpi_battery_add(struct acpi_device *device)
 #endif
                 kfree(battery);
         }
+
+        battery->pm_nb.notifier_call = battery_notify;
+        register_pm_notifier(&battery->pm_nb);
+
         return result;
 }
 
@@ -967,6 +1003,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
         battery = acpi_driver_data(device);
+        unregister_pm_notifier(&battery->pm_nb);
 #ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_battery_remove_fs(device);
 #endif
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index d68bd61072b..9749980ca6c 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -40,6 +40,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/dmi.h>
+#include <linux/suspend.h>
 
 #include "internal.h"
 
@@ -52,22 +53,6 @@ EXPORT_SYMBOL(acpi_root_dir);
 
 #define STRUCT_TO_INT(s)        (*((int*)&s))
 
-static int set_power_nocheck(const struct dmi_system_id *id)
-{
-        printk(KERN_NOTICE PREFIX "%s detected - "
-                "disable power check in power transition\n", id->ident);
-        acpi_power_nocheck = 1;
-        return 0;
-}
-static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {
-        {
-        set_power_nocheck, "HP Pavilion 05", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-        DMI_MATCH(DMI_SYS_VENDOR, "HP Pavilion 05"),
-        DMI_MATCH(DMI_PRODUCT_VERSION, "2001211RE101GLEND") }, NULL},
-        {},
-};
-
 
 #ifdef CONFIG_X86
 static int set_copy_dsdt(const struct dmi_system_id *id)
@@ -196,33 +181,24 @@ EXPORT_SYMBOL(acpi_bus_get_private_data);
                                  Power Management
    -------------------------------------------------------------------------- */
 
-int acpi_bus_get_power(acpi_handle handle, int *state)
+static int __acpi_bus_get_power(struct acpi_device *device, int *state)
 {
         int result = 0;
         acpi_status status = 0;
-        struct acpi_device *device = NULL;
         unsigned long long psc = 0;
 
-
-        result = acpi_bus_get_device(handle, &device);
-        if (result)
-                return result;
+        if (!device || !state)
+                return -EINVAL;
 
         *state = ACPI_STATE_UNKNOWN;
 
-        if (!device->flags.power_manageable) {
-                /* TBD: Non-recursive algorithm for walking up hierarchy */
-                if (device->parent)
-                        *state = device->parent->power.state;
-                else
-                        *state = ACPI_STATE_D0;
-        } else {
+        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);
+                        result = acpi_power_get_inferred_state(device, state);
                         if (result)
                                 return result;
                 } else if (device->power.flags.explicit_get) {
@@ -230,59 +206,33 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
                                                        NULL, &psc);
                         if (ACPI_FAILURE(status))
                                 return -ENODEV;
-                        device->power.state = (int)psc;
+                        *state = (int)psc;
                 }
-
-                *state = device->power.state;
+        } else {
+                /* TBD: Non-recursive algorithm for walking up hierarchy. */
+                *state = device->parent ?
+                        device->parent->power.state : ACPI_STATE_D0;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
-                          device->pnp.bus_id, device->power.state));
+                          device->pnp.bus_id, *state));
 
         return 0;
 }
 
-EXPORT_SYMBOL(acpi_bus_get_power);
 
-int acpi_bus_set_power(acpi_handle handle, int state)
+static int __acpi_bus_set_power(struct acpi_device *device, int state)
 {
         int result = 0;
         acpi_status status = AE_OK;
-        struct acpi_device *device = NULL;
         char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' };
 
-
-        result = acpi_bus_get_device(handle, &device);
-        if (result)
-                return result;
-
-        if ((state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
+        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                 return -EINVAL;
 
         /* Make sure this is a valid target state */
 
-        if (!device->flags.power_manageable) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",
-                                kobject_name(&device->dev.kobj)));
-                return -ENODEV;
-        }
-        /*
-         * Get device's current power state
-         */
-        if (!acpi_power_nocheck) {
-                /*
-                 * Maybe the incorrect power state is returned on the bogus
-                 * bios, which is different with the real power state.
-                 * For example: the bios returns D0 state and the real power
-                 * state is D3. OS expects to set the device to D0 state. In
-                 * such case if OS uses the power state returned by the BIOS,
-                 * the device can't be transisted to the correct power state.
-                 * So if the acpi_power_nocheck is set, it is unnecessary to
-                 * get the power state by calling acpi_bus_get_power.
-                 */
-                acpi_bus_get_power(device->handle, &device->power.state);
-        }
-        if ((state == device->power.state) && !device->flags.force_power_state) {
+        if (state == device->power.state) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
                                   state));
                 return 0;
@@ -351,8 +301,75 @@ int acpi_bus_set_power(acpi_handle handle, int state)
         return result;
 }
 
+
+int acpi_bus_set_power(acpi_handle handle, int state)
+{
+        struct acpi_device *device;
+        int result;
+
+        result = acpi_bus_get_device(handle, &device);
+        if (result)
+                return result;
+
+        if (!device->flags.power_manageable) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                "Device [%s] is not power manageable\n",
+                                dev_name(&device->dev)));
+                return -ENODEV;
+        }
+
+        return __acpi_bus_set_power(device, state);
+}
 EXPORT_SYMBOL(acpi_bus_set_power);
 
+
+int acpi_bus_init_power(struct acpi_device *device)
+{
+        int state;
+        int result;
+
+        if (!device)
+                return -EINVAL;
+
+        device->power.state = ACPI_STATE_UNKNOWN;
+
+        result = __acpi_bus_get_power(device, &state);
+        if (result)
+                return result;
+
+        if (device->power.flags.power_resources)
+                result = acpi_power_on_resources(device, state);
+
+        if (!result)
+                device->power.state = state;
+
+        return result;
+}
+
+
+int acpi_bus_update_power(acpi_handle handle, int *state_p)
+{
+        struct acpi_device *device;
+        int state;
+        int result;
+
+        result = acpi_bus_get_device(handle, &device);
+        if (result)
+                return result;
+
+        result = __acpi_bus_get_power(device, &state);
+        if (result)
+                return result;
+
+        result = __acpi_bus_set_power(device, state);
+        if (!result && state_p)
+                *state_p = state;
+
+        return result;
+}
+EXPORT_SYMBOL_GPL(acpi_bus_update_power);
+
+
 bool acpi_bus_power_manageable(acpi_handle handle)
 {
         struct acpi_device *device;
@@ -990,8 +1007,7 @@ struct kobject *acpi_kobj;
 
 static int __init acpi_init(void)
 {
-        int result = 0;
-
+        int result;
 
         if (acpi_disabled) {
                 printk(KERN_INFO PREFIX "Interpreter disabled.\n");
@@ -1006,36 +1022,18 @@ static int __init acpi_init(void)
 
         init_acpi_device_notify();
         result = acpi_bus_init();
-
-        if (!result) {
-                pci_mmcfg_late_init();
-                if (!(pm_flags & PM_APM))
-                        pm_flags |= PM_ACPI;
-                else {
-                        printk(KERN_INFO PREFIX
-                               "APM is already active, exiting\n");
-                        disable_acpi();
-                        result = -ENODEV;
-                }
-        } else
+        if (result) {
                 disable_acpi();
-
-        if (acpi_disabled)
                 return result;
+        }
 
-        /*
-         * If the laptop falls into the DMI check table, the power state check
-         * will be disabled in the course of device power transition.
-         */
-        dmi_check_system(power_nocheck_dmi_table);
-
+        pci_mmcfg_late_init();
         acpi_scan_init();
         acpi_ec_init();
-        acpi_power_init();
         acpi_debugfs_init();
         acpi_sleep_proc_init();
         acpi_wakeup_device_init();
-        return result;
+        return 0;
 }
 
 subsys_initcall(acpi_init);
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 71ef9cd0735..d27d072472f 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -78,8 +78,6 @@ 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);
-static int acpi_button_info_open_fs(struct inode *inode, struct file *file);
-static int acpi_button_state_open_fs(struct inode *inode, struct file *file);
 
 static struct acpi_driver acpi_button_driver = {
         .name = "button",
@@ -98,22 +96,7 @@ struct acpi_button {
         struct input_dev *input;
         char phys[32];                  /* for input device */
         unsigned long pushed;
-};
-
-static const struct file_operations acpi_button_info_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_button_info_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static const struct file_operations acpi_button_state_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_button_state_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
+        bool wakeup_enabled;
 };
 
 static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
@@ -124,20 +107,7 @@ static struct acpi_device *lid_device;
    -------------------------------------------------------------------------- */
 
 static struct proc_dir_entry *acpi_button_dir;
-
-static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
-{
-        struct acpi_device *device = seq->private;
-
-        seq_printf(seq, "type:                    %s\n",
-                   acpi_device_name(device));
-        return 0;
-}
-
-static int acpi_button_info_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_button_info_seq_show, PDE(inode)->data);
-}
+static struct proc_dir_entry *acpi_lid_dir;
 
 static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
 {
@@ -157,77 +127,85 @@ static int acpi_button_state_open_fs(struct inode *inode, struct file *file)
         return single_open(file, acpi_button_state_seq_show, PDE(inode)->data);
 }
 
-static struct proc_dir_entry *acpi_power_dir;
-static struct proc_dir_entry *acpi_sleep_dir;
-static struct proc_dir_entry *acpi_lid_dir;
+static const struct file_operations acpi_button_state_fops = {
+        .owner = THIS_MODULE,
+        .open = acpi_button_state_open_fs,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
 
 static int acpi_button_add_fs(struct acpi_device *device)
 {
         struct acpi_button *button = acpi_driver_data(device);
         struct proc_dir_entry *entry = NULL;
+        int ret = 0;
 
-        switch (button->type) {
-        case ACPI_BUTTON_TYPE_POWER:
-                if (!acpi_power_dir)
-                        acpi_power_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_POWER,
-                                                    acpi_button_dir);
-                entry = acpi_power_dir;
-                break;
-        case ACPI_BUTTON_TYPE_SLEEP:
-                if (!acpi_sleep_dir)
-                        acpi_sleep_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_SLEEP,
-                                                    acpi_button_dir);
-                entry = acpi_sleep_dir;
-                break;
-        case ACPI_BUTTON_TYPE_LID:
-                if (!acpi_lid_dir)
-                        acpi_lid_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_LID,
-                                                  acpi_button_dir);
-                entry = acpi_lid_dir;
-                break;
+        /* procfs I/F for ACPI lid device only */
+        if (button->type != ACPI_BUTTON_TYPE_LID)
+                return 0;
+
+        if (acpi_button_dir || acpi_lid_dir) {
+                printk(KERN_ERR PREFIX "More than one Lid device found!\n");
+                return -EEXIST;
         }
 
-        if (!entry)
+        /* create /proc/acpi/button */
+        acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
+        if (!acpi_button_dir)
                 return -ENODEV;
 
-        acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);
-        if (!acpi_device_dir(device))
-                return -ENODEV;
+        /* create /proc/acpi/button/lid */
+        acpi_lid_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
+        if (!acpi_lid_dir) {
+                ret = -ENODEV;
+                goto remove_button_dir;
+        }
 
-        /* 'info' [R] */
-        entry = proc_create_data(ACPI_BUTTON_FILE_INFO,
-                                 S_IRUGO, acpi_device_dir(device),
-                                 &acpi_button_info_fops, device);
-        if (!entry)
-                return -ENODEV;
+        /* create /proc/acpi/button/lid/LID/ */
+        acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), acpi_lid_dir);
+        if (!acpi_device_dir(device)) {
+                ret = -ENODEV;
+                goto remove_lid_dir;
+        }
 
-        /* show lid state [R] */
-        if (button->type == ACPI_BUTTON_TYPE_LID) {
-                entry = proc_create_data(ACPI_BUTTON_FILE_STATE,
-                                         S_IRUGO, acpi_device_dir(device),
-                                         &acpi_button_state_fops, device);
-                if (!entry)
-                        return -ENODEV;
+        /* create /proc/acpi/button/lid/LID/state */
+        entry = proc_create_data(ACPI_BUTTON_FILE_STATE,
+                                 S_IRUGO, acpi_device_dir(device),
+                                 &acpi_button_state_fops, device);
+        if (!entry) {
+                ret = -ENODEV;
+                goto remove_dev_dir;
         }
 
-        return 0;
+done:
+        return ret;
+
+remove_dev_dir:
+        remove_proc_entry(acpi_device_bid(device),
+                          acpi_lid_dir);
+        acpi_device_dir(device) = NULL;
+remove_lid_dir:
+        remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
+remove_button_dir:
+        remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
+        goto done;
 }
 
 static int acpi_button_remove_fs(struct acpi_device *device)
 {
         struct acpi_button *button = acpi_driver_data(device);
 
-        if (acpi_device_dir(device)) {
-                if (button->type == ACPI_BUTTON_TYPE_LID)
-                        remove_proc_entry(ACPI_BUTTON_FILE_STATE,
-                                          acpi_device_dir(device));
-                remove_proc_entry(ACPI_BUTTON_FILE_INFO,
-                                  acpi_device_dir(device));
+        if (button->type != ACPI_BUTTON_TYPE_LID)
+                return 0;
 
-                remove_proc_entry(acpi_device_bid(device),
-                                  acpi_device_dir(device)->parent);
-                acpi_device_dir(device) = NULL;
-        }
+        remove_proc_entry(ACPI_BUTTON_FILE_STATE,
+                          acpi_device_dir(device));
+        remove_proc_entry(acpi_device_bid(device),
+                          acpi_lid_dir);
+        acpi_device_dir(device) = NULL;
+        remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
+        remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
 
         return 0;
 }
@@ -279,6 +257,9 @@ static int acpi_lid_send_state(struct acpi_device *device)
         input_report_switch(button->input, SW_LID, !state);
         input_sync(button->input);
 
+        if (state)
+                pm_wakeup_event(&device->dev, 0);
+
         ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
         if (ret == NOTIFY_DONE)
                 ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
@@ -314,6 +295,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
                         input_sync(input);
                         input_report_key(input, keycode, 0);
                         input_sync(input);
+
+                        pm_wakeup_event(&device->dev, 0);
                 }
 
                 acpi_bus_generate_proc_event(device, event, ++button->pushed);
@@ -425,8 +408,10 @@ static int acpi_button_add(struct acpi_device *device)
                 /* Button's GPE is run-wake GPE */
                 acpi_enable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
-                device->wakeup.run_wake_count++;
-                device->wakeup.state.enabled = 1;
+                if (!device_may_wakeup(&device->dev)) {
+                        device_set_wakeup_enable(&device->dev, true);
+                        button->wakeup_enabled = true;
+                }
         }
 
         printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
@@ -448,8 +433,8 @@ static int acpi_button_remove(struct acpi_device *device, int type)
         if (device->wakeup.flags.valid) {
                 acpi_disable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
-                device->wakeup.run_wake_count--;
-                device->wakeup.state.enabled = 0;
+                if (button->wakeup_enabled)
+                        device_set_wakeup_enable(&device->dev, false);
         }
 
         acpi_button_remove_fs(device);
@@ -460,32 +445,12 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 
 static int __init acpi_button_init(void)
 {
-        int result;
-
-        acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
-        if (!acpi_button_dir)
-                return -ENODEV;
-
-        result = acpi_bus_register_driver(&acpi_button_driver);
-        if (result < 0) {
-                remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
-                return -ENODEV;
-        }
-
-        return 0;
+        return acpi_bus_register_driver(&acpi_button_driver);
 }
 
 static void __exit acpi_button_exit(void)
 {
         acpi_bus_unregister_driver(&acpi_button_driver);
-
-        if (acpi_power_dir)
-                remove_proc_entry(ACPI_BUTTON_SUBCLASS_POWER, acpi_button_dir);
-        if (acpi_sleep_dir)
-                remove_proc_entry(ACPI_BUTTON_SUBCLASS_SLEEP, acpi_button_dir);
-        if (acpi_lid_dir)
-                remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
-        remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
 }
 
 module_init(acpi_button_init);
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index 5df67f1d6c6..384f7abcff7 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -26,7 +26,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
                         size_t count, loff_t *ppos)
 {
         static char *buf;
-        static int uncopied_bytes;
+        static u32 max_size;
+        static u32 uncopied_bytes;
+
         struct acpi_table_header table;
         acpi_status status;
 
@@ -37,19 +39,24 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
                 if (copy_from_user(&table, user_buf,
                                    sizeof(struct acpi_table_header)))
                         return -EFAULT;
-                uncopied_bytes = table.length;
-                buf = kzalloc(uncopied_bytes, GFP_KERNEL);
+                uncopied_bytes = max_size = table.length;
+                buf = kzalloc(max_size, GFP_KERNEL);
                 if (!buf)
                         return -ENOMEM;
         }
 
-        if (uncopied_bytes < count) {
-                kfree(buf);
+        if (buf == NULL)
+                return -EINVAL;
+
+        if ((*ppos > max_size) ||
+            (*ppos + count > max_size) ||
+            (*ppos + count < count) ||
+            (count > uncopied_bytes))
                 return -EINVAL;
-        }
 
         if (copy_from_user(buf + (*ppos), user_buf, count)) {
                 kfree(buf);
+                buf = NULL;
                 return -EFAULT;
         }
 
@@ -59,6 +66,7 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
         if (!uncopied_bytes) {
                 status = acpi_install_method(buf);
                 kfree(buf);
+                buf = NULL;
                 if (ACPI_FAILURE(status))
                         return -EINVAL;
                 add_taint(TAINT_OVERRIDDEN_ACPI_TABLE);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 81514a4918c..1864ad3cf89 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -725,7 +725,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
                         complete_dock(ds);
                         dock_event(ds, event, DOCK_EVENT);
                         dock_lock(ds, 1);
-                        acpi_update_gpes();
+                        acpi_update_all_gpes();
                         break;
                 }
                 if (dock_present(ds) || dock_in_progress(ds))
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 372ff80b7b0..fa848c4116a 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -606,7 +606,8 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
         return 0;
 }
 
-static u32 acpi_ec_gpe_handler(void *data)
+static u32 acpi_ec_gpe_handler(acpi_handle gpe_device,
+        u32 gpe_number, void *data)
 {
         struct acpi_ec *ec = data;
 
@@ -618,7 +619,7 @@ static u32 acpi_ec_gpe_handler(void *data)
                 wake_up(&ec->wait);
                 ec_check_sci(ec, acpi_ec_read_status(ec));
         }
-        return ACPI_INTERRUPT_HANDLED;
+        return ACPI_INTERRUPT_HANDLED | ACPI_REENABLE_GPE;
 }
 
 /* --------------------------------------------------------------------------
@@ -934,6 +935,9 @@ static struct dmi_system_id __initdata ec_dmi_table[] = {
         ec_flag_msi, "MSI hardware", {
         DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL},
         {
+        ec_flag_msi, "MSI hardware", {
+        DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR")}, NULL},
+        {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
         {},
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 411620ef84c..05b44201a61 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -24,10 +24,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
 
 #define EC_SPACE_SIZE 256
 
-struct sysdev_class acpi_ec_sysdev_class = {
-        .name = "ec",
-};
-
 static struct dentry *acpi_ec_debugfs_dir;
 
 static int acpi_ec_open_io(struct inode *i, struct file *f)
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 60049080c86..467479f07c1 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -86,7 +86,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &acpi_state);
+        result = acpi_bus_update_power(device->handle, &acpi_state);
         if (result)
                 return result;
 
@@ -123,7 +123,6 @@ static struct thermal_cooling_device_ops fan_cooling_ops = {
 static int acpi_fan_add(struct acpi_device *device)
 {
         int result = 0;
-        int state = 0;
         struct thermal_cooling_device *cdev;
 
         if (!device)
@@ -132,16 +131,12 @@ static int acpi_fan_add(struct acpi_device *device)
         strcpy(acpi_device_name(device), "Fan");
         strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
 
-        result = acpi_bus_get_power(device->handle, &state);
+        result = acpi_bus_update_power(device->handle, NULL);
         if (result) {
-                printk(KERN_ERR PREFIX "Reading power state\n");
+                printk(KERN_ERR PREFIX "Setting initial power state\n");
                 goto end;
         }
 
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, state);
-        device->flags.force_power_state = 0;
-
         cdev = thermal_cooling_device_register("Fan", device,
                                                 &fan_cooling_ops);
         if (IS_ERR(cdev)) {
@@ -200,22 +195,14 @@ static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
 
 static int acpi_fan_resume(struct acpi_device *device)
 {
-        int result = 0;
-        int power_state = 0;
+        int result;
 
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &power_state);
-        if (result) {
-                printk(KERN_ERR PREFIX
-                                  "Error reading fan power state\n");
-                return result;
-        }
-
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, power_state);
-        device->flags.force_power_state = 0;
+        result = acpi_bus_update_power(device->handle, NULL);
+        if (result)
+                printk(KERN_ERR PREFIX "Error updating fan power state\n");
 
         return result;
 }
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 78b0164c35b..7c47ed55e52 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -167,11 +167,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                 "firmware_node");
                 ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                 "physical_node");
-                if (acpi_dev->wakeup.flags.valid) {
+                if (acpi_dev->wakeup.flags.valid)
                         device_set_wakeup_capable(dev, true);
-                        device_set_wakeup_enable(dev,
-                                                acpi_dev->wakeup.state.enabled);
-                }
         }
 
         return 0;
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a212bfeddf8..4bfb759deb1 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -21,8 +21,6 @@
 #ifndef _ACPI_INTERNAL_H_
 #define _ACPI_INTERNAL_H_
 
-#include <linux/sysdev.h>
-
 #define PREFIX "ACPI: "
 
 int init_acpi_device_notify(void);
@@ -41,9 +39,10 @@ static inline int acpi_debugfs_init(void) { return 0; }
 int acpi_power_init(void);
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
-int acpi_power_get_inferred_state(struct acpi_device *device);
+int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
+int acpi_power_on_resources(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
-extern int acpi_power_nocheck;
+int acpi_bus_init_power(struct acpi_device *device);
 
 int acpi_wakeup_device_init(void);
 void acpi_early_processor_set_pdc(void);
@@ -63,7 +62,6 @@ struct acpi_ec {
         struct list_head list;
         struct transaction *curr;
         spinlock_t curr_lock;
-        struct sys_device sysdev;
 };
 
 extern struct acpi_ec *first_ec;
@@ -82,8 +80,16 @@ extern int acpi_sleep_init(void);
 
 #ifdef CONFIG_ACPI_SLEEP
 int acpi_sleep_proc_init(void);
+int suspend_nvs_alloc(void);
+void suspend_nvs_free(void);
+int suspend_nvs_save(void);
+void suspend_nvs_restore(void);
 #else
 static inline int acpi_sleep_proc_init(void) { return 0; }
+static inline int suspend_nvs_alloc(void) { return 0; }
+static inline void suspend_nvs_free(void) {}
+static inline int suspend_nvs_save(void) { return 0; }
+static inline void suspend_nvs_restore(void) {}
 #endif
 
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 5718566e00f..3b5c3189fd9 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -274,15 +274,21 @@ acpi_table_parse_srat(enum acpi_srat_type id,
 
 int __init acpi_numa_init(void)
 {
-        int ret = 0;
+        int cnt = 0;
+
+        /*
+         * Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
+         * SRAT cpu entries could have different order with that in MADT.
+         * So go over all cpu entries in SRAT to get apicid to node mapping.
+         */
 
         /* SRAT: Static Resource Affinity Table */
         if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
-                                     acpi_parse_x2apic_affinity, nr_cpu_ids);
+                                     acpi_parse_x2apic_affinity, 0);
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
-                                     acpi_parse_processor_affinity, nr_cpu_ids);
-                ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
+                                     acpi_parse_processor_affinity, 0);
+                cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
                                             acpi_parse_memory_affinity,
                                             NR_NODE_MEMBLKS);
         }
@@ -291,7 +297,10 @@ int __init acpi_numa_init(void)
         acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
 
         acpi_numa_arch_fixup();
-        return ret;
+
+        if (cnt <= 0)
+                return cnt ?: -ENOENT;
+        return 0;
 }
 
 int acpi_get_pxm(acpi_handle h)
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
new file mode 100644
index 00000000000..096787b43c9
--- /dev/null
+++ b/drivers/acpi/nvs.c
@@ -0,0 +1,161 @@
+/*
+ * nvs.c - Routines for saving and restoring ACPI NVS memory region
+ *
+ * Copyright (C) 2008-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
+ *
+ * This file is released under the GPLv2.
+ */
+
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/acpi.h>
+#include <linux/acpi_io.h>
+#include <acpi/acpiosxf.h>
+
+/*
+ * 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
+ * resume.  The code below implements a mechanism allowing us to do that.
+ */
+
+struct nvs_page {
+        unsigned long phys_start;
+        unsigned int size;
+        void *kaddr;
+        void *data;
+        bool unmap;
+        struct list_head node;
+};
+
+static LIST_HEAD(nvs_list);
+
+/**
+ *      suspend_nvs_register - register platform NVS memory region to save
+ *      @start - physical address of the region
+ *      @size - size of the region
+ *
+ *      The NVS region need not be page-aligned (both ends) and we arrange
+ *      things so that the data from page-aligned addresses in this region will
+ *      be copied into separate RAM pages.
+ */
+int suspend_nvs_register(unsigned long start, unsigned long size)
+{
+        struct nvs_page *entry, *next;
+
+        pr_info("PM: Registering ACPI NVS region at %lx (%ld bytes)\n",
+                start, size);
+
+        while (size > 0) {
+                unsigned int nr_bytes;
+
+                entry = kzalloc(sizeof(struct nvs_page), GFP_KERNEL);
+                if (!entry)
+                        goto Error;
+
+                list_add_tail(&entry->node, &nvs_list);
+                entry->phys_start = start;
+                nr_bytes = PAGE_SIZE - (start & ~PAGE_MASK);
+                entry->size = (size < nr_bytes) ? size : nr_bytes;
+
+                start += entry->size;
+                size -= entry->size;
+        }
+        return 0;
+
+ Error:
+        list_for_each_entry_safe(entry, next, &nvs_list, node) {
+                list_del(&entry->node);
+                kfree(entry);
+        }
+        return -ENOMEM;
+}
+
+/**
+ *      suspend_nvs_free - free data pages allocated for saving NVS regions
+ */
+void suspend_nvs_free(void)
+{
+        struct nvs_page *entry;
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data) {
+                        free_page((unsigned long)entry->data);
+                        entry->data = NULL;
+                        if (entry->kaddr) {
+                                if (entry->unmap) {
+                                        iounmap(entry->kaddr);
+                                        entry->unmap = false;
+                                } else {
+                                        acpi_os_unmap_memory(entry->kaddr,
+                                                             entry->size);
+                                }
+                                entry->kaddr = NULL;
+                        }
+                }
+}
+
+/**
+ *      suspend_nvs_alloc - allocate memory necessary for saving NVS regions
+ */
+int suspend_nvs_alloc(void)
+{
+        struct nvs_page *entry;
+
+        list_for_each_entry(entry, &nvs_list, node) {
+                entry->data = (void *)__get_free_page(GFP_KERNEL);
+                if (!entry->data) {
+                        suspend_nvs_free();
+                        return -ENOMEM;
+                }
+        }
+        return 0;
+}
+
+/**
+ *      suspend_nvs_save - save NVS memory regions
+ */
+int suspend_nvs_save(void)
+{
+        struct nvs_page *entry;
+
+        printk(KERN_INFO "PM: Saving platform NVS memory\n");
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data) {
+                        unsigned long phys = entry->phys_start;
+                        unsigned int size = entry->size;
+
+                        entry->kaddr = acpi_os_get_iomem(phys, size);
+                        if (!entry->kaddr) {
+                                entry->kaddr = acpi_os_ioremap(phys, size);
+                                entry->unmap = !!entry->kaddr;
+                        }
+                        if (!entry->kaddr) {
+                                suspend_nvs_free();
+                                return -ENOMEM;
+                        }
+                        memcpy(entry->data, entry->kaddr, entry->size);
+                }
+
+        return 0;
+}
+
+/**
+ *      suspend_nvs_restore - restore NVS memory regions
+ *
+ *      This function is going to be called with interrupts disabled, so it
+ *      cannot iounmap the virtual addresses used to access the NVS region.
+ */
+void suspend_nvs_restore(void)
+{
+        struct nvs_page *entry;
+
+        printk(KERN_INFO "PM: Restoring platform NVS memory\n");
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data)
+                        memcpy(entry->kaddr, entry->data, entry->size);
+}
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 966feddf6b1..45ad4ffef53 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -38,6 +38,7 @@
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <linux/efi.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
@@ -75,7 +76,6 @@ EXPORT_SYMBOL(acpi_in_debugger);
 extern char line_buf[80];
 #endif                          /*ENABLE_DEBUGGER */
 
-static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
@@ -104,14 +104,11 @@ struct acpi_ioremap {
         void __iomem *virt;
         acpi_physical_address phys;
         acpi_size size;
-        struct kref ref;
+        unsigned long refcount;
 };
 
 static LIST_HEAD(acpi_ioremaps);
-static DEFINE_SPINLOCK(acpi_ioremap_lock);
-
-#define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
-static char osi_setup_string[OSI_STRING_LENGTH_MAX];
+static DEFINE_MUTEX(acpi_ioremap_lock);
 
 static void __init acpi_osi_setup_late(void);
 
@@ -152,8 +149,7 @@ static struct osi_linux {
         unsigned int    enable:1;
         unsigned int    dmi:1;
         unsigned int    cmdline:1;
-        unsigned int    known:1;
-} osi_linux = { 0, 0, 0, 0};
+} osi_linux = {0, 0, 0};
 
 static u32 acpi_osi_handler(acpi_string interface, u32 supported)
 {
@@ -288,6 +284,22 @@ acpi_map_vaddr_lookup(acpi_physical_address phys, unsigned int size)
         return NULL;
 }
 
+void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size)
+{
+        struct acpi_ioremap *map;
+        void __iomem *virt = NULL;
+
+        mutex_lock(&acpi_ioremap_lock);
+        map = acpi_map_lookup(phys, size);
+        if (map) {
+                virt = map->virt + (phys - map->phys);
+                map->refcount++;
+        }
+        mutex_unlock(&acpi_ioremap_lock);
+        return virt;
+}
+EXPORT_SYMBOL_GPL(acpi_os_get_iomem);
+
 /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */
 static struct acpi_ioremap *
 acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
@@ -305,10 +317,10 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
 void __iomem *__init_refok
 acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
-        struct acpi_ioremap *map, *tmp_map;
-        unsigned long flags, pg_sz;
+        struct acpi_ioremap *map;
         void __iomem *virt;
-        phys_addr_t pg_off;
+        acpi_physical_address pg_off;
+        acpi_size pg_sz;
 
         if (phys > ULONG_MAX) {
                 printk(KERN_ERR PREFIX "Cannot map memory that high\n");
@@ -318,14 +330,25 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
         if (!acpi_gbl_permanent_mmap)
                 return __acpi_map_table((unsigned long)phys, size);
 
+        mutex_lock(&acpi_ioremap_lock);
+        /* Check if there's a suitable mapping already. */
+        map = acpi_map_lookup(phys, size);
+        if (map) {
+                map->refcount++;
+                goto out;
+        }
+
         map = kzalloc(sizeof(*map), GFP_KERNEL);
-        if (!map)
+        if (!map) {
+                mutex_unlock(&acpi_ioremap_lock);
                 return NULL;
+        }
 
         pg_off = round_down(phys, PAGE_SIZE);
         pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off;
-        virt = ioremap(pg_off, pg_sz);
+        virt = acpi_os_ioremap(pg_off, pg_sz);
         if (!virt) {
+                mutex_unlock(&acpi_ioremap_lock);
                 kfree(map);
                 return NULL;
         }
@@ -334,62 +357,51 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
         map->virt = virt;
         map->phys = pg_off;
         map->size = pg_sz;
-        kref_init(&map->ref);
-
-        spin_lock_irqsave(&acpi_ioremap_lock, flags);
-        /* Check if page has already been mapped. */
-        tmp_map = acpi_map_lookup(phys, size);
-        if (tmp_map) {
-                kref_get(&tmp_map->ref);
-                spin_unlock_irqrestore(&acpi_ioremap_lock, flags);
-                iounmap(map->virt);
-                kfree(map);
-                return tmp_map->virt + (phys - tmp_map->phys);
-        }
+        map->refcount = 1;
+
         list_add_tail_rcu(&map->list, &acpi_ioremaps);
-        spin_unlock_irqrestore(&acpi_ioremap_lock, flags);
 
+ out:
+        mutex_unlock(&acpi_ioremap_lock);
         return map->virt + (phys - map->phys);
 }
 EXPORT_SYMBOL_GPL(acpi_os_map_memory);
 
-static void acpi_kref_del_iomap(struct kref *ref)
+static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
 {
-        struct acpi_ioremap *map;
+        if (!--map->refcount)
+                list_del_rcu(&map->list);
+}
 
-        map = container_of(ref, struct acpi_ioremap, ref);
-        list_del_rcu(&map->list);
+static void acpi_os_map_cleanup(struct acpi_ioremap *map)
+{
+        if (!map->refcount) {
+                synchronize_rcu();
+                iounmap(map->virt);
+                kfree(map);
+        }
 }
 
 void __ref acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
 {
         struct acpi_ioremap *map;
-        unsigned long flags;
-        int del;
 
         if (!acpi_gbl_permanent_mmap) {
                 __acpi_unmap_table(virt, size);
                 return;
         }
 
-        spin_lock_irqsave(&acpi_ioremap_lock, flags);
+        mutex_lock(&acpi_ioremap_lock);
         map = acpi_map_lookup_virt(virt, size);
         if (!map) {
-                spin_unlock_irqrestore(&acpi_ioremap_lock, flags);
-                printk(KERN_ERR PREFIX "%s: bad address %p\n", __func__, virt);
-                dump_stack();
+                mutex_unlock(&acpi_ioremap_lock);
+                WARN(true, PREFIX "%s: bad address %p\n", __func__, virt);
                 return;
         }
+        acpi_os_drop_map_ref(map);
+        mutex_unlock(&acpi_ioremap_lock);
 
-        del = kref_put(&map->ref, acpi_kref_del_iomap);
-        spin_unlock_irqrestore(&acpi_ioremap_lock, flags);
-
-        if (!del)
-                return;
-
-        synchronize_rcu();
-        iounmap(map->virt);
-        kfree(map);
+        acpi_os_map_cleanup(map);
 }
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
 
@@ -399,7 +411,7 @@ 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 *addr)
+static int acpi_os_map_generic_address(struct acpi_generic_address *addr)
 {
         void __iomem *virt;
 
@@ -415,13 +427,10 @@ int acpi_os_map_generic_address(struct acpi_generic_address *addr)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(acpi_os_map_generic_address);
 
-void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
+static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
 {
-        void __iomem *virt;
-        unsigned long flags;
-        acpi_size size = addr->bit_width / 8;
+        struct acpi_ioremap *map;
 
         if (addr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
                 return;
@@ -429,13 +438,17 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)
         if (!addr->address || !addr->bit_width)
                 return;
 
-        spin_lock_irqsave(&acpi_ioremap_lock, flags);
-        virt = acpi_map_vaddr_lookup(addr->address, size);
-        spin_unlock_irqrestore(&acpi_ioremap_lock, flags);
+        mutex_lock(&acpi_ioremap_lock);
+        map = acpi_map_lookup(addr->address, addr->bit_width / 8);
+        if (!map) {
+                mutex_unlock(&acpi_ioremap_lock);
+                return;
+        }
+        acpi_os_drop_map_ref(map);
+        mutex_unlock(&acpi_ioremap_lock);
 
-        acpi_os_unmap_memory(virt, size);
+        acpi_os_map_cleanup(map);
 }
-EXPORT_SYMBOL_GPL(acpi_os_unmap_generic_address);
 
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
@@ -518,11 +531,15 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
         acpi_irq_stats_init();
 
         /*
-         * Ignore the GSI from the core, and use the value in our copy of the
-         * FADT. It may not be the same if an interrupt source override exists
-         * for the SCI.
+         * ACPI interrupts different from the SCI in our copy of the FADT are
+         * not supported.
          */
-        gsi = acpi_gbl_FADT.sci_interrupt;
+        if (gsi != acpi_gbl_FADT.sci_interrupt)
+                return AE_BAD_PARAMETER;
+
+        if (acpi_irq_handler)
+                return AE_ALREADY_ACQUIRED;
+
         if (acpi_gsi_to_irq(gsi, &irq) < 0) {
                 printk(KERN_ERR PREFIX "SCI (ACPI GSI %d) not registered\n",
                        gsi);
@@ -533,20 +550,20 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
         acpi_irq_context = context;
         if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
                 printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
+                acpi_irq_handler = NULL;
                 return AE_NOT_ACQUIRED;
         }
-        acpi_irq_irq = irq;
 
         return AE_OK;
 }
 
 acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
 {
-        if (irq) {
-                free_irq(irq, acpi_irq);
-                acpi_irq_handler = NULL;
-                acpi_irq_irq = 0;
-        }
+        if (irq != acpi_gbl_FADT.sci_interrupt)
+                return AE_BAD_PARAMETER;
+
+        free_irq(irq, acpi_irq);
+        acpi_irq_handler = NULL;
 
         return AE_OK;
 }
@@ -638,17 +655,21 @@ EXPORT_SYMBOL(acpi_os_write_port);
 acpi_status
 acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
 {
-        u32 dummy;
         void __iomem *virt_addr;
-        int size = width / 8, unmap = 0;
+        unsigned int size = width / 8;
+        bool unmap = false;
+        u32 dummy;
 
         rcu_read_lock();
         virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
-        rcu_read_unlock();
         if (!virt_addr) {
-                virt_addr = ioremap(phys_addr, size);
-                unmap = 1;
+                rcu_read_unlock();
+                virt_addr = acpi_os_ioremap(phys_addr, size);
+                if (!virt_addr)
+                        return AE_BAD_ADDRESS;
+                unmap = true;
         }
+
         if (!value)
                 value = &dummy;
 
@@ -668,6 +689,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
 
         if (unmap)
                 iounmap(virt_addr);
+        else
+                rcu_read_unlock();
 
         return AE_OK;
 }
@@ -676,14 +699,17 @@ acpi_status
 acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 {
         void __iomem *virt_addr;
-        int size = width / 8, unmap = 0;
+        unsigned int size = width / 8;
+        bool unmap = false;
 
         rcu_read_lock();
         virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
-        rcu_read_unlock();
         if (!virt_addr) {
-                virt_addr = ioremap(phys_addr, size);
-                unmap = 1;
+                rcu_read_unlock();
+                virt_addr = acpi_os_ioremap(phys_addr, size);
+                if (!virt_addr)
+                        return AE_BAD_ADDRESS;
+                unmap = true;
         }
 
         switch (width) {
@@ -702,6 +728,8 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 
         if (unmap)
                 iounmap(virt_addr);
+        else
+                rcu_read_unlock();
 
         return AE_OK;
 }
@@ -1055,13 +1083,53 @@ static int __init acpi_os_name_setup(char *str)
 
 __setup("acpi_os_name=", acpi_os_name_setup);
 
+#define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
+#define OSI_STRING_ENTRIES_MAX 16       /* arbitrary */
+
+struct osi_setup_entry {
+        char string[OSI_STRING_LENGTH_MAX];
+        bool enable;
+};
+
+static struct osi_setup_entry __initdata osi_setup_entries[OSI_STRING_ENTRIES_MAX];
+
+void __init acpi_osi_setup(char *str)
+{
+        struct osi_setup_entry *osi;
+        bool enable = true;
+        int i;
+
+        if (!acpi_gbl_create_osi_method)
+                return;
+
+        if (str == NULL || *str == '\0') {
+                printk(KERN_INFO PREFIX "_OSI method disabled\n");
+                acpi_gbl_create_osi_method = FALSE;
+                return;
+        }
+
+        if (*str == '!') {
+                str++;
+                enable = false;
+        }
+
+        for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
+                osi = &osi_setup_entries[i];
+                if (!strcmp(osi->string, str)) {
+                        osi->enable = enable;
+                        break;
+                } else if (osi->string[0] == '\0') {
+                        osi->enable = enable;
+                        strncpy(osi->string, str, OSI_STRING_LENGTH_MAX);
+                        break;
+                }
+        }
+}
+
 static void __init set_osi_linux(unsigned int enable)
 {
-        if (osi_linux.enable != enable) {
+        if (osi_linux.enable != enable)
                 osi_linux.enable = enable;
-                printk(KERN_NOTICE PREFIX "%sed _OSI(Linux)\n",
-                        enable ? "Add": "Delet");
-        }
 
         if (osi_linux.enable)
                 acpi_osi_setup("Linux");
@@ -1073,7 +1141,8 @@ static void __init set_osi_linux(unsigned int enable)
 
 static void __init acpi_cmdline_osi_linux(unsigned int enable)
 {
-        osi_linux.cmdline = 1;  /* cmdline set the default */
+        osi_linux.cmdline = 1;  /* cmdline set the default and override DMI */
+        osi_linux.dmi = 0;
         set_osi_linux(enable);
 
         return;
@@ -1081,15 +1150,12 @@ static void __init acpi_cmdline_osi_linux(unsigned int enable)
 
 void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
 {
-        osi_linux.dmi = 1;      /* DMI knows that this box asks OSI(Linux) */
-
         printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
 
         if (enable == -1)
                 return;
 
-        osi_linux.known = 1;    /* DMI knows which OSI(Linux) default needed */
-
+        osi_linux.dmi = 1;      /* DMI knows that this box asks OSI(Linux) */
         set_osi_linux(enable);
 
         return;
@@ -1104,37 +1170,44 @@ void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
  */
 static void __init acpi_osi_setup_late(void)
 {
-        char *str = osi_setup_string;
+        struct osi_setup_entry *osi;
+        char *str;
+        int i;
+        acpi_status status;
 
-        if (*str == '\0')
-                return;
+        for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
+                osi = &osi_setup_entries[i];
+                str = osi->string;
 
-        if (!strcmp("!Linux", str)) {
-                acpi_cmdline_osi_linux(0);      /* !enable */
-        } else if (*str == '!') {
-                if (acpi_remove_interface(++str) == AE_OK)
-                        printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
-        } else if (!strcmp("Linux", str)) {
-                acpi_cmdline_osi_linux(1);      /* enable */
-        } else {
-                if (acpi_install_interface(str) == AE_OK)
-                        printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
+                if (*str == '\0')
+                        break;
+                if (osi->enable) {
+                        status = acpi_install_interface(str);
+
+                        if (ACPI_SUCCESS(status))
+                                printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
+                } else {
+                        status = acpi_remove_interface(str);
+
+                        if (ACPI_SUCCESS(status))
+                                printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
+                }
         }
 }
 
-int __init acpi_osi_setup(char *str)
+static int __init osi_setup(char *str)
 {
-        if (str == NULL || *str == '\0') {
-                printk(KERN_INFO PREFIX "_OSI method disabled\n");
-                acpi_gbl_create_osi_method = FALSE;
-        } else {
-                strncpy(osi_setup_string, str, OSI_STRING_LENGTH_MAX);
-        }
+        if (str && !strcmp("Linux", str))
+                acpi_cmdline_osi_linux(1);
+        else if (str && !strcmp("!Linux", str))
+                acpi_cmdline_osi_linux(0);
+        else
+                acpi_osi_setup(str);
 
         return 1;
 }
 
-__setup("acpi_osi=", acpi_osi_setup);
+__setup("acpi_osi=", osi_setup);
 
 /* enable serialization to combat AE_ALREADY_EXISTS errors */
 static int __init acpi_serialize_setup(char *str)
@@ -1192,8 +1265,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
 int acpi_check_resource_conflict(const struct resource *res)
 {
         struct acpi_res_list *res_list_elem;
-        int ioport;
-        int clash = 0;
+        int ioport = 0, clash = 0;
 
         if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
                 return 0;
@@ -1223,9 +1295,13 @@ int acpi_check_resource_conflict(const struct resource *res)
         if (clash) {
                 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
                         printk(KERN_WARNING "ACPI: resource %s %pR"
-                               " conflicts with ACPI region %s %pR\n",
+                               " conflicts with ACPI region %s "
+                               "[%s 0x%zx-0x%zx]\n",
                                res->name, res, res_list_elem->name,
-                               res_list_elem);
+                               (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"
@@ -1530,11 +1606,11 @@ acpi_status __init acpi_os_initialize(void)
         return AE_OK;
 }
 
-acpi_status acpi_os_initialize1(void)
+acpi_status __init acpi_os_initialize1(void)
 {
-        kacpid_wq = create_workqueue("kacpid");
-        kacpi_notify_wq = create_workqueue("kacpi_notify");
-        kacpi_hotplug_wq = create_workqueue("kacpi_hotplug");
+        kacpid_wq = alloc_workqueue("kacpid", 0, 1);
+        kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);
+        kacpi_hotplug_wq = alloc_workqueue("kacpi_hotplug", 0, 1);
         BUG_ON(!kacpid_wq);
         BUG_ON(!kacpi_notify_wq);
         BUG_ON(!kacpi_hotplug_wq);
@@ -1546,7 +1622,7 @@ acpi_status acpi_os_initialize1(void)
 acpi_status acpi_os_terminate(void)
 {
         if (acpi_irq_handler) {
-                acpi_os_remove_interrupt_handler(acpi_irq_irq,
+                acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt,
                                                  acpi_irq_handler);
         }
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 9ff80a7e9f6..4a29763b8eb 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -29,7 +29,7 @@
  *         for IRQ management (e.g. start()->_SRS).
  */
 
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -757,14 +757,13 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link)
         return 0;
 }
 
-static int irqrouter_resume(struct sys_device *dev)
+static void irqrouter_resume(void)
 {
         struct acpi_pci_link *link;
 
         list_for_each_entry(link, &acpi_link_list, list) {
                 acpi_pci_link_resume(link);
         }
-        return 0;
 }
 
 static int acpi_pci_link_remove(struct acpi_device *device, int type)
@@ -871,32 +870,19 @@ static int __init acpi_irq_balance_set(char *str)
 
 __setup("acpi_irq_balance", acpi_irq_balance_set);
 
-/* FIXME: we will remove this interface after all drivers call pci_disable_device */
-static struct sysdev_class irqrouter_sysdev_class = {
-        .name = "irqrouter",
+static struct syscore_ops irqrouter_syscore_ops = {
         .resume = irqrouter_resume,
 };
 
-static struct sys_device device_irqrouter = {
-        .id = 0,
-        .cls = &irqrouter_sysdev_class,
-};
-
-static int __init irqrouter_init_sysfs(void)
+static int __init irqrouter_init_ops(void)
 {
-        int error;
+        if (!acpi_disabled && !acpi_noirq)
+                register_syscore_ops(&irqrouter_syscore_ops);
 
-        if (acpi_disabled || acpi_noirq)
-                return 0;
-
-        error = sysdev_class_register(&irqrouter_sysdev_class);
-        if (!error)
-                error = sysdev_register(&device_irqrouter);
-
-        return error;
+        return 0;
 }
 
-device_initcall(irqrouter_init_sysfs);
+device_initcall(irqrouter_init_ops);
 
 static int __init acpi_pci_link_init(void)
 {
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 96668ad0962..f911a2f8cc3 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -32,10 +32,12 @@
 #include <linux/pm_runtime.h>
 #include <linux/pci.h>
 #include <linux/pci-acpi.h>
+#include <linux/pci-aspm.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <acpi/apei.h>
 
 #define PREFIX "ACPI: "
 
@@ -47,6 +49,11 @@ static int acpi_pci_root_add(struct acpi_device *device);
 static int acpi_pci_root_remove(struct acpi_device *device, int type);
 static int acpi_pci_root_start(struct acpi_device *device);
 
+#define ACPI_PCIE_REQ_SUPPORT (OSC_EXT_PCI_CONFIG_SUPPORT \
+                                | OSC_ACTIVE_STATE_PWR_SUPPORT \
+                                | OSC_CLOCK_PWR_CAPABILITY_SUPPORT \
+                                | OSC_MSI_SUPPORT)
+
 static const struct acpi_device_id root_device_ids[] = {
         {"PNP0A03", 0},
         {"", 0},
@@ -558,7 +565,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         /* Indicate support for various _OSC capabilities. */
         if (pci_ext_cfg_avail(root->bus->self))
                 flags |= OSC_EXT_PCI_CONFIG_SUPPORT;
-        if (pcie_aspm_enabled())
+        if (pcie_aspm_support_enabled())
                 flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |
                         OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
         if (pci_msi_enabled())
@@ -566,6 +573,37 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         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
+                        | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL
+                        | OSC_PCI_EXPRESS_PME_CONTROL;
+
+                if (pci_aer_available()) {
+                        if (aer_acpi_firmware_first())
+                                dev_dbg(root->bus->bridge,
+                                        "PCIe errors handled by BIOS.\n");
+                        else
+                                flags |= OSC_PCI_EXPRESS_AER_CONTROL;
+                }
+
+                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);
+                if (ACPI_SUCCESS(status)) {
+                        dev_info(root->bus->bridge,
+                                "ACPI _OSC control (0x%02x) granted\n", flags);
+                } else {
+                        dev_dbg(root->bus->bridge,
+                                "ACPI _OSC request failed (code %d)\n", status);
+                        printk(KERN_INFO "Unable to assume _OSC PCIe control. "
+                                "Disabling ASPM\n");
+                        pcie_no_aspm();
+                }
+        }
+
         pci_acpi_add_bus_pm_notifier(device, root->bus);
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(root->bus->bridge, true);
@@ -600,6 +638,8 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 
 static int __init acpi_pci_root_init(void)
 {
+        acpi_hest_init();
+
         if (acpi_pci_disabled)
                 return 0;
 
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 67dedeed144..9ac2a9fa90f 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -56,9 +56,6 @@ ACPI_MODULE_NAME("power");
 #define ACPI_POWER_RESOURCE_STATE_ON    0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
 
-int acpi_power_nocheck;
-module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
-
 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);
@@ -148,9 +145,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
 
 static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
 {
-        int result = 0, state1;
-        u32 i = 0;
-
+        int cur_state;
+        int i = 0;
 
         if (!list || !state)
                 return -EINVAL;
@@ -158,25 +154,33 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
         /* The state of the list is 'on' IFF all resources are 'on'. */
 
         for (i = 0; i < list->count; i++) {
-                /*
-                 * The state of the power resource can be obtained by
-                 * using the ACPI handle. In such case it is unnecessary to
-                 * get the Power resource first and then get its state again.
-                 */
-                result = acpi_power_get_state(list->handles[i], &state1);
+                struct acpi_power_resource *resource;
+                acpi_handle handle = list->handles[i];
+                int result;
+
+                result = acpi_power_get_context(handle, &resource);
                 if (result)
                         return result;
 
-                *state = state1;
+                mutex_lock(&resource->resource_lock);
+
+                result = acpi_power_get_state(handle, &cur_state);
+
+                mutex_unlock(&resource->resource_lock);
+
+                if (result)
+                        return result;
 
-                if (*state != ACPI_POWER_RESOURCE_STATE_ON)
+                if (cur_state != ACPI_POWER_RESOURCE_STATE_ON)
                         break;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource list is %s\n",
-                          *state ? "on" : "off"));
+                          cur_state ? "on" : "off"));
 
-        return result;
+        *state = cur_state;
+
+        return 0;
 }
 
 static int __acpi_power_on(struct acpi_power_resource *resource)
@@ -213,14 +217,16 @@ static int acpi_power_on(acpi_handle handle)
                                   resource->name));
         } else {
                 result = __acpi_power_on(resource);
+                if (result)
+                        resource->ref_count--;
         }
 
         mutex_unlock(&resource->resource_lock);
 
-        return 0;
+        return result;
 }
 
-static int acpi_power_off_device(acpi_handle handle)
+static int acpi_power_off(acpi_handle handle)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -264,6 +270,35 @@ static int acpi_power_off_device(acpi_handle handle)
         return result;
 }
 
+static void __acpi_power_off_list(struct acpi_handle_list *list, int num_res)
+{
+        int i;
+
+        for (i = num_res - 1; i >= 0 ; i--)
+                acpi_power_off(list->handles[i]);
+}
+
+static void acpi_power_off_list(struct acpi_handle_list *list)
+{
+        __acpi_power_off_list(list, list->count);
+}
+
+static int acpi_power_on_list(struct acpi_handle_list *list)
+{
+        int result = 0;
+        int i;
+
+        for (i = 0; i < list->count; i++) {
+                result = acpi_power_on(list->handles[i]);
+                if (result) {
+                        __acpi_power_off_list(list, i);
+                        break;
+                }
+        }
+
+        return result;
+}
+
 /**
  * acpi_device_sleep_wake - execute _DSW (Device Sleep Wake) or (deprecated in
  *                          ACPI 3.0) _PSW (Power State Wake)
@@ -402,8 +437,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
 
         /* Close power resource */
         for (i = 0; i < dev->wakeup.resources.count; i++) {
-                int ret = acpi_power_off_device(
-                                dev->wakeup.resources.handles[i]);
+                int ret = acpi_power_off(dev->wakeup.resources.handles[i]);
                 if (ret) {
                         printk(KERN_ERR PREFIX "Transition power state\n");
                         dev->wakeup.flags.valid = 0;
@@ -421,19 +455,16 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
                              Device Power Management
    -------------------------------------------------------------------------- */
 
-int acpi_power_get_inferred_state(struct acpi_device *device)
+int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
 {
         int result = 0;
         struct acpi_handle_list *list = NULL;
         int list_state = 0;
         int i = 0;
 
-
-        if (!device)
+        if (!device || !state)
                 return -EINVAL;
 
-        device->power.state = ACPI_STATE_UNKNOWN;
-
         /*
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
@@ -448,66 +479,51 @@ int acpi_power_get_inferred_state(struct acpi_device *device)
                         return result;
 
                 if (list_state == ACPI_POWER_RESOURCE_STATE_ON) {
-                        device->power.state = i;
+                        *state = i;
                         return 0;
                 }
         }
 
-        device->power.state = ACPI_STATE_D3;
-
+        *state = ACPI_STATE_D3;
         return 0;
 }
 
-int acpi_power_transition(struct acpi_device *device, int state)
+int acpi_power_on_resources(struct acpi_device *device, int state)
 {
-        int result = 0;
-        struct acpi_handle_list *cl = NULL;     /* Current Resources */
-        struct acpi_handle_list *tl = NULL;     /* Target Resources */
-        int i = 0;
+        if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3)
+                return -EINVAL;
 
+        return acpi_power_on_list(&device->power.states[state].resources);
+}
+
+int acpi_power_transition(struct acpi_device *device, int state)
+{
+        int result;
 
         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))
                 return -ENODEV;
 
-        cl = &device->power.states[device->power.state].resources;
-        tl = &device->power.states[state].resources;
-
         /* TBD: Resources must be ordered. */
 
         /*
          * First we reference all power resources required in the target list
-         * (e.g. so the device doesn't lose power while transitioning).
+         * (e.g. so the device doesn't lose power while transitioning).  Then,
+         * we dereference all power resources used in the current list.
          */
-        for (i = 0; i < tl->count; i++) {
-                result = acpi_power_on(tl->handles[i]);
-                if (result)
-                        goto end;
-        }
+        result = acpi_power_on_list(&device->power.states[state].resources);
+        if (!result)
+                acpi_power_off_list(
+                        &device->power.states[device->power.state].resources);
 
-        if (device->power.state == state) {
-                goto end;
-        }
-
-        /*
-         * Then we dereference all power resources used in the current list.
-         */
-        for (i = 0; i < cl->count; i++) {
-                result = acpi_power_off_device(cl->handles[i]);
-                if (result)
-                        goto end;
-        }
-
-     end:
-        if (result)
-                device->power.state = ACPI_STATE_UNKNOWN;
-        else {
-        /* We shouldn't change the state till all above operations succeed */
-                device->power.state = state;
-        }
+        /* We shouldn't change the state unless the above operations succeed. */
+        device->power.state = result ? ACPI_STATE_UNKNOWN : state;
 
         return result;
 }
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index afad67769db..f5f986991b5 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -311,7 +311,9 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                            dev->pnp.bus_id,
                            (u32) dev->wakeup.sleep_state,
                            dev->wakeup.flags.run_wake ? '*' : ' ',
-                           dev->wakeup.state.enabled ? "enabled" : "disabled");
+                           (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",
@@ -328,8 +330,10 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)
 {
         struct device *dev = acpi_get_physical_device(adev->handle);
 
-        if (dev && device_can_wakeup(dev))
-                device_set_wakeup_enable(dev, adev->wakeup.state.enabled);
+        if (dev && device_can_wakeup(dev)) {
+                bool enable = !device_may_wakeup(dev);
+                device_set_wakeup_enable(dev, enable);
+        }
 }
 
 static ssize_t
@@ -341,7 +345,6 @@ acpi_system_write_wakeup_device(struct file *file,
         char strbuf[5];
         char str[5] = "";
         unsigned int len = count;
-        struct acpi_device *found_dev = NULL;
 
         if (len > 4)
                 len = 4;
@@ -361,33 +364,13 @@ acpi_system_write_wakeup_device(struct file *file,
                         continue;
 
                 if (!strncmp(dev->pnp.bus_id, str, 4)) {
-                        dev->wakeup.state.enabled =
-                            dev->wakeup.state.enabled ? 0 : 1;
-                        found_dev = dev;
-                        break;
-                }
-        }
-        if (found_dev) {
-                physical_device_enable_wakeup(found_dev);
-                list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                        struct acpi_device *dev = container_of(node,
-                                                               struct
-                                                               acpi_device,
-                                                               wakeup_list);
-
-                        if ((dev != found_dev) &&
-                            (dev->wakeup.gpe_number ==
-                             found_dev->wakeup.gpe_number)
-                            && (dev->wakeup.gpe_device ==
-                                found_dev->wakeup.gpe_device)) {
-                                printk(KERN_WARNING
-                                       "ACPI: '%s' and '%s' have the same GPE, "
-                                       "can't disable/enable one separately\n",
-                                       dev->pnp.bus_id, found_dev->pnp.bus_id);
-                                dev->wakeup.state.enabled =
-                                    found_dev->wakeup.state.enabled;
+                        if (device_can_wakeup(&dev->dev)) {
+                                bool enable = !device_may_wakeup(&dev->dev);
+                                device_set_wakeup_enable(&dev->dev, enable);
+                        } else {
                                 physical_device_enable_wakeup(dev);
                         }
+                        break;
                 }
         }
         mutex_unlock(&acpi_device_lock);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index bec561c14be..25bf17da69f 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -19,15 +19,15 @@
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_core");
 
-static int set_no_mwait(const struct dmi_system_id *id)
+static int __init set_no_mwait(const struct dmi_system_id *id)
 {
         printk(KERN_NOTICE PREFIX "%s detected - "
                 "disabling mwait for CPU C-states\n", id->ident);
-        idle_nomwait = 1;
+        boot_option_idle_override = IDLE_NOMWAIT;
         return 0;
 }
 
-static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
+static struct dmi_system_id __initdata processor_idle_dmi_table[] = {
         {
         set_no_mwait, "Extensa 5220", {
         DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
@@ -183,7 +183,7 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
 EXPORT_SYMBOL_GPL(acpi_get_cpuid);
 #endif
 
-static bool processor_physically_present(acpi_handle handle)
+static bool __init processor_physically_present(acpi_handle handle)
 {
         int cpuid, type;
         u32 acpi_id;
@@ -223,7 +223,7 @@ static bool processor_physically_present(acpi_handle handle)
         return true;
 }
 
-static void acpi_set_pdc_bits(u32 *buf)
+static void __cpuinit acpi_set_pdc_bits(u32 *buf)
 {
         buf[0] = ACPI_PDC_REVISION_ID;
         buf[1] = 1;
@@ -235,7 +235,7 @@ static void acpi_set_pdc_bits(u32 *buf)
         arch_acpi_set_pdc_bits(buf);
 }
 
-static struct acpi_object_list *acpi_processor_alloc_pdc(void)
+static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
 {
         struct acpi_object_list *obj_list;
         union acpi_object *obj;
@@ -278,12 +278,12 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void)
  * _PDC is required for a BIOS-OS handshake for most of the newer
  * ACPI processor features.
  */
-static int
+static int __cpuinit
 acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
 {
         acpi_status status = AE_OK;
 
-        if (idle_nomwait) {
+        if (boot_option_idle_override == IDLE_NOMWAIT) {
                 /*
                  * If mwait is disabled for CPU C-states, the C2C3_FFH access
                  * mode will be disabled in the parameter of _PDC object.
@@ -306,7 +306,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
         return status;
 }
 
-void acpi_processor_set_pdc(acpi_handle handle)
+void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
 {
         struct acpi_object_list *obj_list;
 
@@ -323,9 +323,8 @@ void acpi_processor_set_pdc(acpi_handle handle)
         kfree(obj_list->pointer);
         kfree(obj_list);
 }
-EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);
 
-static acpi_status
+static acpi_status __init
 early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         if (processor_physically_present(handle) == false)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 85e48047d7b..a4e0f1ba604 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -40,10 +40,6 @@
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
 #include <linux/cpu.h>
-#ifdef CONFIG_ACPI_PROCFS
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#endif
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
 #include <linux/cpuidle.h>
@@ -246,53 +242,6 @@ static int acpi_processor_errata(struct acpi_processor *pr)
         return result;
 }
 
-#ifdef CONFIG_ACPI_PROCFS
-static struct proc_dir_entry *acpi_processor_dir = NULL;
-
-static int __cpuinit acpi_processor_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-
-
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_processor_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-
-        /* 'throttling' [R/W] */
-        entry = proc_create_data(ACPI_PROCESSOR_FILE_THROTTLING,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device),
-                                 &acpi_processor_throttling_fops,
-                                 acpi_driver_data(device));
-        if (!entry)
-                return -EIO;
-        return 0;
-}
-static int acpi_processor_remove_fs(struct acpi_device *device)
-{
-
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_PROCESSOR_FILE_THROTTLING,
-                                  acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_processor_dir);
-                acpi_device_dir(device) = NULL;
-        }
-
-        return 0;
-}
-#else
-static inline int acpi_processor_add_fs(struct acpi_device *device)
-{
-        return 0;
-}
-static inline int acpi_processor_remove_fs(struct acpi_device *device)
-{
-        return 0;
-}
-#endif
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
@@ -478,8 +427,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         if (action == CPU_ONLINE && 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 */
+                acpi_processor_reevaluate_tstate(pr, action);
+        }
         return NOTIFY_OK;
 }
 
@@ -537,14 +491,10 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
 
         per_cpu(processors, pr->id) = pr;
 
-        result = acpi_processor_add_fs(device);
-        if (result)
-                goto err_free_cpumask;
-
         sysdev = get_cpu_sysdev(pr->id);
         if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
                 result = -EFAULT;
-                goto err_remove_fs;
+                goto err_free_cpumask;
         }
 
 #ifdef CONFIG_CPU_FREQ
@@ -590,8 +540,6 @@ err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
 err_power_exit:
         acpi_processor_power_exit(pr, device);
-err_remove_fs:
-        acpi_processor_remove_fs(device);
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
 
@@ -620,8 +568,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 
-        acpi_processor_remove_fs(device);
-
         if (pr->cdev) {
                 sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
                 sysfs_remove_link(&pr->cdev->device.kobj, "device");
@@ -689,8 +635,8 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
         return 0;
 }
 
-static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
-                                                u32 event, void *data)
+static void acpi_processor_hotplug_notify(acpi_handle handle,
+                                          u32 event, void *data)
 {
         struct acpi_processor *pr;
         struct acpi_device *device = NULL;
@@ -854,12 +800,6 @@ static int __init acpi_processor_init(void)
 
         memset(&errata, 0, sizeof(errata));
 
-#ifdef CONFIG_ACPI_PROCFS
-        acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-        if (!acpi_processor_dir)
-                return -ENOMEM;
-#endif
-
         if (!cpuidle_register_driver(&acpi_idle_driver)) {
                 printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
                         acpi_idle_driver.name);
@@ -885,10 +825,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-#ifdef CONFIG_ACPI_PROCFS
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-#endif
-
         return result;
 }
 
@@ -907,10 +843,6 @@ static void __exit acpi_processor_exit(void)
 
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-#ifdef CONFIG_ACPI_PROCFS
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-#endif
-
         return;
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index dcb38f8ddfd..d615b7d69bc 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -79,6 +79,13 @@ module_param(bm_check_disable, uint, 0000);
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
 
+static int disabled_by_idle_boot_param(void)
+{
+        return boot_option_idle_override == IDLE_POLL ||
+                boot_option_idle_override == IDLE_FORCE_MWAIT ||
+                boot_option_idle_override == IDLE_HALT;
+}
+
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
  * For now disable this. Probably a bug somewhere else.
@@ -455,7 +462,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                                 continue;
                         }
                         if (cx.type == ACPI_STATE_C1 &&
-                                        (idle_halt || idle_nomwait)) {
+                            (boot_option_idle_override == IDLE_NOMWAIT)) {
                                 /*
                                  * In most cases the C1 space_id obtained from
                                  * _CST object is FIXED_HARDWARE access mode.
@@ -746,7 +753,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
@@ -787,7 +794,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         s64 idle_time_ns;
         s64 idle_time;
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
@@ -864,7 +871,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         s64 idle_time;
 
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
@@ -1016,7 +1023,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 state->flags = 0;
                 switch (cx->type) {
                         case ACPI_STATE_C1:
-                        state->flags |= CPUIDLE_FLAG_SHALLOW;
                         if (cx->entry_method == ACPI_CSTATE_FFH)
                                 state->flags |= CPUIDLE_FLAG_TIME_VALID;
 
@@ -1025,16 +1031,13 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                         break;
 
                         case ACPI_STATE_C2:
-                        state->flags |= CPUIDLE_FLAG_BALANCED;
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
                         state->enter = acpi_idle_enter_simple;
                         dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C3:
-                        state->flags |= CPUIDLE_FLAG_DEEP;
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                        state->flags |= CPUIDLE_FLAG_CHECK_BM;
                         state->enter = pr->flags.bm_check ?
                                         acpi_idle_enter_bm :
                                         acpi_idle_enter_simple;
@@ -1058,7 +1061,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
         int ret = 0;
 
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         if (!pr)
@@ -1089,19 +1092,10 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
         acpi_status status = 0;
         static int first_run;
 
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         if (!first_run) {
-                if (idle_halt) {
-                        /*
-                         * When the boot option of "idle=halt" is added, halt
-                         * is used for CPU IDLE.
-                         * In such case C2/C3 is meaningless. So the max_cstate
-                         * is set to one.
-                         */
-                        max_cstate = 1;
-                }
                 dmi_check_system(processor_power_dmi_table);
                 max_cstate = acpi_processor_cstate_check(max_cstate);
                 if (max_cstate < ACPI_C_STATES_MAX)
@@ -1142,7 +1136,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         cpuidle_unregister_device(&pr->power.dev);
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index fde49b9b1d9..79cb6533289 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -156,15 +156,6 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state)
         return 0;
 }
 
-static int acpi_thermal_cpufreq_increase(unsigned int cpu)
-{
-        return -ENODEV;
-}
-static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
-{
-        return -ENODEV;
-}
-
 #endif
 
 int acpi_processor_get_limit_info(struct acpi_processor *pr)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index ff3632717c5..ad350173956 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -32,10 +32,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/cpufreq.h>
-#ifdef CONFIG_ACPI_PROCFS
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#endif
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -370,6 +366,58 @@ int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
 }
 
 /*
+ * This function is used to reevaluate whether the T-state is valid
+ * after one CPU is onlined/offlined.
+ * It is noted that it won't reevaluate the following properties for
+ * the T-state.
+ *      1. Control method.
+ *      2. the number of supported T-state
+ *      3. TSD domain
+ */
+void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
+                                        unsigned long action)
+{
+        int result = 0;
+
+        if (action == CPU_DEAD) {
+                /* When one CPU is offline, the T-state throttling
+                 * will be invalidated.
+                 */
+                pr->flags.throttling = 0;
+                return;
+        }
+        /* the following is to recheck whether the T-state is valid for
+         * the online CPU
+         */
+        if (!pr->throttling.state_count) {
+                /* If the number of T-state is invalid, it is
+                 * invalidated.
+                 */
+                pr->flags.throttling = 0;
+                return;
+        }
+        pr->flags.throttling = 1;
+
+        /* Disable throttling (if enabled).  We'll let subsequent
+         * policy (e.g.thermal) decide to lower performance if it
+         * so chooses, but for now we'll crank up the speed.
+         */
+
+        result = acpi_processor_get_throttling(pr);
+        if (result)
+                goto end;
+
+        if (pr->throttling.state) {
+                result = acpi_processor_set_throttling(pr, 0, false);
+                if (result)
+                        goto end;
+        }
+
+end:
+        if (result)
+                pr->flags.throttling = 0;
+}
+/*
  * _PTC - Processor Throttling Control (and status) register location
  */
 static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
@@ -876,7 +924,11 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)
          */
         cpumask_copy(saved_mask, &current->cpus_allowed);
         /* FIXME: use work_on_cpu() */
-        set_cpus_allowed_ptr(current, cpumask_of(pr->id));
+        if (set_cpus_allowed_ptr(current, cpumask_of(pr->id))) {
+                /* Can't migrate to the target pr->id CPU. Exit */
+                free_cpumask_var(saved_mask);
+                return -ENODEV;
+        }
         ret = pr->throttling.acpi_processor_get_throttling(pr);
         /* restore the previous state */
         set_cpus_allowed_ptr(current, saved_mask);
@@ -1051,6 +1103,14 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
                 return -ENOMEM;
         }
 
+        if (cpu_is_offline(pr->id)) {
+                /*
+                 * the cpu pointed by pr->id is offline. Unnecessary to change
+                 * the throttling state any more.
+                 */
+                return -ENODEV;
+        }
+
         cpumask_copy(saved_mask, &current->cpus_allowed);
         t_state.target_state = state;
         p_throttling = &(pr->throttling);
@@ -1074,7 +1134,11 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
          */
         if (p_throttling->shared_type == DOMAIN_COORD_TYPE_SW_ANY) {
                 /* FIXME: use work_on_cpu() */
-                set_cpus_allowed_ptr(current, cpumask_of(pr->id));
+                if (set_cpus_allowed_ptr(current, cpumask_of(pr->id))) {
+                        /* Can't migrate to the pr->id CPU. Exit */
+                        ret = -ENODEV;
+                        goto exit;
+                }
                 ret = p_throttling->acpi_processor_set_throttling(pr,
                                                 t_state.target_state, force);
         } else {
@@ -1100,13 +1164,14 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
                          */
                         if (!match_pr->flags.throttling) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "Throttling Controll is unsupported "
+                                        "Throttling Control is unsupported "
                                         "on CPU %d\n", i));
                                 continue;
                         }
                         t_state.cpu = i;
                         /* FIXME: use work_on_cpu() */
-                        set_cpus_allowed_ptr(current, cpumask_of(i));
+                        if (set_cpus_allowed_ptr(current, cpumask_of(i)))
+                                continue;
                         ret = match_pr->throttling.
                                 acpi_processor_set_throttling(
                                 match_pr, t_state.target_state, force);
@@ -1126,6 +1191,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
         /* restore the previous state */
         /* FIXME: use work_on_cpu() */
         set_cpus_allowed_ptr(current, saved_mask);
+exit:
         free_cpumask_var(online_throttling_cpus);
         free_cpumask_var(saved_mask);
         return ret;
@@ -1216,113 +1282,3 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
         return result;
 }
 
-#ifdef CONFIG_ACPI_PROCFS
-/* proc interface */
-static int acpi_processor_throttling_seq_show(struct seq_file *seq,
-                                              void *offset)
-{
-        struct acpi_processor *pr = seq->private;
-        int i = 0;
-        int result = 0;
-
-        if (!pr)
-                goto end;
-
-        if (!(pr->throttling.state_count > 0)) {
-                seq_puts(seq, "<not supported>\n");
-                goto end;
-        }
-
-        result = acpi_processor_get_throttling(pr);
-
-        if (result) {
-                seq_puts(seq,
-                         "Could not determine current throttling state.\n");
-                goto end;
-        }
-
-        seq_printf(seq, "state count:             %d\n"
-                   "active state:            T%d\n"
-                   "state available: T%d to T%d\n",
-                   pr->throttling.state_count, pr->throttling.state,
-                   pr->throttling_platform_limit,
-                   pr->throttling.state_count - 1);
-
-        seq_puts(seq, "states:\n");
-        if (pr->throttling.acpi_processor_get_throttling ==
-                        acpi_processor_get_throttling_fadt) {
-                for (i = 0; i < pr->throttling.state_count; i++)
-                        seq_printf(seq, "   %cT%d:                  %02d%%\n",
-                                   (i == pr->throttling.state ? '*' : ' '), i,
-                                   (pr->throttling.states[i].performance ? pr->
-                                    throttling.states[i].performance / 10 : 0));
-        } else {
-                for (i = 0; i < pr->throttling.state_count; i++)
-                        seq_printf(seq, "   %cT%d:                  %02d%%\n",
-                                   (i == pr->throttling.state ? '*' : ' '), i,
-                                   (int)pr->throttling.states_tss[i].
-                                   freqpercentage);
-        }
-
-      end:
-        return 0;
-}
-
-static int acpi_processor_throttling_open_fs(struct inode *inode,
-                                             struct file *file)
-{
-        return single_open(file, acpi_processor_throttling_seq_show,
-                           PDE(inode)->data);
-}
-
-static ssize_t acpi_processor_write_throttling(struct file *file,
-                                               const char __user * buffer,
-                                               size_t count, loff_t * data)
-{
-        int result = 0;
-        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = m->private;
-        char state_string[5] = "";
-        char *charp = NULL;
-        size_t state_val = 0;
-        char tmpbuf[5] = "";
-
-        if (!pr || (count > sizeof(state_string) - 1))
-                return -EINVAL;
-
-        if (copy_from_user(state_string, buffer, count))
-                return -EFAULT;
-
-        state_string[count] = '\0';
-        if ((count > 0) && (state_string[count-1] == '\n'))
-                state_string[count-1] = '\0';
-
-        charp = state_string;
-        if ((state_string[0] == 't') || (state_string[0] == 'T'))
-                charp++;
-
-        state_val = simple_strtoul(charp, NULL, 0);
-        if (state_val >= pr->throttling.state_count)
-                return -EINVAL;
-
-        snprintf(tmpbuf, 5, "%zu", state_val);
-
-        if (strcmp(tmpbuf, charp) != 0)
-                return -EINVAL;
-
-        result = acpi_processor_set_throttling(pr, state_val, false);
-        if (result)
-                return result;
-
-        return count;
-}
-
-const struct file_operations acpi_processor_throttling_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_processor_throttling_open_fs,
-        .read = seq_read,
-        .write = acpi_processor_write_throttling,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-#endif
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 93f91142d7a..a6c77e8b37b 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -15,9 +15,15 @@ void acpi_reboot(void)
 
         rr = &acpi_gbl_FADT.reset_register;
 
-        /* Is the reset register supported? */
-        if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
-            rr->bit_width != 8 || rr->bit_offset != 0)
+        /* ACPI reset register was only introduced with v2 of the FADT */
+
+        if (acpi_gbl_FADT.header.revision < 2)
+                return;
+
+        /* Is the reset register supported? The spec says we should be
+         * checking the bit width and bit offset, but Windows ignores
+         * these fields */
+        if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER))
                 return;
 
         reset_value = acpi_gbl_FADT.reset_value;
@@ -45,6 +51,4 @@ void acpi_reboot(void)
                 acpi_reset();
                 break;
         }
-        /* Wait ten seconds */
-        acpi_os_stall(10000000);
 }
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index e5dbedb16bb..51ae3794ec7 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -484,6 +484,8 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir,
                 const struct file_operations *state_fops,
                 const struct file_operations *alarm_fops, void *data)
 {
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!*dir) {
                 *dir = proc_mkdir(dir_name, parent_dir);
                 if (!*dir) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 2b6c21d86b9..449c556274c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -705,54 +705,85 @@ static int acpi_bus_get_perf_flags(struct acpi_device *device)
 }
 
 static acpi_status
-acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
-                                             union acpi_object *package)
+acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
+                                             struct acpi_device_wakeup *wakeup)
 {
-        int i = 0;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *package = NULL;
         union acpi_object *element = NULL;
+        acpi_status status;
+        int i = 0;
 
-        if (!device || !package || (package->package.count < 2))
+        if (!wakeup)
                 return AE_BAD_PARAMETER;
 
+        /* _PRW */
+        status = acpi_evaluate_object(handle, "_PRW", NULL, &buffer);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW"));
+                return status;
+        }
+
+        package = (union acpi_object *)buffer.pointer;
+
+        if (!package || (package->package.count < 2)) {
+                status = AE_BAD_DATA;
+                goto out;
+        }
+
         element = &(package->package.elements[0]);
-        if (!element)
-                return AE_BAD_PARAMETER;
+        if (!element) {
+                status = AE_BAD_DATA;
+                goto out;
+        }
         if (element->type == ACPI_TYPE_PACKAGE) {
                 if ((element->package.count < 2) ||
                     (element->package.elements[0].type !=
                      ACPI_TYPE_LOCAL_REFERENCE)
-                    || (element->package.elements[1].type != ACPI_TYPE_INTEGER))
-                        return AE_BAD_DATA;
-                device->wakeup.gpe_device =
+                    || (element->package.elements[1].type != ACPI_TYPE_INTEGER)) {
+                        status = AE_BAD_DATA;
+                        goto out;
+                }
+                wakeup->gpe_device =
                     element->package.elements[0].reference.handle;
-                device->wakeup.gpe_number =
+                wakeup->gpe_number =
                     (u32) element->package.elements[1].integer.value;
         } else if (element->type == ACPI_TYPE_INTEGER) {
-                device->wakeup.gpe_number = element->integer.value;
-        } else
-                return AE_BAD_DATA;
+                wakeup->gpe_device = NULL;
+                wakeup->gpe_number = element->integer.value;
+        } else {
+                status = AE_BAD_DATA;
+                goto out;
+        }
 
         element = &(package->package.elements[1]);
         if (element->type != ACPI_TYPE_INTEGER) {
-                return AE_BAD_DATA;
+                status = AE_BAD_DATA;
+                goto out;
         }
-        device->wakeup.sleep_state = element->integer.value;
+        wakeup->sleep_state = element->integer.value;
 
         if ((package->package.count - 2) > ACPI_MAX_HANDLES) {
-                return AE_NO_MEMORY;
+                status = AE_NO_MEMORY;
+                goto out;
         }
-        device->wakeup.resources.count = package->package.count - 2;
-        for (i = 0; i < device->wakeup.resources.count; i++) {
+        wakeup->resources.count = package->package.count - 2;
+        for (i = 0; i < wakeup->resources.count; i++) {
                 element = &(package->package.elements[i + 2]);
-                if (element->type != ACPI_TYPE_LOCAL_REFERENCE)
-                        return AE_BAD_DATA;
+                if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
+                        status = AE_BAD_DATA;
+                        goto out;
+                }
 
-                device->wakeup.resources.handles[i] = element->reference.handle;
+                wakeup->resources.handles[i] = element->reference.handle;
         }
 
-        acpi_gpe_can_wake(device->wakeup.gpe_device, device->wakeup.gpe_number);
+        acpi_setup_gpe_for_wake(handle, wakeup->gpe_device, wakeup->gpe_number);
 
-        return AE_OK;
+ out:
+        kfree(buffer.pointer);
+
+        return status;
 }
 
 static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
@@ -766,13 +797,12 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
         acpi_status status;
         acpi_event_status event_status;
 
-        device->wakeup.run_wake_count = 0;
         device->wakeup.flags.notifier_present = 0;
 
         /* Power button, Lid switch always enable wakeup */
         if (!acpi_match_device_ids(device, button_device_ids)) {
                 device->wakeup.flags.run_wake = 1;
-                device->wakeup.flags.always_enabled = 1;
+                device_set_wakeup_capable(&device->dev, true);
                 return;
         }
 
@@ -784,29 +814,24 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
                                 !!(event_status & ACPI_EVENT_FLAG_HANDLE);
 }
 
-static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
+static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
 {
+        acpi_handle temp;
         acpi_status status = 0;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object *package = NULL;
         int psw_error;
 
-        /* _PRW */
-        status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW"));
-                goto end;
-        }
+        /* Presence of _PRW indicates wake capable */
+        status = acpi_get_handle(device->handle, "_PRW", &temp);
+        if (ACPI_FAILURE(status))
+                return;
 
-        package = (union acpi_object *)buffer.pointer;
-        status = acpi_bus_extract_wakeup_device_power_package(device, package);
+        status = acpi_bus_extract_wakeup_device_power_package(device->handle,
+                                                              &device->wakeup);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package"));
-                goto end;
+                return;
         }
 
-        kfree(buffer.pointer);
-
         device->wakeup.flags.valid = 1;
         device->wakeup.prepare_count = 0;
         acpi_bus_set_run_wake_flags(device);
@@ -820,13 +845,10 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         if (psw_error)
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                 "error in _DSW or _PSW evaluation\n"));
-
-end:
-        if (ACPI_FAILURE(status))
-                device->flags.wake_capable = 0;
-        return 0;
 }
 
+static void acpi_bus_add_power_resource(acpi_handle handle);
+
 static int acpi_bus_get_power_flags(struct acpi_device *device)
 {
         acpi_status status = 0;
@@ -855,8 +877,12 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                 acpi_evaluate_reference(device->handle, object_name, NULL,
                                         &ps->resources);
                 if (ps->resources.count) {
+                        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]);
                 }
 
                 /* Evaluate "_PSx" to see if we can do explicit sets */
@@ -881,10 +907,7 @@ 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;
 
-        /* TBD: System wake support and resource requirements. */
-
-        device->power.state = ACPI_STATE_UNKNOWN;
-        acpi_bus_get_power(device->handle, &(device->power.state));
+        acpi_bus_init_power(device);
 
         return 0;
 }
@@ -920,6 +943,10 @@ static int acpi_bus_get_flags(struct acpi_device *device)
         if (ACPI_SUCCESS(status))
                 device->flags.lockable = 1;
 
+        /* Power resources cannot be power manageable. */
+        if (device->device_type == ACPI_BUS_TYPE_POWER)
+                return 0;
+
         /* Presence of _PS0|_PR0 indicates 'power manageable' */
         status = acpi_get_handle(device->handle, "_PS0", &temp);
         if (ACPI_FAILURE(status))
@@ -927,11 +954,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
         if (ACPI_SUCCESS(status))
                 device->flags.power_manageable = 1;
 
-        /* Presence of _PRW indicates wake capable */
-        status = acpi_get_handle(device->handle, "_PRW", &temp);
-        if (ACPI_SUCCESS(status))
-                device->flags.wake_capable = 1;
-
         /* TBD: Performance management */
 
         return 0;
@@ -1258,11 +1280,7 @@ static int acpi_add_single_object(struct acpi_device **child,
          * Wakeup device management
          *-----------------------
          */
-        if (device->flags.wake_capable) {
-                result = acpi_bus_get_wakeup_device_flags(device);
-                if (result)
-                        goto end;
-        }
+        acpi_bus_get_wakeup_device_flags(device);
 
         /*
          * Performance Management
@@ -1306,6 +1324,20 @@ end:
 #define ACPI_STA_DEFAULT (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | \
                           ACPI_STA_DEVICE_UI      | ACPI_STA_DEVICE_FUNCTIONING)
 
+static void acpi_bus_add_power_resource(acpi_handle handle)
+{
+        struct acpi_bus_ops ops = {
+                .acpi_op_add = 1,
+                .acpi_op_start = 1,
+        };
+        struct acpi_device *device = NULL;
+
+        acpi_bus_get_device(handle, &device);
+        if (!device)
+                acpi_add_single_object(&device, handle, ACPI_BUS_TYPE_POWER,
+                                        ACPI_STA_DEFAULT, &ops);
+}
+
 static int acpi_bus_type_and_status(acpi_handle handle, int *type,
                                     unsigned long long *sta)
 {
@@ -1360,8 +1392,16 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
                 return AE_OK;
 
         if (!(sta & ACPI_STA_DEVICE_PRESENT) &&
-            !(sta & ACPI_STA_DEVICE_FUNCTIONING))
+            !(sta & ACPI_STA_DEVICE_FUNCTIONING)) {
+                struct acpi_device_wakeup wakeup;
+                acpi_handle temp;
+
+                status = acpi_get_handle(handle, "_PRW", &temp);
+                if (ACPI_SUCCESS(status))
+                        acpi_bus_extract_wakeup_device_power_package(handle,
+                                                                     &wakeup);
                 return AE_CTRL_DEPTH;
+        }
 
         /*
          * We may already have an acpi_device from a previous enumeration.  If
@@ -1444,7 +1484,7 @@ int acpi_bus_start(struct acpi_device *device)
 
         result = acpi_bus_scan(device->handle, &ops, NULL);
 
-        acpi_update_gpes();
+        acpi_update_all_gpes();
 
         return result;
 }
@@ -1550,6 +1590,8 @@ int __init acpi_scan_init(void)
                 printk(KERN_ERR PREFIX "Could not register bus type\n");
         }
 
+        acpi_power_init();
+
         /*
          * Enumerate devices in the ACPI namespace.
          */
@@ -1561,7 +1603,7 @@ int __init acpi_scan_init(void)
         if (result)
                 acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
         else
-                acpi_update_gpes();
+                acpi_update_all_gpes();
 
         return result;
 }
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721d93b3cee..6c949602cbd 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -16,6 +16,7 @@
 #include <linux/device.h>
 #include <linux/suspend.h>
 #include <linux/reboot.h>
+#include <linux/acpi.h>
 
 #include <asm/io.h>
 
@@ -27,8 +28,6 @@
 
 static u8 sleep_states[ACPI_S_STATE_COUNT];
 
-static u32 acpi_target_sleep_state = ACPI_STATE_S0;
-
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
         union acpi_object in_arg = { ACPI_TYPE_INTEGER };
@@ -81,6 +80,8 @@ static int acpi_sleep_prepare(u32 acpi_state)
 }
 
 #ifdef CONFIG_ACPI_SLEEP
+static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+
 /*
  * 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
@@ -124,8 +125,7 @@ static int acpi_pm_freeze(void)
 static int acpi_pm_pre_suspend(void)
 {
         acpi_pm_freeze();
-        suspend_nvs_save();
-        return 0;
+        return suspend_nvs_save();
 }
 
 /**
@@ -151,7 +151,7 @@ static int acpi_pm_prepare(void)
 {
         int error = __acpi_pm_prepare();
         if (!error)
-                acpi_pm_pre_suspend();
+                error = acpi_pm_pre_suspend();
 
         return error;
 }
@@ -167,6 +167,7 @@ static void acpi_pm_finish(void)
         u32 acpi_state = acpi_target_sleep_state;
 
         acpi_ec_unblock_transactions();
+        suspend_nvs_free();
 
         if (acpi_state == ACPI_STATE_S0)
                 return;
@@ -187,7 +188,6 @@ static void acpi_pm_finish(void)
  */
 static void acpi_pm_end(void)
 {
-        suspend_nvs_free();
         /*
          * This is necessary in case acpi_pm_finish() is not called during a
          * failing transition to a sleep state.
@@ -200,8 +200,6 @@ static void acpi_pm_end(void)
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
-extern void do_suspend_lowlevel(void);
-
 static u32 acpi_suspend_states[] = {
         [PM_SUSPEND_ON] = ACPI_STATE_S0,
         [PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
@@ -244,20 +242,11 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
 static int acpi_suspend_enter(suspend_state_t pm_state)
 {
         acpi_status status = AE_OK;
-        unsigned long flags = 0;
         u32 acpi_state = acpi_target_sleep_state;
+        int error;
 
         ACPI_FLUSH_CPU_CACHE();
 
-        /* Do arch specific saving of state. */
-        if (acpi_state == ACPI_STATE_S3) {
-                int error = acpi_save_state_mem();
-
-                if (error)
-                        return error;
-        }
-
-        local_irq_save(flags);
         switch (acpi_state) {
         case ACPI_STATE_S1:
                 barrier();
@@ -265,7 +254,10 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                 break;
 
         case ACPI_STATE_S3:
-                do_suspend_lowlevel();
+                error = acpi_suspend_lowlevel();
+                if (error)
+                        return error;
+                pr_info(PREFIX "Low-level resume complete\n");
                 break;
         }
 
@@ -291,13 +283,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         /* Allow EC transactions to happen. */
         acpi_ec_unblock_transactions_early();
 
-        local_irq_restore(flags);
-        printk(KERN_DEBUG "Back to C!\n");
-
-        /* restore processor state */
-        if (acpi_state == ACPI_STATE_S3)
-                acpi_restore_state_mem();
-
         suspend_nvs_restore();
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
@@ -319,7 +304,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
         }
 }
 
-static struct platform_suspend_ops acpi_suspend_ops = {
+static const struct platform_suspend_ops acpi_suspend_ops = {
         .valid = acpi_suspend_state_valid,
         .begin = acpi_suspend_begin,
         .prepare_late = acpi_pm_prepare,
@@ -347,7 +332,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
  * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
  * been requested.
  */
-static struct platform_suspend_ops acpi_suspend_ops_old = {
+static const struct platform_suspend_ops acpi_suspend_ops_old = {
         .valid = acpi_suspend_state_valid,
         .begin = acpi_suspend_begin_old,
         .prepare_late = acpi_pm_pre_suspend,
@@ -427,6 +412,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 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"),
+                },
+        },
         {},
 };
 #endif /* CONFIG_SUSPEND */
@@ -457,16 +458,13 @@ static int acpi_hibernation_begin(void)
 static int acpi_hibernation_enter(void)
 {
         acpi_status status = AE_OK;
-        unsigned long flags = 0;
 
         ACPI_FLUSH_CPU_CACHE();
 
-        local_irq_save(flags);
         /* This shouldn't return.  If it returns, we have a problem */
         status = acpi_enter_sleep_state(ACPI_STATE_S4);
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
-        local_irq_restore(flags);
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
@@ -498,7 +496,7 @@ static void acpi_pm_thaw(void)
         acpi_enable_all_runtime_gpes();
 }
 
-static struct platform_hibernation_ops acpi_hibernation_ops = {
+static const struct platform_hibernation_ops acpi_hibernation_ops = {
         .begin = acpi_hibernation_begin,
         .end = acpi_pm_end,
         .pre_snapshot = acpi_pm_prepare,
@@ -541,7 +539,7 @@ static int acpi_hibernation_begin_old(void)
  * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
  * been requested.
  */
-static struct platform_hibernation_ops acpi_hibernation_ops_old = {
+static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
         .begin = acpi_hibernation_begin_old,
         .end = acpi_pm_end,
         .pre_snapshot = acpi_pm_pre_suspend,
@@ -570,7 +568,7 @@ int acpi_suspend(u32 acpi_state)
         return -EINVAL;
 }
 
-#ifdef CONFIG_PM_OPS
+#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
@@ -656,7 +654,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
                 *d_min_p = d_min;
         return d_max;
 }
-#endif /* CONFIG_PM_OPS */
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_PM_SLEEP
 /**
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index f8588f81048..61891e75583 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -438,7 +438,7 @@ static void delete_gpe_attr_array(void)
         return;
 }
 
-void acpi_os_gpe_count(u32 gpe_number)
+static void gpe_count(u32 gpe_number)
 {
         acpi_gpe_count++;
 
@@ -454,7 +454,7 @@ void acpi_os_gpe_count(u32 gpe_number)
         return;
 }
 
-void acpi_os_fixed_event_count(u32 event_number)
+static void fixed_event_count(u32 event_number)
 {
         if (!all_counters)
                 return;
@@ -468,6 +468,16 @@ void acpi_os_fixed_event_count(u32 event_number)
         return;
 }
 
+static void acpi_gbl_event_handler(u32 event_type, acpi_handle device,
+        u32 event_number, void *context)
+{
+        if (event_type == ACPI_EVENT_TYPE_GPE)
+                gpe_count(event_number);
+
+        if (event_type == ACPI_EVENT_TYPE_FIXED)
+                fixed_event_count(event_number);
+}
+
 static int get_status(u32 index, acpi_event_status *status,
                       acpi_handle *handle)
 {
@@ -601,6 +611,7 @@ end:
 
 void acpi_irq_stats_init(void)
 {
+        acpi_status status;
         int i;
 
         if (all_counters)
@@ -619,6 +630,10 @@ void acpi_irq_stats_init(void)
         if (all_counters == NULL)
                 goto fail;
 
+        status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL);
+        if (ACPI_FAILURE(status))
+                goto fail;
+
         counter_attrs = kzalloc(sizeof(struct kobj_attribute) * (num_counters),
                                 GFP_KERNEL);
         if (counter_attrs == NULL)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 5a27b0a3131..2607e17b520 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1059,8 +1059,9 @@ static int acpi_thermal_resume(struct acpi_device *device)
                         break;
                 tz->trips.active[i].flags.enabled = 1;
                 for (j = 0; j < tz->trips.active[i].devices.count; j++) {
-                        result = acpi_bus_get_power(tz->trips.active[i].devices.
-                            handles[j], &power_state);
+                        result = acpi_bus_update_power(
+                                        tz->trips.active[i].devices.handles[j],
+                                        &power_state);
                         if (result || (power_state != ACPI_STATE_D0)) {
                                 tz->trips.active[i].flags.enabled = 0;
                                 break;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5cd0228d2da..ec574fc8fbc 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -33,7 +33,6 @@
 #include <linux/input.h>
 #include <linux/backlight.h>
 #include <linux/thermal.h>
-#include <linux/video_output.h>
 #include <linux/sort.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
@@ -81,6 +80,13 @@ module_param(brightness_switch_enabled, bool, 0644);
 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 int use_bios_initial_backlight = 1;
+module_param(use_bios_initial_backlight, bool, 0644);
+
 static int register_count = 0;
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device, int type);
@@ -172,9 +178,6 @@ struct acpi_video_device_cap {
         u8 _BQC:1;              /* Get current brightness level */
         u8 _BCQ:1;              /* Some buggy BIOS uses _BCQ instead of _BQC */
         u8 _DDC:1;              /*Return the EDID for this device */
-        u8 _DCS:1;              /*Return status of output device */
-        u8 _DGS:1;              /*Query graphics state */
-        u8 _DSS:1;              /*Device state set */
 };
 
 struct acpi_video_brightness_flags {
@@ -202,7 +205,6 @@ struct acpi_video_device {
         struct acpi_video_device_brightness *brightness;
         struct backlight_device *backlight;
         struct thermal_cooling_device *cooling_dev;
-        struct output_device *output_dev;
 };
 
 static const char device_decode[][30] = {
@@ -226,10 +228,6 @@ static int acpi_video_get_next_level(struct acpi_video_device *device,
                                      u32 level_current, u32 event);
 static int acpi_video_switch_brightness(struct acpi_video_device *device,
                                          int event);
-static int acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long long *state);
-static int acpi_video_output_get(struct output_device *od);
-static int acpi_video_device_set_state(struct acpi_video_device *device, int state);
 
 /*backlight device sysfs support*/
 static int acpi_video_get_brightness(struct backlight_device *bd)
@@ -260,35 +258,11 @@ static int acpi_video_set_brightness(struct backlight_device *bd)
                                 vd->brightness->levels[request_level]);
 }
 
-static struct backlight_ops acpi_backlight_ops = {
+static const struct backlight_ops acpi_backlight_ops = {
         .get_brightness = acpi_video_get_brightness,
         .update_status  = acpi_video_set_brightness,
 };
 
-/*video output device sysfs support*/
-static int acpi_video_output_get(struct output_device *od)
-{
-        unsigned long long state;
-        struct acpi_video_device *vd =
-                (struct acpi_video_device *)dev_get_drvdata(&od->dev);
-        acpi_video_device_get_state(vd, &state);
-        return (int)state;
-}
-
-static int acpi_video_output_set(struct output_device *od)
-{
-        unsigned long state = od->request_state;
-        struct acpi_video_device *vd=
-                (struct acpi_video_device *)dev_get_drvdata(&od->dev);
-        return acpi_video_device_set_state(vd, state);
-}
-
-static struct output_properties acpi_output_properties = {
-        .set_state = acpi_video_output_set,
-        .get_status = acpi_video_output_get,
-};
-
-
 /* thermal cooling device callbacks */
 static int video_get_max_state(struct thermal_cooling_device *cooling_dev, unsigned
                                long *state)
@@ -344,34 +318,6 @@ static struct thermal_cooling_device_ops video_cooling_ops = {
                                Video Management
    -------------------------------------------------------------------------- */
 
-/* device */
-
-static int
-acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long long *state)
-{
-        int status;
-
-        status = acpi_evaluate_integer(device->dev->handle, "_DCS", NULL, state);
-
-        return status;
-}
-
-static int
-acpi_video_device_set_state(struct acpi_video_device *device, int state)
-{
-        int status;
-        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
-        struct acpi_object_list args = { 1, &arg0 };
-        unsigned long long ret;
-
-
-        arg0.integer.value = state;
-        status = acpi_evaluate_integer(device->dev->handle, "_DSS", &args, &ret);
-
-        return status;
-}
-
 static int
 acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
                                    union acpi_object **levels)
@@ -766,9 +712,11 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                  * when invoked for the first time, i.e. level_old is invalid.
                  * set the backlight to max_level in this case
                  */
-                for (i = 2; i < br->count; i++)
-                        if (level_old == br->levels[i])
-                                level = level_old;
+                if (use_bios_initial_backlight) {
+                        for (i = 2; i < br->count; i++)
+                                if (level_old == br->levels[i])
+                                        level = level_old;
+                }
                 goto set_level;
         }
 
@@ -831,18 +779,12 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
         if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
                 device->cap._DDC = 1;
         }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DCS", &h_dummy1))) {
-                device->cap._DCS = 1;
-        }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DGS", &h_dummy1))) {
-                device->cap._DGS = 1;
-        }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DSS", &h_dummy1))) {
-                device->cap._DSS = 1;
-        }
 
         if (acpi_video_backlight_support()) {
                 struct backlight_properties props;
+                struct pci_dev *pdev;
+                acpi_handle acpi_parent;
+                struct device *parent = NULL;
                 int result;
                 static int count = 0;
                 char *name;
@@ -855,9 +797,20 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                         return;
                 count++;
 
+                acpi_get_parent(device->dev->handle, &acpi_parent);
+
+                pdev = acpi_get_pci_dev(acpi_parent);
+                if (pdev) {
+                        parent = &pdev->dev;
+                        pci_dev_put(pdev);
+                }
+
                 memset(&props, 0, sizeof(struct backlight_properties));
+                props.type = BACKLIGHT_FIRMWARE;
                 props.max_brightness = device->brightness->count - 3;
-                device->backlight = backlight_device_register(name, NULL, device,
+                device->backlight = backlight_device_register(name,
+                                                              parent,
+                                                              device,
                                                               &acpi_backlight_ops,
                                                               &props);
                 kfree(name);
@@ -871,11 +824,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 device->backlight->props.brightness =
                                 acpi_video_get_brightness(device->backlight);
 
-                result = sysfs_create_link(&device->backlight->dev.kobj,
-                                           &device->dev->dev.kobj, "device");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-
                 device->cooling_dev = thermal_cooling_device_register("LCD",
                                         device->dev, &video_cooling_ops);
                 if (IS_ERR(device->cooling_dev)) {
@@ -904,21 +852,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                         printk(KERN_ERR PREFIX "Create sysfs link\n");
 
         }
-
-        if (acpi_video_display_switch_support()) {
-
-                if (device->cap._DCS && device->cap._DSS) {
-                        static int count;
-                        char *name;
-                        name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
-                        if (!name)
-                                return;
-                        count++;
-                        device->output_dev = video_output_register(name,
-                                        NULL, device, &acpi_output_properties);
-                        kfree(name);
-                }
-        }
 }
 
 /*
@@ -1360,6 +1293,9 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,
                 if (!video_device)
                         continue;
 
+                if (!video_device->cap._DDC)
+                        continue;
+
                 if (type) {
                         switch (type) {
                         case ACPI_VIDEO_DISPLAY_CRT:
@@ -1418,7 +1354,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
                 status = acpi_video_bus_get_one_device(dev, video);
                 if (ACPI_FAILURE(status)) {
                         printk(KERN_WARNING PREFIX
-                                        "Cant attach device\n");
+                                        "Can't attach device\n");
                         continue;
                 }
         }
@@ -1437,10 +1373,9 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                                             acpi_video_device_notify);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_WARNING PREFIX
-                       "Cant remove video notify handler\n");
+                       "Can't remove video notify handler\n");
         }
         if (device->backlight) {
-                sysfs_remove_link(&device->backlight->dev.kobj, "device");
                 backlight_device_unregister(device->backlight);
                 device->backlight = NULL;
         }
@@ -1452,7 +1387,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                 thermal_cooling_device_unregister(device->cooling_dev);
                 device->cooling_dev = NULL;
         }
-        video_output_unregister(device->output_dev);
 
         return 0;
 }
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index b8367612659..5af3479714f 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -17,15 +17,14 @@
  * capabilities the graphics cards plugged in support. The check for general
  * video capabilities will be triggered by the first caller of
  * acpi_video_get_capabilities(NULL); which will happen when the first
- * backlight (or display output) switching supporting driver calls:
+ * backlight switching supporting driver calls:
  * acpi_video_backlight_support();
  *
  * 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_acpi,
- * sony_acpi,... can take care about backlight brightness and display output
- * switching.
+ * sony_acpi,... can take care about backlight brightness.
  *
  * If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module (m)
  * this file will not be compiled, acpi_video_get_capabilities() and
@@ -161,8 +160,6 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
                  *
                  *   if (dmi_name_in_vendors("XY")) {
                  *      acpi_video_support |=
-                 *              ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR;
-                 *      acpi_video_support |=
                  *              ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
                  *}
                  */
@@ -212,33 +209,8 @@ int acpi_video_backlight_support(void)
 EXPORT_SYMBOL(acpi_video_backlight_support);
 
 /*
- * Returns true if video.ko can do display output switching.
- * This does not work well/at all with binary graphics drivers
- * which disable system io ranges and do it on their own.
- */
-int acpi_video_display_switch_support(void)
-{
-        if (!acpi_video_caps_checked)
-                acpi_video_get_capabilities(NULL);
-
-        if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR)
-                return 0;
-        else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO)
-                return 1;
-
-        if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR)
-                return 0;
-        else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO)
-                return 1;
-
-        return acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING;
-}
-EXPORT_SYMBOL(acpi_video_display_switch_support);
-
-/*
- * Use acpi_display_output=vendor/video or acpi_backlight=vendor/video
- * To force that backlight or display output switching is processed by vendor
- * specific acpi drivers or video.ko driver.
+ * Use acpi_backlight=vendor/video to force that backlight switching
+ * is processed by vendor specific acpi drivers or video.ko driver.
  */
 static int __init acpi_backlight(char *str)
 {
@@ -255,19 +227,3 @@ static int __init acpi_backlight(char *str)
         return 1;
 }
 __setup("acpi_backlight=", acpi_backlight);
-
-static int __init acpi_display_output(char *str)
-{
-        if (str == NULL || *str == '\0')
-                return 1;
-        else {
-                if (!strcmp("vendor", str))
-                        acpi_video_support |=
-                                ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
-                if (!strcmp("video", str))
-                        acpi_video_support |=
-                                ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
-        }
-        return 1;
-}
-__setup("acpi_display_output=", acpi_display_output);
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index f62a50c3ed3..7bfbe40bc43 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -37,15 +37,16 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
                         container_of(node, struct acpi_device, wakeup_list);
 
                 if (!dev->wakeup.flags.valid
-                    || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
-                    || sleep_state > (u32) dev->wakeup.sleep_state)
+                    || sleep_state > (u32) dev->wakeup.sleep_state
+                    || !(device_may_wakeup(&dev->dev)
+                        || dev->wakeup.prepare_count))
                         continue;
 
-                if (dev->wakeup.state.enabled)
+                if (device_may_wakeup(&dev->dev))
                         acpi_enable_wakeup_device_power(dev, sleep_state);
 
                 /* The wake-up power should have been enabled already. */
-                acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+                acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                 ACPI_GPE_ENABLE);
         }
 }
@@ -63,14 +64,15 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
                         container_of(node, struct acpi_device, wakeup_list);
 
                 if (!dev->wakeup.flags.valid
-                    || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
-                    || (sleep_state > (u32) dev->wakeup.sleep_state))
+                    || sleep_state > (u32) dev->wakeup.sleep_state
+                    || !(device_may_wakeup(&dev->dev)
+                        || dev->wakeup.prepare_count))
                         continue;
 
-                acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+                acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                 ACPI_GPE_DISABLE);
 
-                if (dev->wakeup.state.enabled)
+                if (device_may_wakeup(&dev->dev))
                         acpi_disable_wakeup_device_power(dev);
         }
 }
@@ -84,8 +86,12 @@ int __init acpi_wakeup_device_init(void)
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
                                                        wakeup_list);
-                if (dev->wakeup.flags.always_enabled)
-                        dev->wakeup.state.enabled = 1;
+                if (device_can_wakeup(&dev->dev)) {
+                        /* Button GPEs are supposed to be always enabled. */
+                        acpi_enable_gpe(dev->wakeup.gpe_device,
+                                        dev->wakeup.gpe_number);
+                        device_set_wakeup_enable(&dev->dev, true);
+                }
         }
         mutex_unlock(&acpi_device_lock);
         return 0;