153 files changed, 6535 insertions, 6694 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index df4514436ba8..5c087a5bddf8 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,7 +11,7 @@ config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
        depends on PCI
-        select PM
+        depends on PM
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@ -111,6 +111,7 @@ config ACPI_BATTERY
 config ACPI_BUTTON
        tristate "Button"
+        depends on INPUT
        default y
        help
          This driver handles events on the power, sleep and lid buttons.
@@ -120,7 +121,7 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
-        depends on X86
+        depends on X86 && BACKLIGHT_CLASS_DEVICE
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
@@ -152,6 +153,13 @@ config ACPI_DOCK
        help
          This driver adds support for ACPI controlled docking stations
+config ACPI_BAY
+        tristate "Removable Drive Bay (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        help
+          This driver adds support for ACPI controlled removable drive
+          bays such as the IBM ultrabay or the Dell Module Bay.
 config ACPI_PROCESSOR
        tristate "Processor"
        default y
@@ -186,6 +194,7 @@ config ACPI_NUMA
 config ACPI_ASUS
        tristate "ASUS/Medion Laptop Extras"
        depends on X86
+        select BACKLIGHT_CLASS_DEVICE
        ---help---
          This driver provides support for extra features of ACPI-compatible
          ASUS laptops. As some of Medion laptops are made by ASUS, it may also
@@ -214,6 +223,7 @@ config ACPI_ASUS
 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86
+        select BACKLIGHT_CLASS_DEVICE
        ---help---
          This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -239,6 +249,7 @@ config ACPI_IBM_DOCK
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
+        select BACKLIGHT_CLASS_DEVICE
        ---help---
          This driver adds support for access to certain system settings
          on "legacy free" Toshiba laptops.  These laptops can be recognized by
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index a7495107057c..399b0e8c41c4 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -44,7 +44,8 @@ obj-$(CONFIG_ACPI_BUTTON)	+= button.o
 obj-$(CONFIG_ACPI_EC)           += ec.o
 obj-$(CONFIG_ACPI_FAN)          += fan.o
 obj-$(CONFIG_ACPI_DOCK)         += dock.o
-obj-$(CONFIG_ACPI_VIDEO)        += video.o 
+obj-$(CONFIG_ACPI_BAY)          += bay.o
+obj-$(CONFIG_ACPI_VIDEO)        += video.o
 obj-$(CONFIG_ACPI_HOTKEY)       += hotkey.o
 obj-y                           += pci_root.o pci_link.o pci_irq.o pci_bind.o
 obj-$(CONFIG_ACPI_POWER)        += power.o
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 11abc7bf777e..6daeace796a8 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -109,7 +109,7 @@ static struct proc_dir_entry *acpi_ac_dir;
 static int acpi_ac_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_ac *ac = (struct acpi_ac *)seq->private;
+        struct acpi_ac *ac = seq->private;
        if (!ac)
@@ -187,7 +187,7 @@ static int acpi_ac_remove_fs(struct acpi_device *device)
 static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_ac *ac = (struct acpi_ac *)data;
+        struct acpi_ac *ac = data;
        struct acpi_device *device = NULL;
@@ -221,10 +221,9 @@ static int acpi_ac_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        ac = kmalloc(sizeof(struct acpi_ac), GFP_KERNEL);
+        ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL);
        if (!ac)
                return -ENOMEM;
-        memset(ac, 0, sizeof(struct acpi_ac));
        ac->device = device;
        strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);
@@ -269,7 +268,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        ac = (struct acpi_ac *)acpi_driver_data(device);
+        ac = acpi_driver_data(device);
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY, acpi_ac_notify);
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 6bcd9e8e7bcb..cd946ed192d3 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -395,10 +395,9 @@ static int acpi_memory_device_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        mem_device = kmalloc(sizeof(struct acpi_memory_device), GFP_KERNEL);
+        mem_device = kzalloc(sizeof(struct acpi_memory_device), GFP_KERNEL);
        if (!mem_device)
                return -ENOMEM;
-        memset(mem_device, 0, sizeof(struct acpi_memory_device));
        INIT_LIST_HEAD(&mem_device->res_list);
        mem_device->device = device;
@@ -429,7 +428,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        mem_device = (struct acpi_memory_device *)acpi_driver_data(device);
+        mem_device = acpi_driver_data(device);
        kfree(mem_device);
        return 0;
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index c7ac9297a204..31ad70a6e22e 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -26,7 +26,7 @@
 *  Pontus Fuchs   - Helper functions, cleanup
 *  Johann Wiesner - Small compile fixes
 *  John Belmonte  - ACPI code for Toshiba laptop was a good starting point.
- *  �ric Burghard  - LED display support for W1N
+ *  �ic Burghard  - LED display support for W1N
 *
 */
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
@@ -402,6 +403,8 @@ static struct model_data model_conf[END_MODEL] = {
 /* procdir we use */
 static struct proc_dir_entry *asus_proc_dir;
+static struct backlight_device *asus_backlight_device;
 /*
 * This header is made available to allow proper configuration given model,
 * revision number , ... this info cannot go in struct asus_hotk because it is
@@ -779,7 +782,7 @@ proc_write_lcd(struct file *file, const char __user * buffer,
        return rv;
 }
-static int read_brightness(void)
+static int read_brightness(struct backlight_device *bd)
 {
        int value;
@@ -801,9 +804,10 @@ static int read_brightness(void)
 /*
 * Change the brightness level
 */
-static void set_brightness(int value)
+static int set_brightness(int value)
 {
        acpi_status status = 0;
+        int ret = 0;
        /* SPLV laptop */
        if (hotk->methods->brightness_set) {
@@ -811,11 +815,12 @@ static void set_brightness(int value)
                                    value, NULL))
                        printk(KERN_WARNING
                               "Asus ACPI: Error changing brightness\n");
-                return;
+                        ret = -EIO;
+                goto out;
        }
        /* No SPLV method if we are here, act as appropriate */
-        value -= read_brightness();
+        value -= read_brightness(NULL);
        while (value != 0) {
                status = acpi_evaluate_object(NULL, (value > 0) ?
                                              hotk->methods->brightness_up :
@@ -825,15 +830,22 @@ static void set_brightness(int value)
                if (ACPI_FAILURE(status))
                        printk(KERN_WARNING
                               "Asus ACPI: Error changing brightness\n");
+                        ret = -EIO;
        }
-        return;
+out:
+        return ret;
+}
+static int set_brightness_status(struct backlight_device *bd)
+{
+        return set_brightness(bd->props->brightness);
 }
 static int
 proc_read_brn(char *page, char **start, off_t off, int count, int *eof,
              void *data)
 {
-        return sprintf(page, "%d\n", read_brightness());
+        return sprintf(page, "%d\n", read_brightness(NULL));
 }
 static int
@@ -1116,7 +1128,6 @@ static int asus_model_match(char *model)
 static int asus_hotk_get_info(void)
 {
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
        union acpi_object *model = NULL;
        int bsts_result;
        char *string = NULL;
@@ -1130,11 +1141,9 @@ static int asus_hotk_get_info(void)
         * HID), this bit will be moved. A global variable asus_info contains
         * the DSDT header.
         */
-        status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
+        status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info);
        if (ACPI_FAILURE(status))
                printk(KERN_WARNING "  Couldn't get the DSDT table header\n");
-        else
-                asus_info = (struct acpi_table_header *)dsdt.pointer;
        /* We have to write 0 on init this far for all ASUS models */
        if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
@@ -1156,7 +1165,7 @@ static int asus_hotk_get_info(void)
         * asus_model_match() and try something completely different.
         */
        if (buffer.pointer) {
-                model = (union acpi_object *)buffer.pointer;
+                model = buffer.pointer;
                switch (model->type) {
                case ACPI_TYPE_STRING:
                        string = model->string.pointer;
@@ -1252,11 +1261,9 @@ static int asus_hotk_add(struct acpi_device *device)
        printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
               ASUS_ACPI_VERSION);
-        hotk =
+        hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
-            (struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
        if (!hotk)
                return -ENOMEM;
-        memset(hotk, 0, sizeof(struct asus_hotk));
        hotk->handle = device->handle;
        strcpy(acpi_device_name(device), ACPI_HOTK_DEVICE_NAME);
@@ -1333,6 +1340,24 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
        return 0;
 }
+static struct backlight_properties asus_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = read_brightness,
+        .update_status  = set_brightness_status,
+        .max_brightness = 15,
+};
+static void __exit asus_acpi_exit(void)
+{
+        if (asus_backlight_device)
+                backlight_device_unregister(asus_backlight_device);
+        acpi_bus_unregister_driver(&asus_hotk_driver);
+        remove_proc_entry(PROC_ASUS, acpi_root_dir);
+        return;
+}
 static int __init asus_acpi_init(void)
 {
        int result;
@@ -1370,17 +1395,15 @@ static int __init asus_acpi_init(void)
                return result;
        }
-        return 0;
+        asus_backlight_device = backlight_device_register("asus",NULL,NULL,
-}
+                                                          &asus_backlight_data);
+        if (IS_ERR(asus_backlight_device)) {
-static void __exit asus_acpi_exit(void)
+                printk(KERN_ERR "Could not register asus backlight device\n");
-{
+                asus_backlight_device = NULL;
-        acpi_bus_unregister_driver(&asus_hotk_driver);
+                asus_acpi_exit();
-        remove_proc_entry(PROC_ASUS, acpi_root_dir);
+        }
-        kfree(asus_info);
-        return;
+        return 0;
 }
 module_init(asus_acpi_init);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 07c3c276ad34..2f4521a48fe7 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -149,7 +149,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
                return -ENODEV;
        }
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
        /* Extract Package Data */
@@ -160,12 +160,11 @@ acpi_battery_get_info(struct acpi_battery *battery,
                goto end;
        }
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
        if (!data.pointer) {
                result = -ENOMEM;
                goto end;
        }
-        memset(data.pointer, 0, data.length);
        status = acpi_extract_package(package, &format, &data);
        if (ACPI_FAILURE(status)) {
@@ -179,7 +178,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
        kfree(buffer.pointer);
        if (!result)
-                (*bif) = (struct acpi_battery_info *)data.pointer;
+                (*bif) = data.pointer;
        return result;
 }
@@ -209,7 +208,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
                return -ENODEV;
        }
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
        /* Extract Package Data */
@@ -220,12 +219,11 @@ acpi_battery_get_status(struct acpi_battery *battery,
                goto end;
        }
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
        if (!data.pointer) {
                result = -ENOMEM;
                goto end;
        }
-        memset(data.pointer, 0, data.length);
        status = acpi_extract_package(package, &format, &data);
        if (ACPI_FAILURE(status)) {
@@ -239,7 +237,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
        kfree(buffer.pointer);
        if (!result)
-                (*bst) = (struct acpi_battery_status *)data.pointer;
+                (*bst) = data.pointer;
        return result;
 }
@@ -334,7 +332,7 @@ static struct proc_dir_entry *acpi_battery_dir;
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
        int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        struct acpi_battery_info *bif = NULL;
        char *units = "?";
@@ -418,7 +416,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 {
        int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        struct acpi_battery_status *bst = NULL;
        char *units = "?";
@@ -494,7 +492,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        char *units = "?";
@@ -531,8 +529,8 @@ acpi_battery_write_alarm(struct file *file,
 {
        int result = 0;
        char alarm_string[12] = { '\0' };
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_battery *battery = (struct acpi_battery *)m->private;
+        struct acpi_battery *battery = m->private;
        if (!battery || (count > sizeof(alarm_string) - 1))
@@ -658,7 +656,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
 static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)data;
+        struct acpi_battery *battery = data;
        struct acpi_device *device = NULL;
@@ -694,10 +692,9 @@ static int acpi_battery_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+        battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
        if (!battery)
                return -ENOMEM;
-        memset(battery, 0, sizeof(struct acpi_battery));
        battery->device = device;
        strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
@@ -742,7 +739,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        battery = (struct acpi_battery *)acpi_driver_data(device);
+        battery = acpi_driver_data(device);
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY,
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
new file mode 100644
index 000000000000..aa1b131c0fce
--- /dev/null
+++ b/drivers/acpi/bay.c
@@ -0,0 +1,506 @@
+/*
+ *  bay.c - ACPI removable drive bay driver
+ *
+ *  Copyright (C) 2006 Kristen Carlson Accardi <kristen.c.accardi@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/notifier.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+#include <linux/seq_file.h>
+#include <asm/uaccess.h>
+#include <linux/platform_device.h>
+#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver"
+ACPI_MODULE_NAME("bay")
+MODULE_AUTHOR("Kristen Carlson Accardi");
+MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME);
+MODULE_LICENSE("GPL");
+#define ACPI_BAY_CLASS "bay"
+#define ACPI_BAY_COMPONENT      0x10000000
+#define _COMPONENT ACPI_BAY_COMPONENT
+#define bay_dprintk(h,s) {\
+        char prefix[80] = {'\0'};\
+        struct acpi_buffer buffer = {sizeof(prefix), prefix};\
+        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\
+        printk(KERN_DEBUG PREFIX "%s: %s\n", prefix, s); }
+static void bay_notify(acpi_handle handle, u32 event, void *data);
+static int acpi_bay_add(struct acpi_device *device);
+static int acpi_bay_remove(struct acpi_device *device, int type);
+static int acpi_bay_match(struct acpi_device *device,
+                                struct acpi_driver *driver);
+static struct acpi_driver acpi_bay_driver = {
+        .name = ACPI_BAY_DRIVER_NAME,
+        .class = ACPI_BAY_CLASS,
+        .ops = {
+                .add = acpi_bay_add,
+                .remove = acpi_bay_remove,
+                .match = acpi_bay_match,
+                },
+};
+struct bay {
+        acpi_handle handle;
+        char *name;
+        struct list_head list;
+        struct platform_device *pdev;
+};
+static LIST_HEAD(drive_bays);
+/*****************************************************************************
+ *                         Drive Bay functions                               *
+ *****************************************************************************/
+/**
+ * is_ejectable - see if a device is ejectable
+ * @handle: acpi handle of the device
+ *
+ * If an acpi object has a _EJ0 method, then it is ejectable
+ */
+static int is_ejectable(acpi_handle handle)
+{
+        acpi_status status;
+        acpi_handle tmp;
+        status = acpi_get_handle(handle, "_EJ0", &tmp);
+        if (ACPI_FAILURE(status))
+                return 0;
+        return 1;
+}
+/**
+ * bay_present - see if the bay device is present
+ * @bay: the drive bay
+ *
+ * execute the _STA method.
+ */
+static int bay_present(struct bay *bay)
+{
+        unsigned long sta;
+        acpi_status status;
+        if (bay) {
+                status = acpi_evaluate_integer(bay->handle, "_STA", NULL, &sta);
+                if (ACPI_SUCCESS(status) && sta)
+                        return 1;
+        }
+        return 0;
+}
+/**
+ * eject_device - respond to an eject request
+ * @handle - the device to eject
+ *
+ * Call this devices _EJ0 method.
+ */
+static void eject_device(acpi_handle handle)
+{
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
+        bay_dprintk(handle, "Ejecting device");
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = 1;
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_EJ0",
+                                              &arg_list, NULL)))
+                pr_debug("Failed to evaluate _EJ0!\n");
+}
+/*
+ * show_present - read method for "present" file in sysfs
+ */
+static ssize_t show_present(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+        struct bay *bay = dev_get_drvdata(dev);
+        return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));
+}
+DEVICE_ATTR(present, S_IRUGO, show_present, NULL);
+/*
+ * write_eject - write method for "eject" file in sysfs
+ */
+static ssize_t write_eject(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        struct bay *bay = dev_get_drvdata(dev);
+        if (!count)
+                return -EINVAL;
+        eject_device(bay->handle);
+        return count;
+}
+DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);
+/**
+ * is_ata - see if a device is an ata device
+ * @handle: acpi handle of the device
+ *
+ * If an acpi object has one of 4 ATA ACPI methods defined,
+ * then it is an ATA device
+ */
+static int is_ata(acpi_handle handle)
+{
+        acpi_handle tmp;
+        if ((ACPI_SUCCESS(acpi_get_handle(handle, "_GTF", &tmp))) ||
+           (ACPI_SUCCESS(acpi_get_handle(handle, "_GTM", &tmp))) ||
+           (ACPI_SUCCESS(acpi_get_handle(handle, "_STM", &tmp))) ||
+           (ACPI_SUCCESS(acpi_get_handle(handle, "_SDD", &tmp))))
+                return 1;
+        return 0;
+}
+/**
+ * parent_is_ata(acpi_handle handle)
+ *
+ */
+static int parent_is_ata(acpi_handle handle)
+{
+        acpi_handle phandle;
+        if (acpi_get_parent(handle, &phandle))
+                return 0;
+        return is_ata(phandle);
+}
+/**
+ * is_ejectable_bay - see if a device is an ejectable drive bay
+ * @handle: acpi handle of the device
+ *
+ * If an acpi object is ejectable and has one of the ACPI ATA
+ * methods defined, then we can safely call it an ejectable
+ * drive bay
+ */
+static int is_ejectable_bay(acpi_handle handle)
+{
+        if ((is_ata(handle) || parent_is_ata(handle)) && is_ejectable(handle))
+                return 1;
+        return 0;
+}
+/**
+ * eject_removable_drive - try to eject this drive
+ * @dev : the device structure of the drive
+ *
+ * If a device is a removable drive that requires an _EJ0 method
+ * to be executed in order to safely remove from the system, do
+ * it.  ATM - always returns success
+ */
+int eject_removable_drive(struct device *dev)
+{
+        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        if (handle) {
+                bay_dprintk(handle, "Got device handle");
+                if (is_ejectable_bay(handle))
+                        eject_device(handle);
+        } else {
+                printk("No acpi handle for device\n");
+        }
+        /* should I return an error code? */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(eject_removable_drive);
+static int acpi_bay_add(struct acpi_device *device)
+{
+        bay_dprintk(device->handle, "adding bay device");
+        strcpy(acpi_device_name(device), "Dockable Bay");
+        strcpy(acpi_device_class(device), "bay");
+        return 0;
+}
+static int acpi_bay_add_fs(struct bay *bay)
+{
+        int ret;
+        struct device *dev = &bay->pdev->dev;
+        ret = device_create_file(dev, &dev_attr_present);
+        if (ret)
+                goto add_fs_err;
+        ret = device_create_file(dev, &dev_attr_eject);
+        if (ret) {
+                device_remove_file(dev, &dev_attr_present);
+                goto add_fs_err;
+        }
+        return 0;
+ add_fs_err:
+        bay_dprintk(bay->handle, "Error adding sysfs files\n");
+        return ret;
+}
+static void acpi_bay_remove_fs(struct bay *bay)
+{
+        struct device *dev = &bay->pdev->dev;
+        /* cleanup sysfs */
+        device_remove_file(dev, &dev_attr_present);
+        device_remove_file(dev, &dev_attr_eject);
+}
+static int bay_is_dock_device(acpi_handle handle)
+{
+        acpi_handle parent;
+        acpi_get_parent(handle, &parent);
+        /* if the device or it's parent is dependent on the
+         * dock, then we are a dock device
+         */
+        return (is_dock_device(handle) || is_dock_device(parent));
+}
+static int bay_add(acpi_handle handle, int id)
+{
+        acpi_status status;
+        struct bay *new_bay;
+        struct platform_device *pdev;
+        struct acpi_buffer nbuffer = {ACPI_ALLOCATE_BUFFER, NULL};
+        acpi_get_name(handle, ACPI_FULL_PATHNAME, &nbuffer);
+        bay_dprintk(handle, "Adding notify handler");
+        /*
+         * Initialize bay device structure
+         */
+        new_bay = kzalloc(GFP_ATOMIC, sizeof(*new_bay));
+        INIT_LIST_HEAD(&new_bay->list);
+        new_bay->handle = handle;
+        new_bay->name = (char *)nbuffer.pointer;
+        /* initialize platform device stuff */
+        pdev = platform_device_register_simple(ACPI_BAY_CLASS, id, NULL, 0);
+        if (pdev == NULL) {
+                printk(KERN_ERR PREFIX "Error registering bay device\n");
+                goto bay_add_err;
+        }
+        new_bay->pdev = pdev;
+        platform_set_drvdata(pdev, new_bay);
+        if (acpi_bay_add_fs(new_bay)) {
+                platform_device_unregister(new_bay->pdev);
+                goto bay_add_err;
+        }
+        /* register for events on this device */
+        status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+                        bay_notify, new_bay);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR PREFIX "Error installing bay notify handler\n");
+        }
+        /* if we are on a dock station, we should register for dock
+         * notifications.
+         */
+        if (bay_is_dock_device(handle)) {
+                bay_dprintk(handle, "Is dependent on dock\n");
+                register_hotplug_dock_device(handle, bay_notify, new_bay);
+        }
+        list_add(&new_bay->list, &drive_bays);
+        printk(KERN_INFO PREFIX "Bay [%s] Added\n", new_bay->name);
+        return 0;
+bay_add_err:
+        kfree(new_bay->name);
+        kfree(new_bay);
+        return -ENODEV;
+}
+static int acpi_bay_remove(struct acpi_device *device, int type)
+{
+        /*** FIXME: do something here */
+        return 0;
+}
+static int acpi_bay_match(struct acpi_device *device,
+                                struct acpi_driver *driver)
+{
+        if (!device || !driver)
+                return -EINVAL;
+        if (is_ejectable_bay(device->handle)) {
+                bay_dprintk(device->handle, "matching bay device");
+                return 0;
+        }
+        return -ENODEV;
+}
+/**
+ * bay_create_acpi_device - add new devices to acpi
+ * @handle - handle of the device to add
+ *
+ *  This function will create a new acpi_device for the given
+ *  handle if one does not exist already.  This should cause
+ *  acpi to scan for drivers for the given devices, and call
+ *  matching driver's add routine.
+ *
+ *  Returns a pointer to the acpi_device corresponding to the handle.
+ */
+static struct acpi_device * bay_create_acpi_device(acpi_handle handle)
+{
+        struct acpi_device *device = NULL;
+        struct acpi_device *parent_device;
+        acpi_handle parent;
+        int ret;
+        bay_dprintk(handle, "Trying to get device");
+        if (acpi_bus_get_device(handle, &device)) {
+                /*
+                 * no device created for this object,
+                 * so we should create one.
+                 */
+                bay_dprintk(handle, "No device for handle");
+                acpi_get_parent(handle, &parent);
+                if (acpi_bus_get_device(parent, &parent_device))
+                        parent_device = NULL;
+                ret = acpi_bus_add(&device, parent_device, handle,
+                        ACPI_BUS_TYPE_DEVICE);
+                if (ret) {
+                        pr_debug("error adding bus, %x\n",
+                                -ret);
+                        return NULL;
+                }
+        }
+        return device;
+}
+/**
+ * bay_notify - act upon an acpi bay notification
+ * @handle: the bay handle
+ * @event: the acpi event
+ * @data: our driver data struct
+ *
+ */
+static void bay_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct acpi_device *dev;
+        bay_dprintk(handle, "Bay event");
+        switch(event) {
+        case ACPI_NOTIFY_BUS_CHECK:
+                printk("Bus Check\n");
+        case ACPI_NOTIFY_DEVICE_CHECK:
+                printk("Device Check\n");
+                dev = bay_create_acpi_device(handle);
+                if (dev)
+                        acpi_bus_generate_event(dev, event, 0);
+                else
+                        printk("No device for generating event\n");
+                /* wouldn't it be a good idea to just rescan SATA
+                 * right here?
+                 */
+                break;
+        case ACPI_NOTIFY_EJECT_REQUEST:
+                printk("Eject request\n");
+                dev = bay_create_acpi_device(handle);
+                if (dev)
+                        acpi_bus_generate_event(dev, event, 0);
+                else
+                        printk("No device for generating eventn");
+                /* wouldn't it be a good idea to just call the
+                 * eject_device here if we were a SATA device?
+                 */
+                break;
+        default:
+                printk("unknown event %d\n", event);
+        }
+}
+static acpi_status
+find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        int *count = (int *)context;
+        /*
+         * there could be more than one ejectable bay.
+         * so, just return AE_OK always so that every object
+         * will be checked.
+         */
+        if (is_ejectable_bay(handle)) {
+                bay_dprintk(handle, "found ejectable bay");
+                if (!bay_add(handle, *count))
+                        (*count)++;
+        }
+        return AE_OK;
+}
+static int __init bay_init(void)
+{
+        int bays = 0;
+        INIT_LIST_HEAD(&drive_bays);
+        /* look for dockable drive bays */
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                ACPI_UINT32_MAX, find_bay, &bays, NULL);
+        if (bays)
+                if ((acpi_bus_register_driver(&acpi_bay_driver) < 0))
+                        printk(KERN_ERR "Unable to register bay driver\n");
+        if (!bays)
+                return -ENODEV;
+        return 0;
+}
+static void __exit bay_exit(void)
+{
+        struct bay *bay, *tmp;
+        list_for_each_entry_safe(bay, tmp, &drive_bays, list) {
+                if (is_dock_device(bay->handle))
+                        unregister_hotplug_dock_device(bay->handle);
+                acpi_bay_remove_fs(bay);
+                acpi_remove_notify_handler(bay->handle, ACPI_SYSTEM_NOTIFY,
+                        bay_notify);
+                platform_device_unregister(bay->pdev);
+                kfree(bay->name);
+                kfree(bay);
+        }
+        acpi_bus_unregister_driver(&acpi_bay_driver);
+}
+postcore_initcall(bay_init);
+module_exit(bay_exit);
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index f9c972b26f4f..f289fd41e77d 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -44,7 +44,7 @@ struct acpi_blacklist_item {
        char oem_id[7];
        char oem_table_id[9];
        u32 oem_revision;
-        acpi_table_type table;
+        char *table;
        enum acpi_blacklist_predicates oem_revision_predicate;
        char *reason;
        u32 is_critical_error;
@@ -56,18 +56,18 @@ struct acpi_blacklist_item {
 */
 static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
        /* Compaq Presario 1700 */
-        {"PTLTD ", "  DSDT  ", 0x06040000, ACPI_DSDT, less_than_or_equal,
+        {"PTLTD ", "  DSDT  ", 0x06040000, ACPI_SIG_DSDT, less_than_or_equal,
         "Multiple problems", 1},
        /* Sony FX120, FX140, FX150? */
-        {"SONY  ", "U0      ", 0x20010313, ACPI_DSDT, less_than_or_equal,
+        {"SONY  ", "U0      ", 0x20010313, ACPI_SIG_DSDT, less_than_or_equal,
         "ACPI driver problem", 1},
        /* Compaq Presario 800, Insyde BIOS */
-        {"INT440", "SYSFexxx", 0x00001001, ACPI_DSDT, less_than_or_equal,
+        {"INT440", "SYSFexxx", 0x00001001, ACPI_SIG_DSDT, less_than_or_equal,
         "Does not use _REG to protect EC OpRegions", 1},
        /* IBM 600E - _ADR should return 7, but it returns 1 */
-        {"IBM   ", "TP600E  ", 0x00000105, ACPI_DSDT, less_than_or_equal,
+        {"IBM   ", "TP600E  ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
         "Incorrect _ADR", 1},
-        {"ASUS\0\0", "P2B-S   ", 0, ACPI_DSDT, all_versions,
+        {"ASUS\0\0", "P2B-S   ", 0, ACPI_SIG_DSDT, all_versions,
         "Bogus PCI routing", 1},
        {""}
@@ -79,7 +79,7 @@ static int __init blacklist_by_year(void)
 {
        int year = dmi_get_year(DMI_BIOS_DATE);
        /* Doesn't exist? Likely an old system */
-        if (year == -1) 
+        if (year == -1)
                return 1;
        /* 0? Likely a buggy new BIOS */
        if (year == 0)
@@ -103,22 +103,21 @@ int __init acpi_blacklisted(void)
 {
        int i = 0;
        int blacklisted = 0;
-        struct acpi_table_header *table_header;
+        struct acpi_table_header table_header;
        while (acpi_blacklist[i].oem_id[0] != '\0') {
-                if (acpi_get_table_header_early
+                if (acpi_get_table_header(acpi_blacklist[i].table, 0, &table_header)) {
-                    (acpi_blacklist[i].table, &table_header)) {
                        i++;
                        continue;
                }
-                if (strncmp(acpi_blacklist[i].oem_id, table_header->oem_id, 6)) {
+                if (strncmp(acpi_blacklist[i].oem_id, table_header.oem_id, 6)) {
                        i++;
                        continue;
                }
                if (strncmp
-                    (acpi_blacklist[i].oem_table_id, table_header->oem_table_id,
+                    (acpi_blacklist[i].oem_table_id, table_header.oem_table_id,
                     8)) {
                        i++;
                        continue;
@@ -127,14 +126,14 @@ int __init acpi_blacklisted(void)
                if ((acpi_blacklist[i].oem_revision_predicate == all_versions)
                    || (acpi_blacklist[i].oem_revision_predicate ==
                        less_than_or_equal
-                        && table_header->oem_revision <=
+                        && table_header.oem_revision <=
                        acpi_blacklist[i].oem_revision)
                    || (acpi_blacklist[i].oem_revision_predicate ==
                        greater_than_or_equal
-                        && table_header->oem_revision >=
+                        && table_header.oem_revision >=
                        acpi_blacklist[i].oem_revision)
                    || (acpi_blacklist[i].oem_revision_predicate == equal
-                        && table_header->oem_revision ==
+                        && table_header.oem_revision ==
                        acpi_blacklist[i].oem_revision)) {
                        printk(KERN_ERR PREFIX
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index da471f647d07..c26468da4295 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -44,9 +44,6 @@ ACPI_MODULE_NAME("acpi_bus")
 extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
 #endif
-struct fadt_descriptor acpi_fadt;
-EXPORT_SYMBOL(acpi_fadt);
 struct acpi_device *acpi_root;
 struct proc_dir_entry *acpi_root_dir;
 EXPORT_SYMBOL(acpi_root_dir);
@@ -561,6 +558,9 @@ static int __init acpi_bus_init_irq(void)
        case ACPI_IRQ_MODEL_IOSAPIC:
                message = "IOSAPIC";
                break;
+        case ACPI_IRQ_MODEL_PLATFORM:
+                message = "platform specific model";
+                break;
        default:
                printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");
                return -ENODEV;
@@ -579,11 +579,12 @@ static int __init acpi_bus_init_irq(void)
        return 0;
 }
+acpi_native_uint acpi_gbl_permanent_mmap;
 void __init acpi_early_init(void)
 {
        acpi_status status = AE_OK;
-        struct acpi_buffer buffer = { sizeof(acpi_fadt), &acpi_fadt };
        if (acpi_disabled)
                return;
@@ -594,6 +595,15 @@ void __init acpi_early_init(void)
        if (!acpi_strict)
                acpi_gbl_enable_interpreter_slack = TRUE;
+        acpi_gbl_permanent_mmap = 1;
+        status = acpi_reallocate_root_table();
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR PREFIX
+                       "Unable to reallocate ACPI tables\n");
+                goto error0;
+        }
        status = acpi_initialize_subsystem();
        if (ACPI_FAILURE(status)) {
                printk(KERN_ERR PREFIX
@@ -608,32 +618,25 @@ void __init acpi_early_init(void)
                goto error0;
        }
-        /*
-         * Get a separate copy of the FADT for use by other drivers.
-         */
-        status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &buffer);
-        if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR PREFIX "Unable to get the FADT\n");
-                goto error0;
-        }
 #ifdef CONFIG_X86
        if (!acpi_ioapic) {
-                extern acpi_interrupt_flags acpi_sci_flags;
+                extern u8 acpi_sci_flags;
                /* compatible (0) means level (3) */
-                if (acpi_sci_flags.trigger == 0)
+                if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) {
-                        acpi_sci_flags.trigger = 3;
+                        acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK;
+                        acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL;
+                }
                /* Set PIC-mode SCI trigger type */
-                acpi_pic_sci_set_trigger(acpi_fadt.sci_int,
+                acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt,
-                                         acpi_sci_flags.trigger);
+                                         (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2);
        } else {
                extern int acpi_sci_override_gsi;
                /*
-                 * now that acpi_fadt is initialized,
+                 * now that acpi_gbl_FADT is initialized,
                 * update it with result from INT_SRC_OVR parsing
                 */
-                acpi_fadt.sci_int = acpi_sci_override_gsi;
+                acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi;
        }
 #endif
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 7fda02c98310..c726612fafb6 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -29,6 +29,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/input.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -62,7 +63,7 @@
 #define _COMPONENT              ACPI_BUTTON_COMPONENT
 ACPI_MODULE_NAME("acpi_button")
-    MODULE_AUTHOR("Paul Diefenbaugh");
+MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);
 MODULE_LICENSE("GPL");
@@ -78,12 +79,14 @@ static struct acpi_driver acpi_button_driver = {
        .ops = {
                .add = acpi_button_add,
                .remove = acpi_button_remove,
-                },
+        },
 };
 struct acpi_button {
        struct acpi_device *device;     /* Fixed button kludge */
-        u8 type;
+        unsigned int type;
+        struct input_dev *input;
+        char phys[32];                  /* for input device */
        unsigned long pushed;
 };
@@ -109,8 +112,7 @@ static struct proc_dir_entry *acpi_button_dir;
 static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_button *button = (struct acpi_button *)seq->private;
+        struct acpi_button *button = seq->private;
        if (!button || !button->device)
                return 0;
@@ -128,22 +130,17 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_button *button = (struct acpi_button *)seq->private;
+        struct acpi_button *button = seq->private;
        acpi_status status;
        unsigned long state;
        if (!button || !button->device)
                return 0;
        status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state);
-        if (ACPI_FAILURE(status)) {
+        seq_printf(seq, "state:      %s\n",
-                seq_printf(seq, "state:      unsupported\n");
+                   ACPI_FAILURE(status) ? "unsupported" :
-        } else {
+                        (state ? "open" : "closed"));
-                seq_printf(seq, "state:      %s\n",
-                           (state ? "open" : "closed"));
-        }
        return 0;
 }
@@ -159,8 +156,7 @@ static struct proc_dir_entry *acpi_lid_dir;
 static int acpi_button_add_fs(struct acpi_device *device)
 {
        struct proc_dir_entry *entry = NULL;
-        struct acpi_button *button = NULL;
+        struct acpi_button *button;
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
@@ -228,10 +224,8 @@ static int acpi_button_add_fs(struct acpi_device *device)
 static int acpi_button_remove_fs(struct acpi_device *device)
 {
-        struct acpi_button *button = NULL;
+        struct acpi_button *button = acpi_driver_data(device);
-        button = acpi_driver_data(device);
        if (acpi_device_dir(device)) {
                if (button->type == ACPI_BUTTON_TYPE_LID)
                        remove_proc_entry(ACPI_BUTTON_FILE_STATE,
@@ -253,14 +247,34 @@ static int acpi_button_remove_fs(struct acpi_device *device)
 static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_button *button = (struct acpi_button *)data;
+        struct acpi_button *button = data;
+        struct input_dev *input;
        if (!button || !button->device)
                return;
        switch (event) {
        case ACPI_BUTTON_NOTIFY_STATUS:
+                input = button->input;
+                if (button->type == ACPI_BUTTON_TYPE_LID) {
+                        struct acpi_handle *handle = button->device->handle;
+                        unsigned long state;
+                        if (!ACPI_FAILURE(acpi_evaluate_integer(handle, "_LID",
+                                                                NULL, &state)))
+                                input_report_switch(input, SW_LID, !state);
+                } else {
+                        int keycode = test_bit(KEY_SLEEP, input->keybit) ?
+                                                KEY_SLEEP : KEY_POWER;
+                        input_report_key(input, keycode, 1);
+                        input_sync(input);
+                        input_report_key(input, keycode, 0);
+                }
+                input_sync(input);
                acpi_bus_generate_event(button->device, event,
                                        ++button->pushed);
                break;
@@ -275,8 +289,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 static acpi_status acpi_button_notify_fixed(void *data)
 {
-        struct acpi_button *button = (struct acpi_button *)data;
+        struct acpi_button *button = data;
        if (!button)
                return AE_BAD_PARAMETER;
@@ -286,24 +299,75 @@ static acpi_status acpi_button_notify_fixed(void *data)
        return AE_OK;
 }
-static int acpi_button_add(struct acpi_device *device)
+static int acpi_button_install_notify_handlers(struct acpi_button *button)
 {
-        int result = 0;
+        acpi_status status;
-        acpi_status status = AE_OK;
-        struct acpi_button *button = NULL;
+        switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWERF:
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                     acpi_button_notify_fixed,
+                                                     button);
+                break;
+        case ACPI_BUTTON_TYPE_SLEEPF:
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                     acpi_button_notify_fixed,
+                                                     button);
+                break;
+        default:
+                status = acpi_install_notify_handler(button->device->handle,
+                                                     ACPI_DEVICE_NOTIFY,
+                                                     acpi_button_notify,
+                                                     button);
+                break;
+        }
+        return ACPI_FAILURE(status) ? -ENODEV : 0;
+}
+static void acpi_button_remove_notify_handlers(struct acpi_button *button)
+{
+        switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWERF:
+                acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                acpi_button_notify_fixed);
+                break;
+        case ACPI_BUTTON_TYPE_SLEEPF:
+                acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                acpi_button_notify_fixed);
+                break;
+        default:
+                acpi_remove_notify_handler(button->device->handle,
+                                           ACPI_DEVICE_NOTIFY,
+                                           acpi_button_notify);
+                break;
+        }
+}
+static int acpi_button_add(struct acpi_device *device)
+{
+        int error;
+        struct acpi_button *button;
+        struct input_dev *input;
        if (!device)
                return -EINVAL;
-        button = kmalloc(sizeof(struct acpi_button), GFP_KERNEL);
+        button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
        if (!button)
                return -ENOMEM;
-        memset(button, 0, sizeof(struct acpi_button));
        button->device = device;
        acpi_driver_data(device) = button;
+        button->input = input = input_allocate_device();
+        if (!input) {
+                error = -ENOMEM;
+                goto err_free_button;
+        }
        /*
         * Determine the button type (via hid), as fixed-feature buttons
         * need to be handled a bit differently than generic-space.
@@ -338,39 +402,48 @@ static int acpi_button_add(struct acpi_device *device)
        } else {
                printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",
                            acpi_device_hid(device));
-                result = -ENODEV;
+                error = -ENODEV;
-                goto end;
+                goto err_free_input;
        }
-        result = acpi_button_add_fs(device);
+        error = acpi_button_add_fs(device);
-        if (result)
+        if (error)
-                goto end;
+                goto err_free_input;
+        error = acpi_button_install_notify_handlers(button);
+        if (error)
+                goto err_remove_fs;
+        snprintf(button->phys, sizeof(button->phys),
+                 "%s/button/input0", acpi_device_hid(device));
+        input->name = acpi_device_name(device);
+        input->phys = button->phys;
+        input->id.bustype = BUS_HOST;
+        input->id.product = button->type;
        switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWER:
        case ACPI_BUTTON_TYPE_POWERF:
-                status =
+                input->evbit[0] = BIT(EV_KEY);
-                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                set_bit(KEY_POWER, input->keybit);
-                                                     acpi_button_notify_fixed,
-                                                     button);
                break;
+        case ACPI_BUTTON_TYPE_SLEEP:
        case ACPI_BUTTON_TYPE_SLEEPF:
-                status =
+                input->evbit[0] = BIT(EV_KEY);
-                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                set_bit(KEY_SLEEP, input->keybit);
-                                                     acpi_button_notify_fixed,
-                                                     button);
                break;
-        default:
-                status = acpi_install_notify_handler(device->handle,
+        case ACPI_BUTTON_TYPE_LID:
-                                                     ACPI_DEVICE_NOTIFY,
+                input->evbit[0] = BIT(EV_SW);
-                                                     acpi_button_notify,
+                set_bit(SW_LID, input->swbit);
-                                                     button);
                break;
        }
-        if (ACPI_FAILURE(status)) {
+        error = input_register_device(input);
-                result = -ENODEV;
+        if (error)
-                goto end;
+                goto err_remove_handlers;
-        }
        if (device->wakeup.flags.valid) {
                /* Button's GPE is run-wake GPE */
@@ -385,47 +458,31 @@ static int acpi_button_add(struct acpi_device *device)
        printk(KERN_INFO PREFIX "%s [%s]\n",
               acpi_device_name(device), acpi_device_bid(device));
-      end:
+        return 0;
-        if (result) {
-                acpi_button_remove_fs(device);
-                kfree(button);
-        }
-        return result;
+ err_remove_handlers:
+        acpi_button_remove_notify_handlers(button);
+ err_remove_fs:
+        acpi_button_remove_fs(device);
+ err_free_input:
+        input_free_device(input);
+ err_free_button:
+        kfree(button);
+        return error;
 }
 static int acpi_button_remove(struct acpi_device *device, int type)
 {
-        acpi_status status = 0;
+        struct acpi_button *button;
-        struct acpi_button *button = NULL;
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
        button = acpi_driver_data(device);
-        /* Unregister for device notifications. */
+        acpi_button_remove_notify_handlers(button);
-        switch (button->type) {
-        case ACPI_BUTTON_TYPE_POWERF:
-                status =
-                    acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                    acpi_button_notify_fixed);
-                break;
-        case ACPI_BUTTON_TYPE_SLEEPF:
-                status =
-                    acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                    acpi_button_notify_fixed);
-                break;
-        default:
-                status = acpi_remove_notify_handler(device->handle,
-                                                    ACPI_DEVICE_NOTIFY,
-                                                    acpi_button_notify);
-                break;
-        }
        acpi_button_remove_fs(device);
+        input_unregister_device(button->input);
        kfree(button);
        return 0;
@@ -433,8 +490,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 static int __init acpi_button_init(void)
 {
-        int result = 0;
+        int result;
        acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
        if (!acpi_button_dir)
@@ -451,7 +507,6 @@ static int __init acpi_button_init(void)
 static void __exit acpi_button_exit(void)
 {
        acpi_bus_unregister_driver(&acpi_button_driver);
        if (acpi_power_dir)
@@ -461,8 +516,6 @@ static void __exit acpi_button_exit(void)
        if (acpi_lid_dir)
                remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
        remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
-        return;
 }
 module_init(acpi_button_init);
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 914f56ae4b44..69a68fd394cf 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -96,11 +96,10 @@ static int acpi_container_add(struct acpi_device *device)
                return -EINVAL;
        }
-        container = kmalloc(sizeof(struct acpi_container), GFP_KERNEL);
+        container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL);
        if (!container)
                return -ENOMEM;
-        memset(container, 0, sizeof(struct acpi_container));
        container->handle = device->handle;
        strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS);
@@ -117,7 +116,7 @@ static int acpi_container_remove(struct acpi_device *device, int type)
        acpi_status status = AE_OK;
        struct acpi_container *pc = NULL;
-        pc = (struct acpi_container *)acpi_driver_data(device);
+        pc = acpi_driver_data(device);
        kfree(pc);
        return status;
 }
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index a6d77efb41a0..f049639bac35 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -133,7 +133,8 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                }
        }
-        /* We could put the returned object (Node) on the object stack for later,
+        /*
+         * 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
         */
@@ -514,8 +515,33 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
        /* Third arg is the bank_value */
+        /* TBD: This arg is a term_arg, not a constant, and must be evaluated */
        arg = arg->common.next;
-        info.bank_value = (u32) arg->common.value.integer;
+        /* Currently, only the following constants are supported */
+        switch (arg->common.aml_opcode) {
+        case AML_ZERO_OP:
+                info.bank_value = 0;
+                break;
+        case AML_ONE_OP:
+                info.bank_value = 1;
+                break;
+        case AML_BYTE_OP:
+        case AML_WORD_OP:
+        case AML_DWORD_OP:
+        case AML_QWORD_OP:
+                info.bank_value = (u32) arg->common.value.integer;
+                break;
+        default:
+                info.bank_value = 0;
+                ACPI_ERROR((AE_INFO,
+                            "Non-constant BankValue for BankField is not implemented"));
+        }
        /* Fourth arg is the field flags */
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 1888c055d10f..af923c388520 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acdispat.h>
 #include <acpi/acnamesp.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsinit")
@@ -90,7 +91,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
         * We are only interested in NS nodes owned by the table that
         * was just loaded
         */
-        if (node->owner_id != info->table_desc->owner_id) {
+        if (node->owner_id != info->owner_id) {
                return (AE_OK);
        }
@@ -150,14 +151,21 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
 ******************************************************************************/
 acpi_status
-acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
+acpi_ds_initialize_objects(acpi_native_uint table_index,
                           struct acpi_namespace_node * start_node)
 {
        acpi_status status;
        struct acpi_init_walk_info info;
+        struct acpi_table_header *table;
+        acpi_owner_id owner_id;
        ACPI_FUNCTION_TRACE(ds_initialize_objects);
+        status = acpi_tb_get_owner_id(table_index, &owner_id);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                          "**** Starting initialization of namespace objects ****\n"));
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "Parsing all Control Methods:"));
@@ -166,7 +174,8 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
        info.op_region_count = 0;
        info.object_count = 0;
        info.device_count = 0;
-        info.table_desc = table_desc;
+        info.table_index = table_index;
+        info.owner_id = owner_id;
        /* Walk entire namespace from the supplied root */
@@ -176,10 +185,14 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
                ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
        }
+        status = acpi_get_table_by_index(table_index, &table);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
                              "\nTable [%4.4s](id %4.4X) - %hd Objects with %hd Devices %hd Methods %hd Regions\n",
-                              table_desc->pointer->signature,
+                              table->signature, owner_id, info.object_count,
-                              table_desc->owner_id, info.object_count,
                              info.device_count, info.method_count,
                              info.op_region_count));
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index cf888add3191..1cbe61905824 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -327,7 +327,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
        ACPI_FUNCTION_TRACE_PTR(ds_call_control_method, this_walk_state);
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                          "Execute method %p, currentstate=%p\n",
+                          "Calling method %p, currentstate=%p\n",
                          this_walk_state->prev_op, this_walk_state));
        /*
@@ -351,49 +351,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
                return_ACPI_STATUS(status);
        }
-        /*
+        /* Begin method parse/execution. Create a new walk state */
-         * 1) Parse the method. All "normal" methods are parsed for each execution.
-         * Internal methods (_OSI, etc.) do not require parsing.
-         */
-        if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) {
-                /* Create a new walk state for the parse */
-                next_walk_state =
-                    acpi_ds_create_walk_state(obj_desc->method.owner_id, op,
-                                              obj_desc, NULL);
-                if (!next_walk_state) {
-                        status = AE_NO_MEMORY;
-                        goto cleanup;
-                }
-                /* Create and init a parse tree root */
-                op = acpi_ps_create_scope_op();
-                if (!op) {
-                        status = AE_NO_MEMORY;
-                        goto cleanup;
-                }
-                status = acpi_ds_init_aml_walk(next_walk_state, op, method_node,
-                                               obj_desc->method.aml_start,
-                                               obj_desc->method.aml_length,
-                                               NULL, 1);
-                if (ACPI_FAILURE(status)) {
-                        acpi_ps_delete_parse_tree(op);
-                        goto cleanup;
-                }
-                /* Begin AML parse (deletes next_walk_state) */
-                status = acpi_ps_parse_aml(next_walk_state);
-                acpi_ps_delete_parse_tree(op);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
-                }
-        }
-        /* 2) Begin method execution. Create a new walk state */
        next_walk_state = acpi_ds_create_walk_state(obj_desc->method.owner_id,
                                                    NULL, obj_desc, thread);
@@ -424,7 +382,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
        status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,
                                       obj_desc->method.aml_start,
-                                       obj_desc->method.aml_length, info, 3);
+                                       obj_desc->method.aml_length, info,
+                                       ACPI_IMODE_EXECUTE);
        ACPI_FREE(info);
        if (ACPI_FAILURE(status)) {
@@ -445,8 +404,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
        this_walk_state->num_operands = 0;
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                          "Starting nested execution, newstate=%p\n",
+                          "**** Begin nested execution of [%4.4s] **** WalkState=%p\n",
-                          next_walk_state));
+                          method_node->name.ascii, next_walk_state));
        /* Invoke an internal method if necessary */
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index 459160ff9058..ba4626e06a5e 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 72190abb1d59..a474ca2334d5 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -260,7 +260,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
        }
        obj_desc->buffer.flags |= AOPOBJ_DATA_VALID;
-        op->common.node = (struct acpi_namespace_node *)obj_desc;
+        op->common.node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_desc);
        return_ACPI_STATUS(AE_OK);
 }
@@ -270,7 +270,8 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 *
 * PARAMETERS:  walk_state      - Current walk state
 *              Op              - Parser object to be translated
- *              package_length  - Number of elements in the package
+ *              element_count   - Number of elements in the package - this is
+ *                                the num_elements argument to Package()
 *              obj_desc_ptr    - Where the ACPI internal object is returned
 *
 * RETURN:      Status
@@ -278,18 +279,29 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 * DESCRIPTION: Translate a parser Op package object to the equivalent
 *              namespace object
 *
+ * NOTE: The number of elements in the package will be always be the num_elements
+ * count, regardless of the number of elements in the package list. If
+ * num_elements is smaller, only that many package list elements are used.
+ * if num_elements is larger, the Package object is padded out with
+ * objects of type Uninitialized (as per ACPI spec.)
+ *
+ * Even though the ASL compilers do not allow num_elements to be smaller
+ * than the Package list length (for the fixed length package opcode), some
+ * BIOS code modifies the AML on the fly to adjust the num_elements, and
+ * this code compensates for that. This also provides compatibility with
+ * other AML interpreters.
+ *
 ******************************************************************************/
 acpi_status
 acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                                   union acpi_parse_object *op,
-                                   u32 package_length,
+                                   u32 element_count,
                                   union acpi_operand_object **obj_desc_ptr)
 {
        union acpi_parse_object *arg;
        union acpi_parse_object *parent;
        union acpi_operand_object *obj_desc = NULL;
-        u32 package_list_length;
        acpi_status status = AE_OK;
        acpi_native_uint i;
@@ -318,32 +330,13 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                obj_desc->package.node = parent->common.node;
        }
-        obj_desc->package.count = package_length;
-        /* Count the number of items in the package list */
-        arg = op->common.value.arg;
-        arg = arg->common.next;
-        for (package_list_length = 0; arg; package_list_length++) {
-                arg = arg->common.next;
-        }
-        /*
-         * The package length (number of elements) will be the greater
-         * of the specified length and the length of the initializer list
-         */
-        if (package_list_length > package_length) {
-                obj_desc->package.count = package_list_length;
-        }
        /*
-         * Allocate the pointer array (array of pointers to the
+         * Allocate the element array (array of pointers to the individual
-         * individual objects). Add an extra pointer slot so
+         * objects) based on the num_elements parameter. Add an extra pointer slot
-         * that the list is always null terminated.
+         * so that the list is always null terminated.
         */
        obj_desc->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size)
-                                                           obj_desc->package.
+                                                           element_count +
-                                                           count +
                                                           1) * sizeof(void *));
        if (!obj_desc->package.elements) {
@@ -351,15 +344,20 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(AE_NO_MEMORY);
        }
+        obj_desc->package.count = element_count;
        /*
-         * Initialize all elements of the package
+         * Initialize the elements of the package, up to the num_elements count.
+         * Package is automatically padded with uninitialized (NULL) elements
+         * if num_elements is greater than the package list length. Likewise,
+         * Package is truncated if num_elements is less than the list length.
         */
        arg = op->common.value.arg;
        arg = arg->common.next;
-        for (i = 0; arg; i++) {
+        for (i = 0; arg && (i < element_count); i++) {
                if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
-                        /* Object (package or buffer) is already built */
+                        /* This package element is already built, just get it */
                        obj_desc->package.elements[i] =
                            ACPI_CAST_PTR(union acpi_operand_object,
@@ -373,8 +371,14 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                arg = arg->common.next;
        }
+        if (!arg) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Package List length larger than NumElements count (%X), truncated\n",
+                                  element_count));
+        }
        obj_desc->package.flags |= AOPOBJ_DATA_VALID;
-        op->common.node = (struct acpi_namespace_node *)obj_desc;
+        op->common.node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_desc);
        return_ACPI_STATUS(status);
 }
@@ -488,8 +492,9 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                /*
                 * Defer evaluation of Buffer term_arg operand
                 */
-                obj_desc->buffer.node = (struct acpi_namespace_node *)
+                obj_desc->buffer.node =
-                    walk_state->operands[0];
+                    ACPI_CAST_PTR(struct acpi_namespace_node,
+                                  walk_state->operands[0]);
                obj_desc->buffer.aml_start = op->named.data;
                obj_desc->buffer.aml_length = op->named.length;
                break;
@@ -499,8 +504,9 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                /*
                 * Defer evaluation of Package term_arg operand
                 */
-                obj_desc->package.node = (struct acpi_namespace_node *)
+                obj_desc->package.node =
-                    walk_state->operands[0];
+                    ACPI_CAST_PTR(struct acpi_namespace_node,
+                                  walk_state->operands[0]);
                obj_desc->package.aml_start = op->named.data;
                obj_desc->package.aml_length = op->named.length;
                break;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 5b974a8fe614..6c6104a7a247 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
        }
        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
-                                       aml_length, NULL, 1);
+                                       aml_length, NULL, ACPI_IMODE_LOAD_PASS1);
        if (ACPI_FAILURE(status)) {
                acpi_ds_delete_walk_state(walk_state);
                goto cleanup;
@@ -157,7 +157,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
        /* Execute the opcode and arguments */
        status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
-                                       aml_length, NULL, 3);
+                                       aml_length, NULL, ACPI_IMODE_EXECUTE);
        if (ACPI_FAILURE(status)) {
                acpi_ds_delete_walk_state(walk_state);
                goto cleanup;
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 05230baf5de8..e4073e05a75c 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index d7a616c3104e..69693fa07224 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -219,7 +219,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
        if (!op) {
                status = acpi_ds_load2_begin_op(walk_state, out_op);
                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        goto error_exit;
                }
                op = *out_op;
@@ -238,7 +238,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                        status = acpi_ds_scope_stack_pop(walk_state);
                        if (ACPI_FAILURE(status)) {
-                                return_ACPI_STATUS(status);
+                                goto error_exit;
                        }
                }
        }
@@ -287,7 +287,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                status = acpi_ds_result_stack_push(walk_state);
                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        goto error_exit;
                }
                status = acpi_ds_exec_begin_control_op(walk_state, op);
@@ -328,6 +328,10 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
        /* Nothing to do here during method execution */
        return_ACPI_STATUS(status);
+      error_exit:
+        status = acpi_ds_method_error(status, walk_state);
+        return_ACPI_STATUS(status);
 }
 /*****************************************************************************
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index e3ca7f6539c1..8ab9d1b29a4c 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -196,6 +196,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 * 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:
@@ -546,6 +547,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
        acpi_status status;
        acpi_object_type object_type;
        char *buffer_ptr;
+        u32 flags;
        ACPI_FUNCTION_TRACE(ds_load2_begin_op);
@@ -669,6 +671,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                 * 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:
@@ -750,12 +753,20 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                        break;
                }
-                /* Add new entry into namespace */
+                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 | 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,
+                                   object_type, ACPI_IMODE_LOAD_PASS2, flags,
-                                   ACPI_NS_NO_UPSEARCH, walk_state, &(node));
+                                   walk_state, &node);
                break;
        }
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index c9228972f5f6..3927c495e4bf 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 7817e5522679..16c8e38b51ef 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bf5b79ed3613..688e83a16906 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/notifier.h>
+#include <linux/platform_device.h>
 #include <linux/jiffies.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -39,13 +40,15 @@ MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 static struct atomic_notifier_head dock_notifier_list;
+static struct platform_device dock_device;
+static char dock_device_name[] = "dock";
 struct dock_station {
        acpi_handle handle;
        unsigned long last_dock_time;
        u32 flags;
        spinlock_t dd_lock;
-        spinlock_t hp_lock;
+        struct mutex hp_lock;
        struct list_head dependent_devices;
        struct list_head hotplug_devices;
 };
@@ -115,9 +118,9 @@ static void
 dock_add_hotplug_device(struct dock_station *ds,
                        struct dock_dependent_device *dd)
 {
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
        list_add_tail(&dd->hotplug_list, &ds->hotplug_devices);
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 /**
@@ -131,9 +134,9 @@ static void
 dock_del_hotplug_device(struct dock_station *ds,
                        struct dock_dependent_device *dd)
 {
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
        list_del(&dd->hotplug_list);
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 /**
@@ -296,7 +299,7 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 {
        struct dock_dependent_device *dd;
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
        /*
         * First call driver specific hotplug functions
@@ -318,15 +321,17 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
                else
                        dock_create_acpi_device(dd->handle);
        }
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
+        struct device *dev = &dock_device.dev;
        /*
-         * we don't do events until someone tells me that
+         * Indicate that the status of the dock station has
-         * they would like to have them.
+         * changed.
         */
+        kobject_uevent(&dev->kobj, KOBJ_CHANGE);
 }
 /**
@@ -441,6 +446,9 @@ static int dock_in_progress(struct dock_station *ds)
 */
 int register_dock_notifier(struct notifier_block *nb)
 {
+        if (!dock_station)
+                return -ENODEV;
        return atomic_notifier_chain_register(&dock_notifier_list, nb);
 }
@@ -452,6 +460,9 @@ EXPORT_SYMBOL_GPL(register_dock_notifier);
 */
 void unregister_dock_notifier(struct notifier_block *nb)
 {
+        if (!dock_station)
+                return;
        atomic_notifier_chain_unregister(&dock_notifier_list, nb);
 }
@@ -512,6 +523,37 @@ void unregister_hotplug_dock_device(acpi_handle handle)
 EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
 /**
+ * handle_eject_request - handle an undock request checking for error conditions
+ *
+ * Check to make sure the dock device is still present, then undock and
+ * hotremove all the devices that may need removing.
+ */
+static int handle_eject_request(struct dock_station *ds, u32 event)
+{
+        if (!dock_present(ds))
+                return -ENODEV;
+        if (dock_in_progress(ds))
+                return -EBUSY;
+        /*
+         * here we need to generate the undock
+         * event prior to actually doing the undock
+         * so that the device struct still exists.
+         */
+        dock_event(ds, event, UNDOCK_EVENT);
+        hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
+        undock(ds);
+        eject_dock(ds);
+        if (dock_present(ds)) {
+                printk(KERN_ERR PREFIX "Unable to undock!\n");
+                return -EBUSY;
+        }
+        return 0;
+}
+/**
 * dock_notify - act upon an acpi dock notification
 * @handle: the dock station handle
 * @event: the acpi event
@@ -519,13 +561,11 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
 *
 * If we are notified to dock, then check to see if the dock is
 * present and then dock.  Notify all drivers of the dock event,
- * and then hotplug and devices that may need hotplugging.  For undock
+ * and then hotplug and devices that may need hotplugging.
- * check to make sure the dock device is still present, then undock
- * and hotremove all the devices that may need removing.
 */
 static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct dock_station *ds = (struct dock_station *)data;
+        struct dock_station *ds = data;
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
@@ -553,19 +593,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
         * to the driver who wish to hotplug.
         */
        case ACPI_NOTIFY_EJECT_REQUEST:
-                if (!dock_in_progress(ds) && dock_present(ds)) {
+                handle_eject_request(ds, event);
-                        /*
-                         * here we need to generate the undock
-                         * event prior to actually doing the undock
-                         * so that the device struct still exists.
-                         */
-                        dock_event(ds, event, UNDOCK_EVENT);
-                        hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
-                        undock(ds);
-                        eject_dock(ds);
-                        if (dock_present(ds))
-                                printk(KERN_ERR PREFIX "Unable to undock!\n");
-                }
                break;
        default:
                printk(KERN_ERR PREFIX "Unknown dock event %d\n", event);
@@ -587,23 +615,58 @@ static acpi_status
 find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
        acpi_status status;
-        acpi_handle tmp;
+        acpi_handle tmp, parent;
-        struct dock_station *ds = (struct dock_station *)context;
+        struct dock_station *ds = context;
        struct dock_dependent_device *dd;
        status = acpi_bus_get_ejd(handle, &tmp);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
-                return AE_OK;
+                /* try the parent device as well */
+                status = acpi_get_parent(handle, &parent);
+                if (ACPI_FAILURE(status))
+                        goto fdd_out;
+                /* see if parent is dependent on dock */
+                status = acpi_bus_get_ejd(parent, &tmp);
+                if (ACPI_FAILURE(status))
+                        goto fdd_out;
+        }
        if (tmp == ds->handle) {
                dd = alloc_dock_dependent_device(handle);
                if (dd)
                        add_dock_dependent_device(ds, dd);
        }
+fdd_out:
        return AE_OK;
 }
+/*
+ * show_docked - read method for "docked" file in sysfs
+ */
+static ssize_t show_docked(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
+}
+DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
+/*
+ * write_undock - write method for "undock" file in sysfs
+ */
+static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        int ret;
+        if (!count)
+                return -EINVAL;
+        ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
+        return ret ? ret: count;
+}
+DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
 /**
 * dock_add - add a new dock station
 * @handle: the dock station handle
@@ -626,9 +689,33 @@ static int dock_add(acpi_handle handle)
        INIT_LIST_HEAD(&dock_station->dependent_devices);
        INIT_LIST_HEAD(&dock_station->hotplug_devices);
        spin_lock_init(&dock_station->dd_lock);
-        spin_lock_init(&dock_station->hp_lock);
+        mutex_init(&dock_station->hp_lock);
        ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
+        /* initialize platform device stuff */
+        dock_device.name = dock_device_name;
+        ret = platform_device_register(&dock_device);
+        if (ret) {
+                printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);
+                kfree(dock_station);
+                return ret;
+        }
+        ret = device_create_file(&dock_device.dev, &dev_attr_docked);
+        if (ret) {
+                printk("Error %d adding sysfs file\n", ret);
+                platform_device_unregister(&dock_device);
+                kfree(dock_station);
+                return ret;
+        }
+        ret = device_create_file(&dock_device.dev, &dev_attr_undock);
+        if (ret) {
+                printk("Error %d adding sysfs file\n", ret);
+                device_remove_file(&dock_device.dev, &dev_attr_docked);
+                platform_device_unregister(&dock_device);
+                kfree(dock_station);
+                return ret;
+        }
        /* Find dependent devices */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                            ACPI_UINT32_MAX, find_dock_devices, dock_station,
@@ -638,7 +725,8 @@ static int dock_add(acpi_handle handle)
        dd = alloc_dock_dependent_device(handle);
        if (!dd) {
                kfree(dock_station);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto dock_add_err_unregister;
        }
        add_dock_dependent_device(dock_station, dd);
@@ -658,8 +746,12 @@ static int dock_add(acpi_handle handle)
        return 0;
 dock_add_err:
-        kfree(dock_station);
        kfree(dd);
+dock_add_err_unregister:
+        device_remove_file(&dock_device.dev, &dev_attr_docked);
+        device_remove_file(&dock_device.dev, &dev_attr_undock);
+        platform_device_unregister(&dock_device);
+        kfree(dock_station);
        return ret;
 }
@@ -686,6 +778,11 @@ static int dock_remove(void)
        if (ACPI_FAILURE(status))
                printk(KERN_ERR "Error removing notify handler\n");
+        /* cleanup sysfs */
+        device_remove_file(&dock_device.dev, &dev_attr_docked);
+        device_remove_file(&dock_device.dev, &dev_attr_undock);
+        platform_device_unregister(&dock_device);
        /* free dock station memory */
        kfree(dock_station);
        return 0;
@@ -703,7 +800,7 @@ static int dock_remove(void)
 static acpi_status
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-        int *count = (int *)context;
+        int *count = context;
        acpi_status status = AE_OK;
        if (is_dock(handle)) {
@@ -726,7 +823,7 @@ static int __init dock_init(void)
                            ACPI_UINT32_MAX, find_dock, &num, NULL);
        if (!num)
-                return -ENODEV;
+                printk(KERN_INFO "No dock devices found.\n");
        return 0;
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e6d4b084dca2..743ce27fa0bb 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -45,35 +45,34 @@ ACPI_MODULE_NAME("acpi_ec")
 #define ACPI_EC_DRIVER_NAME             "ACPI Embedded Controller Driver"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
 #define ACPI_EC_FILE_INFO               "info"
+#undef PREFIX
+#define PREFIX                          "ACPI: EC: "
 /* EC status register */
 #define ACPI_EC_FLAG_OBF        0x01    /* Output buffer full */
 #define ACPI_EC_FLAG_IBF        0x02    /* Input buffer full */
 #define ACPI_EC_FLAG_BURST      0x10    /* burst mode */
 #define ACPI_EC_FLAG_SCI        0x20    /* EC-SCI occurred */
 /* EC commands */
-#define ACPI_EC_COMMAND_READ    0x80
+enum ec_command {
-#define ACPI_EC_COMMAND_WRITE   0x81
+        ACPI_EC_COMMAND_READ = 0x80,
-#define ACPI_EC_BURST_ENABLE    0x82
+        ACPI_EC_COMMAND_WRITE = 0x81,
-#define ACPI_EC_BURST_DISABLE   0x83
+        ACPI_EC_BURST_ENABLE = 0x82,
-#define ACPI_EC_COMMAND_QUERY   0x84
+        ACPI_EC_BURST_DISABLE = 0x83,
+        ACPI_EC_COMMAND_QUERY = 0x84,
+};
 /* EC events */
-enum {
+enum ec_event {
        ACPI_EC_EVENT_OBF_1 = 1,        /* Output buffer full */
-        ACPI_EC_EVENT_IBF_0,            /* Input buffer empty */
+        ACPI_EC_EVENT_IBF_0,    /* Input buffer empty */
 };
-#define ACPI_EC_DELAY           50      /* Wait 50ms max. during EC ops */
+#define ACPI_EC_DELAY           500     /* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK      1000    /* Wait 1ms max. to get global lock */
-#define ACPI_EC_UDELAY         100      /* Poll @ 100us increments */
-#define ACPI_EC_UDELAY_COUNT   1000     /* Wait 10ms max. during EC ops */
-enum {
+static enum ec_mode {
-        EC_INTR = 1,    /* Output buffer full */
+        EC_INTR = 1,            /* Output buffer full */
-        EC_POLL,        /* Input buffer empty */
+        EC_POLL,                /* Input buffer empty */
-};
+} acpi_ec_mode = EC_INTR;
 static int acpi_ec_remove(struct acpi_device *device, int type);
 static int acpi_ec_start(struct acpi_device *device);
@@ -93,22 +92,21 @@ static struct acpi_driver acpi_ec_driver = {
 };
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
-struct acpi_ec {
+static struct acpi_ec {
        acpi_handle handle;
        unsigned long uid;
-        unsigned long gpe_bit;
+        unsigned long gpe;
        unsigned long command_addr;
        unsigned long data_addr;
        unsigned long global_lock;
-        struct semaphore sem;
+        struct mutex lock;
-        unsigned int expect_event;
+        atomic_t query_pending;
        atomic_t leaving_burst; /* 0 : No, 1 : Yes, 2: abort */
        wait_queue_head_t wait;
 } *ec_ecdt;
 /* External interfaces use first EC only, so remember */
 static struct acpi_device *first_ec;
-static int acpi_ec_mode = EC_INTR;
 /* --------------------------------------------------------------------------
                             Transaction Management
@@ -134,54 +132,41 @@ static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
        outb(data, ec->data_addr);
 }
-static int acpi_ec_check_status(u8 status, u8 event)
+static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
 {
-        switch (event) {
+        u8 status = acpi_ec_read_status(ec);
-        case ACPI_EC_EVENT_OBF_1:
+        if (event == ACPI_EC_EVENT_OBF_1) {
                if (status & ACPI_EC_FLAG_OBF)
                        return 1;
-                break;
+        } else if (event == ACPI_EC_EVENT_IBF_0) {
-        case ACPI_EC_EVENT_IBF_0:
                if (!(status & ACPI_EC_FLAG_IBF))
                        return 1;
-                break;
-        default:
-                break;
        }
        return 0;
 }
-static int acpi_ec_wait(struct acpi_ec *ec, u8 event)
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event)
 {
-        int i = (acpi_ec_mode == EC_POLL) ? ACPI_EC_UDELAY_COUNT : 0;
+        if (acpi_ec_mode == EC_POLL) {
-        long time_left;
+                unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
+                while (time_before(jiffies, delay)) {
-        ec->expect_event = event;
+                        if (acpi_ec_check_status(ec, event))
-        if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
-                ec->expect_event = 0;
-                return 0;
-        }
-        do {
-                if (acpi_ec_mode == EC_POLL) {
-                        udelay(ACPI_EC_UDELAY);
-                } else {
-                        time_left = wait_event_timeout(ec->wait,
-                                    !ec->expect_event,
-                                    msecs_to_jiffies(ACPI_EC_DELAY));
-                        if (time_left > 0) {
-                                ec->expect_event = 0;
                                return 0;
-                        }
                }
-                if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
+        } else {
-                        ec->expect_event = 0;
+                if (wait_event_timeout(ec->wait,
+                                       acpi_ec_check_status(ec, event),
+                                       msecs_to_jiffies(ACPI_EC_DELAY)) ||
+                    acpi_ec_check_status(ec, event)) {
                        return 0;
+                } else {
+                        printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"
+                               " status = %d, expect_event = %d\n",
+                               acpi_ec_read_status(ec), event);
                }
-        } while (--i > 0);
+        }
-        ec->expect_event = 0;
        return -ETIME;
 }
@@ -196,7 +181,6 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
        u8 tmp = 0;
        u8 status = 0;
        status = acpi_ec_read_status(ec);
        if (status != -EINVAL && !(status & ACPI_EC_FLAG_BURST)) {
                status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
@@ -212,7 +196,7 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
        atomic_set(&ec->leaving_burst, 0);
        return 0;
-  end:
+      end:
        ACPI_EXCEPTION((AE_INFO, status, "EC wait, burst mode"));
        return -1;
 }
@@ -221,58 +205,68 @@ int acpi_ec_leave_burst_mode(struct acpi_ec *ec)
 {
        u8 status = 0;
        status = acpi_ec_read_status(ec);
-        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)){
+        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)) {
                status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if(status)
+                if (status)
                        goto end;
                acpi_ec_write_cmd(ec, ACPI_EC_BURST_DISABLE);
                acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
        }
        atomic_set(&ec->leaving_burst, 1);
        return 0;
-  end:
+      end:
        ACPI_EXCEPTION((AE_INFO, status, "EC leave burst mode"));
        return -1;
 }
-#endif /* ACPI_FUTURE_USAGE */
+#endif                          /* ACPI_FUTURE_USAGE */
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
-                                        const u8 *wdata, unsigned wdata_len,
+                                        const u8 * wdata, unsigned wdata_len,
-                                        u8 *rdata, unsigned rdata_len)
+                                        u8 * rdata, unsigned rdata_len)
 {
-        int result;
+        int result = 0;
        acpi_ec_write_cmd(ec, command);
-        for (; wdata_len > 0; wdata_len --) {
+        for (; wdata_len > 0; --wdata_len) {
                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if (result)
+                if (result) {
-                        return result;
+                        printk(KERN_ERR PREFIX
+                               "write_cmd timeout, command = %d\n", command);
+                        goto end;
+                }
                acpi_ec_write_data(ec, *(wdata++));
        }
-        if (command == ACPI_EC_COMMAND_WRITE) {
+        if (!rdata_len) {
                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if (result)
+                if (result) {
-                        return result;
+                        printk(KERN_ERR PREFIX
+                               "finish-write timeout, command = %d\n", command);
+                        goto end;
+                }
+        } else if (command == ACPI_EC_COMMAND_QUERY) {
+                atomic_set(&ec->query_pending, 0);
        }
-        for (; rdata_len > 0; rdata_len --) {
+        for (; rdata_len > 0; --rdata_len) {
                result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1);
-                if (result)
+                if (result) {
-                        return result;
+                        printk(KERN_ERR PREFIX "read timeout, command = %d\n",
+                               command);
+                        goto end;
+                }
                *(rdata++) = acpi_ec_read_data(ec);
        }
+      end:
-        return 0;
+        return result;
 }
 static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
-                                const u8 *wdata, unsigned wdata_len,
+                               const u8 * wdata, unsigned wdata_len,
-                                u8 *rdata, unsigned rdata_len)
+                               u8 * rdata, unsigned rdata_len)
 {
        int status;
        u32 glk;
@@ -280,36 +274,40 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
        if (!ec || (wdata_len && !wdata) || (rdata_len && !rdata))
                return -EINVAL;
-        if (rdata)
+        if (rdata)
-                memset(rdata, 0, rdata_len);
+                memset(rdata, 0, rdata_len);
+        mutex_lock(&ec->lock);
        if (ec->global_lock) {
                status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
                if (ACPI_FAILURE(status))
                        return -ENODEV;
        }
-        down(&ec->sem);
+        /* Make sure GPE is enabled before doing transaction */
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
        status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
        if (status) {
-                printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX
+                       "input buffer is not empty, aborting transaction\n");
                goto end;
        }
-        status = acpi_ec_transaction_unlocked(ec, command,
+        status = acpi_ec_transaction_unlocked(ec, command,
-                                              wdata, wdata_len,
+                                              wdata, wdata_len,
-                                              rdata, rdata_len);
+                                              rdata, rdata_len);
-end:
+      end:
-        up(&ec->sem);
        if (ec->global_lock)
                acpi_release_global_lock(glk);
+        mutex_unlock(&ec->lock);
        return status;
 }
-static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
+static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
 {
        int result;
        u8 d;
@@ -322,15 +320,15 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
 static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
 {
-        u8 wdata[2] = { address, data };
+        u8 wdata[2] = { address, data };
-        return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
+        return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
                                   wdata, 2, NULL, 0);
 }
 /*
 * Externally callable EC access functions. For now, assume 1 EC only
 */
-int ec_read(u8 addr, u8 *val)
+int ec_read(u8 addr, u8 * val)
 {
        struct acpi_ec *ec;
        int err;
@@ -369,9 +367,9 @@ int ec_write(u8 addr, u8 val)
 EXPORT_SYMBOL(ec_write);
-extern int ec_transaction(u8 command,
+int ec_transaction(u8 command,
-                          const u8 *wdata, unsigned wdata_len,
+                          const u8 * wdata, unsigned wdata_len,
-                          u8 *rdata, unsigned rdata_len)
+                          u8 * rdata, unsigned rdata_len)
 {
        struct acpi_ec *ec;
@@ -386,65 +384,49 @@ extern int ec_transaction(u8 command,
 EXPORT_SYMBOL(ec_transaction);
-static int acpi_ec_query(struct acpi_ec *ec, u8 *data)
+static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
 {
        int result;
-        u8 d;
+        u8 d;
-        if (!ec || !data)
+        if (!ec || !data)
-                return -EINVAL;
+                return -EINVAL;
-        /*
+        /*
-         * Query the EC to find out which _Qxx method we need to evaluate.
+         * Query the EC to find out which _Qxx method we need to evaluate.
-         * Note that successful completion of the query causes the ACPI_EC_SCI
+         * Note that successful completion of the query causes the ACPI_EC_SCI
-         * bit to be cleared (and thus clearing the interrupt source).
+         * bit to be cleared (and thus clearing the interrupt source).
-         */
+         */
-        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
+        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
-        if (result)
+        if (result)
-                return result;
+                return result;
-        if (!d)
+        if (!d)
-                return -ENODATA;
+                return -ENODATA;
-        *data = d;
+        *data = d;
-        return 0;
+        return 0;
 }
 /* --------------------------------------------------------------------------
                                Event Management
   -------------------------------------------------------------------------- */
-struct acpi_ec_query_data {
-        acpi_handle handle;
-        u8 data;
-};
 static void acpi_ec_gpe_query(void *ec_cxt)
 {
        struct acpi_ec *ec = (struct acpi_ec *)ec_cxt;
        u8 value = 0;
-        static char object_name[8];
+        char object_name[8];
-        if (!ec)
+        if (!ec || acpi_ec_query(ec, &value))
-                goto end;
+                return;
-        value = acpi_ec_read_status(ec);
-        if (!(value & ACPI_EC_FLAG_SCI))
-                goto end;
-        if (acpi_ec_query(ec, &value))
-                goto end;
        snprintf(object_name, 8, "_Q%2.2X", value);
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
        acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
-      end:
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
 }
 static u32 acpi_ec_gpe_handler(void *data)
@@ -453,22 +435,18 @@ static u32 acpi_ec_gpe_handler(void *data)
        u8 value;
        struct acpi_ec *ec = (struct acpi_ec *)data;
-        acpi_clear_gpe(NULL, ec->gpe_bit, ACPI_ISR);
-        value = acpi_ec_read_status(ec);
        if (acpi_ec_mode == EC_INTR) {
-                if (acpi_ec_check_status(value, ec->expect_event)) {
+                wake_up(&ec->wait);
-                        ec->expect_event = 0;
-                        wake_up(&ec->wait);
-                }
        }
-        if (value & ACPI_EC_FLAG_SCI) {
+        value = acpi_ec_read_status(ec);
-                status = acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query, ec);
+        if ((value & ACPI_EC_FLAG_SCI) && !atomic_read(&ec->query_pending)) {
-                return status == AE_OK ?
+                atomic_set(&ec->query_pending, 1);
-                    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
+                status =
+                    acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query,
+                                    ec);
        }
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
        return status == AE_OK ?
            ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
 }
@@ -504,7 +482,6 @@ acpi_ec_space_handler(u32 function,
        acpi_integer f_v = 0;
        int i = 0;
        if ((address > 0xFF) || !value || !handler_context)
                return AE_BAD_PARAMETER;
@@ -518,7 +495,7 @@ acpi_ec_space_handler(u32 function,
        switch (function) {
        case ACPI_READ:
                temp = 0;
-                result = acpi_ec_read(ec, (u8) address, (u8 *) &temp);
+                result = acpi_ec_read(ec, (u8) address, (u8 *) & temp);
                break;
        case ACPI_WRITE:
                result = acpi_ec_write(ec, (u8) address, (u8) temp);
@@ -571,18 +548,15 @@ static int acpi_ec_read_info(struct seq_file *seq, void *offset)
 {
        struct acpi_ec *ec = (struct acpi_ec *)seq->private;
        if (!ec)
                goto end;
-        seq_printf(seq, "gpe bit:                 0x%02x\n",
+        seq_printf(seq, "gpe:                 0x%02x\n", (u32) ec->gpe);
-                   (u32) ec->gpe_bit);
        seq_printf(seq, "ports:                   0x%02x, 0x%02x\n",
-                   (u32) ec->command_addr,
+                   (u32) ec->command_addr, (u32) ec->data_addr);
-                   (u32) ec->data_addr);
        seq_printf(seq, "use global lock:         %s\n",
                   ec->global_lock ? "yes" : "no");
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
      end:
        return 0;
@@ -605,7 +579,6 @@ static int acpi_ec_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_ec_dir);
@@ -648,18 +621,17 @@ static int acpi_ec_add(struct acpi_device *device)
        acpi_status status = AE_OK;
        struct acpi_ec *ec = NULL;
        if (!device)
                return -EINVAL;
-        ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
        if (!ec)
                return -ENOMEM;
-        memset(ec, 0, sizeof(struct acpi_ec));
        ec->handle = device->handle;
        ec->uid = -1;
-        init_MUTEX(&ec->sem);
+        mutex_init(&ec->lock);
+        atomic_set(&ec->query_pending, 0);
        if (acpi_ec_mode == EC_INTR) {
                atomic_set(&ec->leaving_burst, 1);
                init_waitqueue_head(&ec->wait);
@@ -669,8 +641,7 @@ static int acpi_ec_add(struct acpi_device *device)
        acpi_driver_data(device) = ec;
        /* Use the global lock for all EC transactions? */
-        acpi_evaluate_integer(ec->handle, "_GLK", NULL,
+        acpi_evaluate_integer(ec->handle, "_GLK", NULL, &ec->global_lock);
-                              &ec->global_lock);
        /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
           http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
@@ -679,7 +650,7 @@ static int acpi_ec_add(struct acpi_device *device)
                                                  ACPI_ADR_SPACE_EC,
                                                  &acpi_ec_space_handler);
-                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit,
+                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe,
                                        &acpi_ec_gpe_handler);
                kfree(ec_ecdt);
@@ -687,11 +658,10 @@ static int acpi_ec_add(struct acpi_device *device)
        /* Get GPE bit assignment (EC events). */
        /* TODO: Add support for _GPE returning a package */
-        status =
+        status = acpi_evaluate_integer(ec->handle, "_GPE", NULL, &ec->gpe);
-            acpi_evaluate_integer(ec->handle, "_GPE", NULL,
-                                  &ec->gpe_bit);
        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Obtaining GPE bit assignment"));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Obtaining GPE bit assignment"));
                result = -ENODEV;
                goto end;
        }
@@ -701,13 +671,13 @@ static int acpi_ec_add(struct acpi_device *device)
                goto end;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s [%s] (gpe %d) interrupt mode.",
-               acpi_device_name(device), acpi_device_bid(device),
+                          acpi_device_name(device), acpi_device_bid(device),
-               (u32) ec->gpe_bit));
+                          (u32) ec->gpe));
        if (!first_ec)
                first_ec = device;
-  end:
+      end:
        if (result)
                kfree(ec);
@@ -718,7 +688,6 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
 {
        struct acpi_ec *ec = NULL;
        if (!device)
                return -EINVAL;
@@ -761,7 +730,6 @@ static int acpi_ec_start(struct acpi_device *device)
        acpi_status status = AE_OK;
        struct acpi_ec *ec = NULL;
        if (!device)
                return -EINVAL;
@@ -782,27 +750,26 @@ static int acpi_ec_start(struct acpi_device *device)
        }
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "gpe=0x%02lx, ports=0x%2lx,0x%2lx",
-                          ec->gpe_bit, ec->command_addr, ec->data_addr));
+                          ec->gpe, ec->command_addr, ec->data_addr));
        /*
         * Install GPE handler
         */
-        status = acpi_install_gpe_handler(NULL, ec->gpe_bit,
+        status = acpi_install_gpe_handler(NULL, ec->gpe,
                                          ACPI_GPE_EDGE_TRIGGERED,
                                          &acpi_ec_gpe_handler, ec);
        if (ACPI_FAILURE(status)) {
                return -ENODEV;
        }
-        acpi_set_gpe_type(NULL, ec->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+        acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
        status = acpi_install_address_space_handler(ec->handle,
                                                    ACPI_ADR_SPACE_EC,
                                                    &acpi_ec_space_handler,
                                                    &acpi_ec_space_setup, ec);
        if (ACPI_FAILURE(status)) {
-                acpi_remove_gpe_handler(NULL, ec->gpe_bit,
+                acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-                                        &acpi_ec_gpe_handler);
                return -ENODEV;
        }
@@ -814,7 +781,6 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        acpi_status status = AE_OK;
        struct acpi_ec *ec = NULL;
        if (!device)
                return -EINVAL;
@@ -826,9 +792,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        if (ACPI_FAILURE(status))
                return -ENODEV;
-        status =
+        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-            acpi_remove_gpe_handler(NULL, ec->gpe_bit,
-                                    &acpi_ec_gpe_handler);
        if (ACPI_FAILURE(status))
                return -ENODEV;
@@ -841,7 +805,7 @@ acpi_fake_ecdt_callback(acpi_handle handle,
 {
        acpi_status status;
-        init_MUTEX(&ec_ecdt->sem);
+        mutex_init(&ec_ecdt->lock);
        if (acpi_ec_mode == EC_INTR) {
                init_waitqueue_head(&ec_ecdt->wait);
        }
@@ -853,16 +817,15 @@ acpi_fake_ecdt_callback(acpi_handle handle,
        ec_ecdt->uid = -1;
        acpi_evaluate_integer(handle, "_UID", NULL, &ec_ecdt->uid);
-        status =
+        status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec_ecdt->gpe);
-            acpi_evaluate_integer(handle, "_GPE", NULL,
-                                  &ec_ecdt->gpe_bit);
        if (ACPI_FAILURE(status))
                return status;
        ec_ecdt->global_lock = TRUE;
        ec_ecdt->handle = handle;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "GPE=0x%02lx, ports=0x%2lx, 0x%2lx",
-               ec_ecdt->gpe_bit, ec_ecdt->command_addr, ec_ecdt->data_addr));
+                          ec_ecdt->gpe, ec_ecdt->command_addr,
+                          ec_ecdt->data_addr));
        return AE_CTRL_TERMINATE;
 }
@@ -884,12 +847,11 @@ static int __init acpi_ec_fake_ecdt(void)
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Try to make an fake ECDT"));
-        ec_ecdt = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec_ecdt = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
        if (!ec_ecdt) {
                ret = -ENOMEM;
                goto error;
        }
-        memset(ec_ecdt, 0, sizeof(struct acpi_ec));
        status = acpi_get_devices(ACPI_EC_HID,
                                  acpi_fake_ecdt_callback, NULL, NULL);
@@ -901,7 +863,7 @@ static int __init acpi_ec_fake_ecdt(void)
                goto error;
        }
        return 0;
-  error:
+      error:
        return ret;
 }
@@ -910,9 +872,8 @@ static int __init acpi_ec_get_real_ecdt(void)
        acpi_status status;
        struct acpi_table_ecdt *ecdt_ptr;
-        status = acpi_get_firmware_table("ECDT", 1, ACPI_LOGICAL_ADDRESSING,
+        status = acpi_get_table(ACPI_SIG_ECDT, 1,
-                                         (struct acpi_table_header **)
+                                (struct acpi_table_header **)&ecdt_ptr);
-                                         &ecdt_ptr);
        if (ACPI_FAILURE(status))
                return -ENODEV;
@@ -921,30 +882,28 @@ static int __init acpi_ec_get_real_ecdt(void)
        /*
         * Generate a temporary ec context to use until the namespace is scanned
         */
-        ec_ecdt = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec_ecdt = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
        if (!ec_ecdt)
                return -ENOMEM;
-        memset(ec_ecdt, 0, sizeof(struct acpi_ec));
-        init_MUTEX(&ec_ecdt->sem);
+        mutex_init(&ec_ecdt->lock);
        if (acpi_ec_mode == EC_INTR) {
                init_waitqueue_head(&ec_ecdt->wait);
        }
-        ec_ecdt->command_addr = ecdt_ptr->ec_control.address;
+        ec_ecdt->command_addr = ecdt_ptr->control.address;
-        ec_ecdt->data_addr = ecdt_ptr->ec_data.address;
+        ec_ecdt->data_addr = ecdt_ptr->data.address;
-        ec_ecdt->gpe_bit = ecdt_ptr->gpe_bit;
+        ec_ecdt->gpe = ecdt_ptr->gpe;
        /* use the GL just to be safe */
        ec_ecdt->global_lock = TRUE;
        ec_ecdt->uid = ecdt_ptr->uid;
-        status =
+        status = acpi_get_handle(NULL, ecdt_ptr->id, &ec_ecdt->handle);
-            acpi_get_handle(NULL, ecdt_ptr->ec_id, &ec_ecdt->handle);
        if (ACPI_FAILURE(status)) {
                goto error;
        }
        return 0;
-  error:
+      error:
        ACPI_EXCEPTION((AE_INFO, status, "Could not use ECDT"));
        kfree(ec_ecdt);
        ec_ecdt = NULL;
@@ -970,14 +929,14 @@ int __init acpi_ec_ecdt_probe(void)
        /*
         * Install GPE handler
         */
-        status = acpi_install_gpe_handler(NULL, ec_ecdt->gpe_bit,
+        status = acpi_install_gpe_handler(NULL, ec_ecdt->gpe,
                                          ACPI_GPE_EDGE_TRIGGERED,
                                          &acpi_ec_gpe_handler, ec_ecdt);
        if (ACPI_FAILURE(status)) {
                goto error;
        }
-        acpi_set_gpe_type(NULL, ec_ecdt->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+        acpi_set_gpe_type(NULL, ec_ecdt->gpe, ACPI_GPE_TYPE_RUNTIME);
-        acpi_enable_gpe(NULL, ec_ecdt->gpe_bit, ACPI_NOT_ISR);
+        acpi_enable_gpe(NULL, ec_ecdt->gpe, ACPI_NOT_ISR);
        status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
                                                    ACPI_ADR_SPACE_EC,
@@ -985,7 +944,7 @@ int __init acpi_ec_ecdt_probe(void)
                                                    &acpi_ec_space_setup,
                                                    ec_ecdt);
        if (ACPI_FAILURE(status)) {
-                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit,
+                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe,
                                        &acpi_ec_gpe_handler);
                goto error;
        }
@@ -1004,7 +963,6 @@ static int __init acpi_ec_init(void)
 {
        int result = 0;
        if (acpi_disabled)
                return 0;
@@ -1057,7 +1015,8 @@ static int __init acpi_ec_set_intr_mode(char *str)
                acpi_ec_mode = EC_POLL;
        }
        acpi_ec_driver.ops.add = acpi_ec_add;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "EC %s mode.\n", intr ? "interrupt" : "polling"));
+        printk(KERN_NOTICE PREFIX "%s mode.\n",
+                          intr ? "interrupt" : "polling");
        return 1;
 }
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 919037d6acff..a1f87b5def2a 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -70,13 +70,6 @@ acpi_status acpi_ev_initialize_events(void)
        ACPI_FUNCTION_TRACE(ev_initialize_events);
-        /* Make sure we have ACPI tables */
-        if (!acpi_gbl_DSDT) {
-                ACPI_WARNING((AE_INFO, "No ACPI tables present!"));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
        /*
         * Initialize the Fixed and General Purpose Events. This is done prior to
         * enabling SCIs to prevent interrupts from occurring before the handlers are
@@ -211,8 +204,7 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
                if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) {
                        status =
                            acpi_set_register(acpi_gbl_fixed_event_info[i].
-                                              enable_register_id, 0,
+                                              enable_register_id, 0);
-                                              ACPI_MTX_LOCK);
                        if (ACPI_FAILURE(status)) {
                                return (status);
                        }
@@ -298,7 +290,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
        /* Clear the status bit */
        (void)acpi_set_register(acpi_gbl_fixed_event_info[event].
-                                status_register_id, 1, ACPI_MTX_DO_NOT_LOCK);
+                                status_register_id, 1);
        /*
         * Make sure we've got a handler.  If not, report an error.
@@ -306,8 +298,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
         */
        if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
                (void)acpi_set_register(acpi_gbl_fixed_event_info[event].
-                                        enable_register_id, 0,
+                                        enable_register_id, 0);
-                                        ACPI_MTX_DO_NOT_LOCK);
                ACPI_ERROR((AE_INFO,
                            "No installed handler for fixed event [%08X]",
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index c76c0583ca6a..dfac3ecc596e 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -121,7 +121,9 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
        if (!gpe_register_info) {
                return_ACPI_STATUS(AE_NOT_EXIST);
        }
-        register_bit = gpe_event_info->register_bit;
+        register_bit = (u8)
+            (1 <<
+             (gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
        /* 1) Disable case.  Simply clear all enable bits */
@@ -458,8 +460,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                                /* Examine one GPE bit */
-                                if (enabled_status_byte &
+                                if (enabled_status_byte & (1 << j)) {
-                                    acpi_gbl_decode_to8bit[j]) {
                                        /*
                                         * Found an active GPE. Dispatch the event to a handler
                                         * or method.
@@ -570,7 +571,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                if (ACPI_FAILURE(status)) {
                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "While evaluating GPE method [%4.4s]",
+                                        "while evaluating GPE method [%4.4s]",
                                        acpi_ut_get_node_name
                                        (local_gpe_event_info.dispatch.
                                         method_node)));
@@ -618,6 +619,8 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
        ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
+        acpi_gpe_count++;
        /*
         * If edge-triggered, clear the GPE status bit now.  Note that
         * level-triggered events are cleared after the GPE is serviced.
@@ -633,20 +636,23 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                }
        }
-        /* Save current system state */
+        if (!acpi_gbl_system_awake_and_running) {
+                /*
-        if (acpi_gbl_system_awake_and_running) {
+                 * We just woke up because of a wake GPE. Disable any further GPEs
-                ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_SYSTEM_RUNNING);
+                 * until we are fully up and running (Only wake GPEs should be enabled
-        } else {
+                 * at this time, but we just brute-force disable them all.)
-                ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_SYSTEM_RUNNING);
+                 * 1) We must disable this particular wake GPE so it won't fire again
+                 * 2) We want to disable all wake GPEs, since we are now awake
+                 */
+                (void)acpi_hw_disable_all_gpes();
        }
        /*
-         * Dispatch the GPE to either an installed handler, or the control
+         * Dispatch the GPE to either an installed handler, or the control method
-         * method associated with this GPE (_Lxx or _Exx).
+         * associated with this GPE (_Lxx or _Exx). If a handler exists, we invoke
-         * If a handler exists, we invoke it and do not attempt to run the method.
+         * it and do not attempt to run the method. If there is neither a handler
-         * If there is neither a handler nor a method, we disable the level to
+         * nor a method, we disable this GPE to prevent further such pointless
-         * prevent further events from coming in here.
+         * events from firing.
         */
        switch (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
        case ACPI_GPE_DISPATCH_HANDLER:
@@ -677,8 +683,8 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
        case ACPI_GPE_DISPATCH_METHOD:
                /*
-                 * Disable GPE, so it doesn't keep firing before the method has a
+                 * Disable the GPE, so it doesn't keep firing before the method has a
-                 * chance to run.
+                 * chance to run (it runs asynchronously with interrupts enabled).
                 */
                status = acpi_ev_disable_gpe(gpe_event_info);
                if (ACPI_FAILURE(status)) {
@@ -711,7 +717,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                            gpe_number));
                /*
-                 * Disable the GPE.  The GPE will remain disabled until the ACPI
+                 * Disable the GPE. The GPE will remain disabled until the ACPI
                 * Core Subsystem is restarted, or a handler is installed.
                 */
                status = acpi_ev_disable_gpe(gpe_event_info);
@@ -726,50 +732,3 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
        return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
-#ifdef ACPI_GPE_NOTIFY_CHECK
-/*******************************************************************************
- * TBD: NOT USED, PROTOTYPE ONLY AND WILL PROBABLY BE REMOVED
- *
- * FUNCTION:    acpi_ev_check_for_wake_only_gpe
- *
- * PARAMETERS:  gpe_event_info  - info for this GPE
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Determine if a a GPE is "wake-only".
- *
- *              Called from Notify() code in interpreter when a "DeviceWake"
- *              Notify comes in.
- *
- ******************************************************************************/
-acpi_status
-acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)
-{
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(ev_check_for_wake_only_gpe);
-        if ((gpe_event_info) && /* Only >0 for _Lxx/_Exx */
-            ((gpe_event_info->flags & ACPI_GPE_SYSTEM_MASK) == ACPI_GPE_SYSTEM_RUNNING)) {      /* System state at GPE time */
-                /* This must be a wake-only GPE, disable it */
-                status = acpi_ev_disable_gpe(gpe_event_info);
-                /* Set GPE to wake-only.  Do not change wake disabled/enabled status */
-                acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
-                ACPI_INFO((AE_INFO,
-                           "GPE %p was updated from wake/run to wake-only",
-                           gpe_event_info));
-                /* This was a wake-only GPE */
-                return_ACPI_STATUS(AE_WAKE_ONLY_GPE);
-        }
-        return_ACPI_STATUS(AE_OK);
-}
-#endif
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 95ddeb48bc0f..ad5bc76edf46 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -529,7 +529,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
        /* Install new interrupt handler if not SCI_INT */
-        if (interrupt_number != acpi_gbl_FADT->sci_int) {
+        if (interrupt_number != acpi_gbl_FADT.sci_interrupt) {
                status = acpi_os_install_interrupt_handler(interrupt_number,
                                                           acpi_ev_gpe_xrupt_handler,
                                                           gpe_xrupt);
@@ -567,7 +567,7 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
        /* We never want to remove the SCI interrupt handler */
-        if (gpe_xrupt->interrupt_number == acpi_gbl_FADT->sci_int) {
+        if (gpe_xrupt->interrupt_number == acpi_gbl_FADT.sci_interrupt) {
                gpe_xrupt->gpe_block_list_head = NULL;
                return_ACPI_STATUS(AE_OK);
        }
@@ -796,30 +796,31 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                    (u8) (gpe_block->block_base_number +
                          (i * ACPI_GPE_REGISTER_WIDTH));
-                ACPI_STORE_ADDRESS(this_register->status_address.address,
+                this_register->status_address.address =
-                                   (gpe_block->block_address.address + i));
+                    gpe_block->block_address.address + i;
-                ACPI_STORE_ADDRESS(this_register->enable_address.address,
+                this_register->enable_address.address =
-                                   (gpe_block->block_address.address
+                    gpe_block->block_address.address + i +
-                                    + i + gpe_block->register_count));
+                    gpe_block->register_count;
-                this_register->status_address.address_space_id =
+                this_register->status_address.space_id =
-                    gpe_block->block_address.address_space_id;
+                    gpe_block->block_address.space_id;
-                this_register->enable_address.address_space_id =
+                this_register->enable_address.space_id =
-                    gpe_block->block_address.address_space_id;
+                    gpe_block->block_address.space_id;
-                this_register->status_address.register_bit_width =
+                this_register->status_address.bit_width =
                    ACPI_GPE_REGISTER_WIDTH;
-                this_register->enable_address.register_bit_width =
+                this_register->enable_address.bit_width =
                    ACPI_GPE_REGISTER_WIDTH;
-                this_register->status_address.register_bit_offset =
+                this_register->status_address.bit_offset =
                    ACPI_GPE_REGISTER_WIDTH;
-                this_register->enable_address.register_bit_offset =
+                this_register->enable_address.bit_offset =
                    ACPI_GPE_REGISTER_WIDTH;
                /* Init the event_info for each GPE within this register */
                for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
-                        this_event->register_bit = acpi_gbl_decode_to8bit[j];
+                        this_event->gpe_number =
+                            (u8) (this_register->base_gpe_number + j);
                        this_event->register_info = this_register;
                        this_event++;
                }
@@ -1109,11 +1110,12 @@ acpi_status acpi_ev_gpe_initialize(void)
         * If EITHER the register length OR the block address are zero, then that
         * particular block is not supported.
         */
-        if (acpi_gbl_FADT->gpe0_blk_len && acpi_gbl_FADT->xgpe0_blk.address) {
+        if (acpi_gbl_FADT.gpe0_block_length &&
+            acpi_gbl_FADT.xgpe0_block.address) {
                /* GPE block 0 exists (has both length and address > 0) */
-                register_count0 = (u16) (acpi_gbl_FADT->gpe0_blk_len / 2);
+                register_count0 = (u16) (acpi_gbl_FADT.gpe0_block_length / 2);
                gpe_number_max =
                    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
@@ -1121,9 +1123,9 @@ acpi_status acpi_ev_gpe_initialize(void)
                /* Install GPE Block 0 */
                status = acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                  &acpi_gbl_FADT->xgpe0_blk,
+                                                  &acpi_gbl_FADT.xgpe0_block,
                                                  register_count0, 0,
-                                                  acpi_gbl_FADT->sci_int,
+                                                  acpi_gbl_FADT.sci_interrupt,
                                                  &acpi_gbl_gpe_fadt_blocks[0]);
                if (ACPI_FAILURE(status)) {
@@ -1132,20 +1134,21 @@ acpi_status acpi_ev_gpe_initialize(void)
                }
        }
-        if (acpi_gbl_FADT->gpe1_blk_len && acpi_gbl_FADT->xgpe1_blk.address) {
+        if (acpi_gbl_FADT.gpe1_block_length &&
+            acpi_gbl_FADT.xgpe1_block.address) {
                /* GPE block 1 exists (has both length and address > 0) */
-                register_count1 = (u16) (acpi_gbl_FADT->gpe1_blk_len / 2);
+                register_count1 = (u16) (acpi_gbl_FADT.gpe1_block_length / 2);
                /* Check for GPE0/GPE1 overlap (if both banks exist) */
                if ((register_count0) &&
-                    (gpe_number_max >= acpi_gbl_FADT->gpe1_base)) {
+                    (gpe_number_max >= acpi_gbl_FADT.gpe1_base)) {
                        ACPI_ERROR((AE_INFO,
                                    "GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1",
-                                    gpe_number_max, acpi_gbl_FADT->gpe1_base,
+                                    gpe_number_max, acpi_gbl_FADT.gpe1_base,
-                                    acpi_gbl_FADT->gpe1_base +
+                                    acpi_gbl_FADT.gpe1_base +
                                    ((register_count1 *
                                      ACPI_GPE_REGISTER_WIDTH) - 1)));
@@ -1157,10 +1160,11 @@ acpi_status acpi_ev_gpe_initialize(void)
                        status =
                            acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                     &acpi_gbl_FADT->xgpe1_blk,
+                                                     &acpi_gbl_FADT.xgpe1_block,
                                                     register_count1,
-                                                     acpi_gbl_FADT->gpe1_base,
+                                                     acpi_gbl_FADT.gpe1_base,
-                                                     acpi_gbl_FADT->sci_int,
+                                                     acpi_gbl_FADT.
+                                                     sci_interrupt,
                                                     &acpi_gbl_gpe_fadt_blocks
                                                     [1]);
@@ -1173,7 +1177,7 @@ acpi_status acpi_ev_gpe_initialize(void)
                         * GPE0 and GPE1 do not have to be contiguous in the GPE number
                         * space. However, GPE0 always starts at GPE number zero.
                         */
-                        gpe_number_max = acpi_gbl_FADT->gpe1_base +
+                        gpe_number_max = acpi_gbl_FADT.gpe1_base +
                            ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1);
                }
        }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index ee2a10bf9077..1b784ffe54c3 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -63,14 +63,18 @@ static const char *acpi_notify_value_names[] = {
 };
 #endif
+/* Pointer to FACS needed for the Global Lock */
+static struct acpi_table_facs *facs = NULL;
 /* Local prototypes */
 static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context);
-static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context);
 static u32 acpi_ev_global_lock_handler(void *context);
+static acpi_status acpi_ev_remove_global_lock_handler(void);
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ev_is_notify_object
@@ -282,68 +286,45 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ev_global_lock_thread
- *
- * PARAMETERS:  Context         - From thread interface, not used
- *
- * RETURN:      None
- *
- * DESCRIPTION: Invoked by SCI interrupt handler upon acquisition of the
- *              Global Lock.  Simply signal all threads that are waiting
- *              for the lock.
- *
- ******************************************************************************/
-static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)
-{
-        acpi_status status;
-        /* Signal threads that are waiting for the lock */
-        if (acpi_gbl_global_lock_thread_count) {
-                /* Send sufficient units to the semaphore */
-                status =
-                    acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore,
-                                             acpi_gbl_global_lock_thread_count);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not signal Global Lock semaphore"));
-                }
-        }
-}
-/*******************************************************************************
- *
 * FUNCTION:    acpi_ev_global_lock_handler
 *
 * PARAMETERS:  Context         - From thread interface, not used
 *
- * RETURN:      ACPI_INTERRUPT_HANDLED or ACPI_INTERRUPT_NOT_HANDLED
+ * RETURN:      ACPI_INTERRUPT_HANDLED
 *
 * DESCRIPTION: Invoked directly from the SCI handler when a global lock
- *              release interrupt occurs.  Grab the global lock and queue
+ *              release interrupt occurs. Attempt to acquire the global lock,
- *              the global lock thread for execution
+ *              if successful, signal the thread waiting for the lock.
+ *
+ * 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 u32 acpi_ev_global_lock_handler(void *context)
 {
        u8 acquired = FALSE;
-        acpi_status status;
        /*
-         * Attempt to get the lock
+         * 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_common_fACS.global_lock, acquired);
+        ACPI_ACQUIRE_GLOBAL_LOCK(facs, acquired);
        if (acquired) {
                /* Got the lock, now wake all threads waiting for it */
                acpi_gbl_global_lock_acquired = TRUE;
-                acpi_ev_global_lock_thread(context);
+                /* 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"));
+                }
        }
        return (ACPI_INTERRUPT_HANDLED);
@@ -367,6 +348,13 @@ acpi_status acpi_ev_init_global_lock_handler(void)
        ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
+        status =
+            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                    (struct acpi_table_header **)&facs);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        acpi_gbl_global_lock_present = TRUE;
        status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
                                                  acpi_ev_global_lock_handler,
@@ -390,6 +378,31 @@ acpi_status acpi_ev_init_global_lock_handler(void)
        return_ACPI_STATUS(status);
 }
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_remove_global_lock_handler
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove the handler for the Global Lock
+ *
+ ******************************************************************************/
+static acpi_status acpi_ev_remove_global_lock_handler(void)
+{
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(ev_remove_global_lock_handler);
+        acpi_gbl_global_lock_present = FALSE;
+        status = acpi_remove_fixed_event_handler(ACPI_EVENT_GLOBAL,
+                                                 acpi_ev_global_lock_handler);
+        return_ACPI_STATUS(status);
+}
 /******************************************************************************
 *
 * FUNCTION:    acpi_ev_acquire_global_lock
@@ -400,6 +413,16 @@ acpi_status acpi_ev_init_global_lock_handler(void)
 *
 * DESCRIPTION: Attempt to gain ownership of the Global Lock.
 *
+ * MUTEX:       Interpreter must be locked
+ *
+ * Note: The original implementation allowed multiple threads to "acquire" the
+ * Global Lock, and the OS would hold the lock until the last thread had
+ * released it. However, this could potentially starve the BIOS out of the
+ * lock, especially in the case where there is a tight handshake between the
+ * Embedded Controller driver and the BIOS. Therefore, this implementation
+ * allows only one thread to acquire the HW Global Lock at a time, and makes
+ * the global lock appear as a standard mutex on the OS side.
+ *
 *****************************************************************************/
 acpi_status acpi_ev_acquire_global_lock(u16 timeout)
@@ -409,53 +432,51 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
        ACPI_FUNCTION_TRACE(ev_acquire_global_lock);
-#ifndef ACPI_APPLICATION
+        /*
-        /* Make sure that we actually have a global lock */
+         * Only one thread can acquire the GL at a time, the global_lock_mutex
+         * enforces this. This interface releases the interpreter if we must wait.
-        if (!acpi_gbl_global_lock_present) {
+         */
-                return_ACPI_STATUS(AE_NO_GLOBAL_LOCK);
+        status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
        }
-#endif
-        /* One more thread wants the global lock */
-        acpi_gbl_global_lock_thread_count++;
        /*
-         * If we (OS side vs. BIOS side) have the hardware lock already,
+         * Make sure that a global lock actually exists. If not, just treat
-         * we are done
+         * the lock as a standard mutex.
         */
-        if (acpi_gbl_global_lock_acquired) {
+        if (!acpi_gbl_global_lock_present) {
+                acpi_gbl_global_lock_acquired = TRUE;
                return_ACPI_STATUS(AE_OK);
        }
-        /* We must acquire the actual hardware lock */
+        /* Attempt to acquire the actual hardware lock */
-        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, acquired);
+        ACPI_ACQUIRE_GLOBAL_LOCK(facs, acquired);
        if (acquired) {
                /* We got the lock */
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Acquired the HW Global Lock\n"));
+                                  "Acquired hardware Global Lock\n"));
                acpi_gbl_global_lock_acquired = TRUE;
                return_ACPI_STATUS(AE_OK);
        }
        /*
-         * Did not get the lock.  The pending bit was set above, and we must now
+         * 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 the HW Global Lock\n"));
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Waiting for hardware Global Lock\n"));
        /*
-         * Acquire the global lock semaphore first.
+         * Wait for handshake with the global lock interrupt handler.
-         * Since this wait will block, we must release the interpreter
+         * This interface releases the interpreter if we must wait.
         */
-        status =
+        status = acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,
-            acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,
+                                               ACPI_WAIT_FOREVER);
-                                          timeout);
        return_ACPI_STATUS(status);
 }
@@ -478,38 +499,39 @@ acpi_status acpi_ev_release_global_lock(void)
        ACPI_FUNCTION_TRACE(ev_release_global_lock);
-        if (!acpi_gbl_global_lock_thread_count) {
+        /* Lock must be already acquired */
+        if (!acpi_gbl_global_lock_acquired) {
                ACPI_WARNING((AE_INFO,
-                              "Cannot release HW Global Lock, it has not been acquired"));
+                              "Cannot release the ACPI Global Lock, it has not been acquired"));
                return_ACPI_STATUS(AE_NOT_ACQUIRED);
        }
-        /* One fewer thread has the global lock */
+        if (acpi_gbl_global_lock_present) {
-        acpi_gbl_global_lock_thread_count--;
+                /* Allow any thread to release the lock */
-        if (acpi_gbl_global_lock_thread_count) {
-                /* There are still some threads holding the lock, cannot release */
+                ACPI_RELEASE_GLOBAL_LOCK(facs, pending);
-                return_ACPI_STATUS(AE_OK);
+                /*
+                 * If the pending bit was set, we must write GBL_RLS to the control
+                 * register
+                 */
+                if (pending) {
+                        status =
+                            acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,
+                                              1);
+                }
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "Released hardware Global Lock\n"));
        }
-        /*
-         * No more threads holding lock, we can do the actual hardware
-         * release
-         */
-        ACPI_RELEASE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, pending);
        acpi_gbl_global_lock_acquired = FALSE;
-        /*
+        /* Release the local GL mutex */
-         * If the pending bit was set, we must write GBL_RLS to the control
-         * register
-         */
-        if (pending) {
-                status = acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,
-                                           1, ACPI_MTX_LOCK);
-        }
+        acpi_os_release_mutex(acpi_gbl_global_lock_mutex);
        return_ACPI_STATUS(status);
 }
@@ -559,6 +581,12 @@ void acpi_ev_terminate(void)
                if (ACPI_FAILURE(status)) {
                        ACPI_ERROR((AE_INFO, "Could not remove SCI handler"));
                }
+                status = acpi_ev_remove_global_lock_handler();
+                if (ACPI_FAILURE(status)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not remove Global Lock handler"));
+                }
        }
        /* Deallocate all handler objects installed within GPE info structs */
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 21caae04fe85..e99f0c435a47 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -291,7 +291,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                               u32 bit_width, acpi_integer * value)
 {
        acpi_status status;
-        acpi_status status2;
        acpi_adr_space_handler handler;
        acpi_adr_space_setup region_setup;
        union acpi_operand_object *handler_desc;
@@ -345,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * setup will potentially execute control methods
                 * (e.g., _REG method for this region)
                 */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
                                      handler_desc->address_space.context,
@@ -353,10 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                /* Re-enter the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
                /* Check for failure of the Region Setup */
@@ -409,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * exit the interpreter because the handler *might* block -- we don't
                 * know what it will do, so we can't hold the lock on the intepreter.
                 */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
        }
        /* Call the handler */
@@ -430,10 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * We just returned from a non-default handler, we must re-enter the
                 * interpreter
                 */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index 203d1359190a..a4fa7e6822a3 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,11 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evrgnini")
+/* Local prototypes */
+static u8 acpi_ev_match_pci_root_bridge(char *id);
+static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ev_system_memory_region_setup
@@ -62,6 +67,7 @@ ACPI_MODULE_NAME("evrgnini")
 * DESCRIPTION: Setup a system_memory operation region
 *
 ******************************************************************************/
 acpi_status
 acpi_ev_system_memory_region_setup(acpi_handle handle,
                                   u32 function,
@@ -168,9 +174,9 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
        union acpi_operand_object *handler_obj;
        struct acpi_namespace_node *parent_node;
        struct acpi_namespace_node *pci_root_node;
+        struct acpi_namespace_node *pci_device_node;
        union acpi_operand_object *region_obj =
            (union acpi_operand_object *)handle;
-        struct acpi_device_id object_hID;
        ACPI_FUNCTION_TRACE(ev_pci_config_region_setup);
@@ -215,45 +221,30 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                pci_root_node = parent_node;
                while (pci_root_node != acpi_gbl_root_node) {
-                        status =
-                            acpi_ut_execute_HID(pci_root_node, &object_hID);
-                        if (ACPI_SUCCESS(status)) {
-                                /*
-                                 * Got a valid _HID string, check if this is a PCI root.
-                                 * New for ACPI 3.0: check for a PCI Express root also.
-                                 */
-                                if (!
-                                    (ACPI_STRNCMP
-                                     (object_hID.value, PCI_ROOT_HID_STRING,
-                                      sizeof(PCI_ROOT_HID_STRING)))
-                                    ||
-                                    !(ACPI_STRNCMP
-                                      (object_hID.value,
-                                       PCI_EXPRESS_ROOT_HID_STRING,
-                                       sizeof(PCI_EXPRESS_ROOT_HID_STRING)))) {
-                                        /* Install a handler for this PCI root bridge */
-                                        status =
+                        /* Get the _HID/_CID in order to detect a root_bridge */
-                                            acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
-                                        if (ACPI_FAILURE(status)) {
+                        if (acpi_ev_is_pci_root_bridge(pci_root_node)) {
-                                                if (status == AE_SAME_HANDLER) {
-                                                        /*
+                                /* Install a handler for this PCI root bridge */
-                                                         * It is OK if the handler is already installed on the root
-                                                         * bridge.  Still need to return a context object for the
+                                status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
-                                                         * new PCI_Config operation region, however.
+                                if (ACPI_FAILURE(status)) {
-                                                         */
+                                        if (status == AE_SAME_HANDLER) {
-                                                        status = AE_OK;
+                                                /*
-                                                } else {
+                                                 * It is OK if the handler is already installed on the root
-                                                        ACPI_EXCEPTION((AE_INFO,
+                                                 * bridge.  Still need to return a context object for the
-                                                                        status,
+                                                 * new PCI_Config operation region, however.
-                                                                        "Could not install PciConfig handler for Root Bridge %4.4s",
+                                                 */
-                                                                        acpi_ut_get_node_name
+                                                status = AE_OK;
-                                                                        (pci_root_node)));
+                                        } else {
-                                                }
+                                                ACPI_EXCEPTION((AE_INFO, status,
+                                                                "Could not install PciConfig handler for Root Bridge %4.4s",
+                                                                acpi_ut_get_node_name
+                                                                (pci_root_node)));
                                        }
-                                        break;
                                }
+                                break;
                        }
                        pci_root_node = acpi_ns_get_parent_node(pci_root_node);
@@ -282,14 +273,25 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
        /*
         * For PCI_Config space access, we need the segment, bus,
         * device and function numbers.  Acquire them here.
+         *
+         * Find the parent device object. (This allows the operation region to be
+         * within a subscope under the device, such as a control method.)
         */
+        pci_device_node = region_obj->region.node;
+        while (pci_device_node && (pci_device_node->type != ACPI_TYPE_DEVICE)) {
+                pci_device_node = acpi_ns_get_parent_node(pci_device_node);
+        }
+        if (!pci_device_node) {
+                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+        }
        /*
         * Get the PCI device and function numbers from the _ADR object
         * contained in the parent's scope.
         */
        status =
-            acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, parent_node,
+            acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, pci_device_node,
                                            &pci_value);
        /*
@@ -329,6 +331,91 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_ev_match_pci_root_bridge
+ *
+ * PARAMETERS:  Id              - The HID/CID in string format
+ *
+ * RETURN:      TRUE if the Id is a match for a PCI/PCI-Express Root Bridge
+ *
+ * DESCRIPTION: Determine if the input ID is a PCI Root Bridge ID.
+ *
+ ******************************************************************************/
+static u8 acpi_ev_match_pci_root_bridge(char *id)
+{
+        /*
+         * Check if this is a PCI root.
+         * ACPI 3.0+: check for a PCI Express root also.
+         */
+        if (!(ACPI_STRNCMP(id,
+                           PCI_ROOT_HID_STRING,
+                           sizeof(PCI_ROOT_HID_STRING))) ||
+            !(ACPI_STRNCMP(id,
+                           PCI_EXPRESS_ROOT_HID_STRING,
+                           sizeof(PCI_EXPRESS_ROOT_HID_STRING)))) {
+                return (TRUE);
+        }
+        return (FALSE);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_is_pci_root_bridge
+ *
+ * PARAMETERS:  Node            - Device node being examined
+ *
+ * RETURN:      TRUE if device is a PCI/PCI-Express Root Bridge
+ *
+ * DESCRIPTION: Determine if the input device represents a PCI Root Bridge by
+ *              examining the _HID and _CID for the device.
+ *
+ ******************************************************************************/
+static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
+{
+        acpi_status status;
+        struct acpi_device_id hid;
+        struct acpi_compatible_id_list *cid;
+        acpi_native_uint i;
+        /*
+         * Get the _HID and check for a PCI Root Bridge
+         */
+        status = acpi_ut_execute_HID(node, &hid);
+        if (ACPI_FAILURE(status)) {
+                return (FALSE);
+        }
+        if (acpi_ev_match_pci_root_bridge(hid.value)) {
+                return (TRUE);
+        }
+        /*
+         * The _HID did not match.
+         * Get the _CID and check for a PCI Root Bridge
+         */
+        status = acpi_ut_execute_CID(node, &cid);
+        if (ACPI_FAILURE(status)) {
+                return (FALSE);
+        }
+        /* Check all _CIDs in the returned list */
+        for (i = 0; i < cid->count; i++) {
+                if (acpi_ev_match_pci_root_bridge(cid->id[i].value)) {
+                        ACPI_FREE(cid);
+                        return (TRUE);
+                }
+        }
+        ACPI_FREE(cid);
+        return (FALSE);
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ev_pci_bar_region_setup
 *
 * PARAMETERS:  Handle              - Region we are interested in
@@ -432,6 +519,9 @@ acpi_ev_default_region_setup(acpi_handle handle,
 *              a PCI address in the scope of the definition.  This address is
 *              required to perform an access to PCI config space.
 *
+ * MUTEX:       Interpreter should be unlocked, because we may run the _REG
+ *              method for this region.
+ *
 ******************************************************************************/
 acpi_status
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 8106215ad554..7e5d15ce2395 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -142,9 +142,10 @@ u32 acpi_ev_install_sci_handler(void)
        ACPI_FUNCTION_TRACE(ev_install_sci_handler);
-        status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT->sci_int,
+        status =
-                                                   acpi_ev_sci_xrupt_handler,
+            acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt,
-                                                   acpi_gbl_gpe_xrupt_list_head);
+                                              acpi_ev_sci_xrupt_handler,
+                                              acpi_gbl_gpe_xrupt_list_head);
        return_ACPI_STATUS(status);
 }
@@ -175,8 +176,9 @@ acpi_status acpi_ev_remove_sci_handler(void)
        /* Just let the OS remove the handler and disable the level */
-        status = acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT->sci_int,
+        status =
-                                                  acpi_ev_sci_xrupt_handler);
+            acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt,
+                                             acpi_ev_sci_xrupt_handler);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 923fd2b46955..685a103a3587 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -768,11 +768,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
                return (AE_BAD_PARAMETER);
        }
-        status = acpi_ex_enter_interpreter();
+        /* Must lock interpreter to prevent race conditions */
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
+        acpi_ex_enter_interpreter();
        status = acpi_ev_acquire_global_lock(timeout);
        acpi_ex_exit_interpreter();
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 7ebc2efac936..17065e98807c 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
@@ -65,13 +66,14 @@ acpi_status acpi_enable(void)
        ACPI_FUNCTION_TRACE(acpi_enable);
-        /* Make sure we have the FADT */
+        /* ACPI tables must be present */
-        if (!acpi_gbl_FADT) {
+        if (!acpi_tb_tables_loaded()) {
-                ACPI_WARNING((AE_INFO, "No FADT information present!"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
+        /* Check current mode */
        if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                                  "System is already in ACPI mode\n"));
@@ -111,11 +113,6 @@ acpi_status acpi_disable(void)
        ACPI_FUNCTION_TRACE(acpi_disable);
-        if (!acpi_gbl_FADT) {
-                ACPI_WARNING((AE_INFO, "No FADT information present!"));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
        if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {
                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                                  "System is already in legacy (non-ACPI) mode\n"));
@@ -169,7 +166,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
         */
        status =
            acpi_set_register(acpi_gbl_fixed_event_info[event].
-                              enable_register_id, 1, ACPI_MTX_LOCK);
+                              enable_register_id, 1);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -178,7 +175,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
        status =
            acpi_get_register(acpi_gbl_fixed_event_info[event].
-                              enable_register_id, &value, ACPI_MTX_LOCK);
+                              enable_register_id, &value);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -368,14 +365,14 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
         */
        status =
            acpi_set_register(acpi_gbl_fixed_event_info[event].
-                              enable_register_id, 0, ACPI_MTX_LOCK);
+                              enable_register_id, 0);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
        status =
            acpi_get_register(acpi_gbl_fixed_event_info[event].
-                              enable_register_id, &value, ACPI_MTX_LOCK);
+                              enable_register_id, &value);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -421,7 +418,7 @@ acpi_status acpi_clear_event(u32 event)
         */
        status =
            acpi_set_register(acpi_gbl_fixed_event_info[event].
-                              status_register_id, 1, ACPI_MTX_LOCK);
+                              status_register_id, 1);
        return_ACPI_STATUS(status);
 }
@@ -510,7 +507,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
        status =
            acpi_get_register(acpi_gbl_fixed_event_info[event].
-                              status_register_id, event_status, ACPI_MTX_LOCK);
+                              status_register_id, event_status);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 83b12a9afa32..7bf09c5fb242 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index c8341fa5fe01..25802f302ffe 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("exconfig")
 /* Local prototypes */
 static acpi_status
-acpi_ex_add_table(struct acpi_table_header *table,
+acpi_ex_add_table(acpi_native_uint table_index,
                  struct acpi_namespace_node *parent_node,
                  union acpi_operand_object **ddb_handle);
@@ -74,12 +74,11 @@ acpi_ex_add_table(struct acpi_table_header *table,
 ******************************************************************************/
 static acpi_status
-acpi_ex_add_table(struct acpi_table_header *table,
+acpi_ex_add_table(acpi_native_uint table_index,
                  struct acpi_namespace_node *parent_node,
                  union acpi_operand_object **ddb_handle)
 {
        acpi_status status;
-        struct acpi_table_desc table_info;
        union acpi_operand_object *obj_desc;
        ACPI_FUNCTION_TRACE(ex_add_table);
@@ -98,42 +97,16 @@ acpi_ex_add_table(struct acpi_table_header *table,
        /* Install the new table into the local data structures */
-        ACPI_MEMSET(&table_info, 0, sizeof(struct acpi_table_desc));
+        obj_desc->reference.object = ACPI_CAST_PTR(void, table_index);
-        table_info.type = ACPI_TABLE_ID_SSDT;
-        table_info.pointer = table;
-        table_info.length = (acpi_size) table->length;
-        table_info.allocation = ACPI_MEM_ALLOCATED;
-        status = acpi_tb_install_table(&table_info);
-        obj_desc->reference.object = table_info.installed_desc;
-        if (ACPI_FAILURE(status)) {
-                if (status == AE_ALREADY_EXISTS) {
-                        /* Table already exists, just return the handle */
-                        return_ACPI_STATUS(AE_OK);
-                }
-                goto cleanup;
-        }
        /* Add the table to the namespace */
-        status = acpi_ns_load_table(table_info.installed_desc, parent_node);
+        status = acpi_ns_load_table(table_index, parent_node);
        if (ACPI_FAILURE(status)) {
+                acpi_ut_remove_reference(obj_desc);
-                /* Uninstall table on error */
+                *ddb_handle = NULL;
-                (void)acpi_tb_uninstall_table(table_info.installed_desc);
-                goto cleanup;
        }
-        return_ACPI_STATUS(AE_OK);
-      cleanup:
-        acpi_ut_remove_reference(obj_desc);
-        *ddb_handle = NULL;
        return_ACPI_STATUS(status);
 }
@@ -146,7 +119,7 @@ acpi_ex_add_table(struct acpi_table_header *table,
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Load an ACPI table
+ * DESCRIPTION: Load an ACPI table from the RSDT/XSDT
 *
 ******************************************************************************/
@@ -156,33 +129,20 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 {
        acpi_status status;
        union acpi_operand_object **operand = &walk_state->operands[0];
-        struct acpi_table_header *table;
+        acpi_native_uint table_index;
        struct acpi_namespace_node *parent_node;
        struct acpi_namespace_node *start_node;
        struct acpi_namespace_node *parameter_node = NULL;
        union acpi_operand_object *ddb_handle;
+        struct acpi_table_header *table;
        ACPI_FUNCTION_TRACE(ex_load_table_op);
-#if 0
+        /* Find the ACPI table in the RSDT/XSDT */
-        /*
-         * Make sure that the signature does not match one of the tables that
-         * is already loaded.
-         */
-        status = acpi_tb_match_signature(operand[0]->string.pointer, NULL);
-        if (status == AE_OK) {
-                /* Signature matched -- don't allow override */
-                return_ACPI_STATUS(AE_ALREADY_EXISTS);
-        }
-#endif
-        /* Find the ACPI table */
        status = acpi_tb_find_table(operand[0]->string.pointer,
                                    operand[1]->string.pointer,
-                                    operand[2]->string.pointer, &table);
+                                    operand[2]->string.pointer, &table_index);
        if (ACPI_FAILURE(status)) {
                if (status != AE_NOT_FOUND) {
                        return_ACPI_STATUS(status);
@@ -245,7 +205,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
        /* Load the table into the namespace */
-        status = acpi_ex_add_table(table, parent_node, &ddb_handle);
+        status = acpi_ex_add_table(table_index, parent_node, &ddb_handle);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -266,9 +226,13 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
                }
        }
-        ACPI_INFO((AE_INFO,
+        status = acpi_get_table_by_index(table_index, &table);
-                   "Dynamic OEM Table Load - [%4.4s] OemId [%6.6s] OemTableId [%8.8s]",
+        if (ACPI_SUCCESS(status)) {
-                   table->signature, table->oem_id, table->oem_table_id));
+                ACPI_INFO((AE_INFO,
+                           "Dynamic OEM Table Load - [%4.4s] OemId [%6.6s] OemTableId [%8.8s]",
+                           table->signature, table->oem_id,
+                           table->oem_table_id));
+        }
        *return_desc = ddb_handle;
        return_ACPI_STATUS(status);
@@ -278,7 +242,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 *
 * FUNCTION:    acpi_ex_load_op
 *
- * PARAMETERS:  obj_desc        - Region or Field where the table will be
+ * PARAMETERS:  obj_desc        - Region or Buffer/Field where the table will be
 *                                obtained
 *              Target          - Where a handle to the table will be stored
 *              walk_state      - Current state
@@ -287,6 +251,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 *
 * DESCRIPTION: Load an ACPI table from a field or operation region
 *
+ * NOTE: Region Fields (Field, bank_field, index_fields) are resolved to buffer
+ *       objects before this code is reached.
+ *
+ *       If source is an operation region, it must refer to system_memory, as
+ *       per the ACPI specification.
+ *
 ******************************************************************************/
 acpi_status
@@ -294,22 +264,26 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                union acpi_operand_object *target,
                struct acpi_walk_state *walk_state)
 {
-        acpi_status status;
        union acpi_operand_object *ddb_handle;
-        union acpi_operand_object *buffer_desc = NULL;
+        struct acpi_table_desc table_desc;
-        struct acpi_table_header *table_ptr = NULL;
+        acpi_native_uint table_index;
-        acpi_physical_address address;
+        acpi_status status;
-        struct acpi_table_header table_header;
-        acpi_integer temp;
-        u32 i;
        ACPI_FUNCTION_TRACE(ex_load_op);
-        /* Object can be either an op_region or a Field */
+        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
+        /* Source Object can be either an op_region or a Buffer/Field */
        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
        case ACPI_TYPE_REGION:
+                /* Region must be system_memory (from ACPI spec) */
+                if (obj_desc->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+                }
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Load from Region %p %s\n",
                                  obj_desc,
                                  acpi_ut_get_object_type_name(obj_desc)));
@@ -325,113 +299,41 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                        }
                }
-                /* Get the base physical address of the region */
+                table_desc.address = obj_desc->region.address;
+                table_desc.length = obj_desc->region.length;
-                address = obj_desc->region.address;
+                table_desc.flags = ACPI_TABLE_ORIGIN_MAPPED;
-                /* Get part of the table header to get the table length */
-                table_header.length = 0;
-                for (i = 0; i < 8; i++) {
-                        status =
-                            acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
-                                                           (acpi_physical_address)
-                                                           (i + address), 8,
-                                                           &temp);
-                        if (ACPI_FAILURE(status)) {
-                                return_ACPI_STATUS(status);
-                        }
-                        /* Get the one valid byte of the returned 64-bit value */
-                        ACPI_CAST_PTR(u8, &table_header)[i] = (u8) temp;
-                }
-                /* Sanity check the table length */
-                if (table_header.length < sizeof(struct acpi_table_header)) {
-                        return_ACPI_STATUS(AE_BAD_HEADER);
-                }
-                /* Allocate a buffer for the entire table */
-                table_ptr = ACPI_ALLOCATE(table_header.length);
-                if (!table_ptr) {
-                        return_ACPI_STATUS(AE_NO_MEMORY);
-                }
-                /* Get the entire table from the op region */
-                for (i = 0; i < table_header.length; i++) {
-                        status =
-                            acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
-                                                           (acpi_physical_address)
-                                                           (i + address), 8,
-                                                           &temp);
-                        if (ACPI_FAILURE(status)) {
-                                goto cleanup;
-                        }
-                        /* Get the one valid byte of the returned 64-bit value */
-                        ACPI_CAST_PTR(u8, table_ptr)[i] = (u8) temp;
-                }
                break;
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
+        case ACPI_TYPE_BUFFER:  /* Buffer or resolved region_field */
-        case ACPI_TYPE_LOCAL_BANK_FIELD:
-        case ACPI_TYPE_LOCAL_INDEX_FIELD:
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Load from Field %p %s\n",
+                /* Simply extract the buffer from the buffer object */
-                                  obj_desc,
-                                  acpi_ut_get_object_type_name(obj_desc)));
-                /*
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                 * The length of the field must be at least as large as the table.
+                                  "Load from Buffer or Field %p %s\n", obj_desc,
-                 * Read the entire field and thus the entire table.  Buffer is
+                                  acpi_ut_get_object_type_name(obj_desc)));
-                 * allocated during the read.
-                 */
-                status =
-                    acpi_ex_read_data_from_field(walk_state, obj_desc,
-                                                 &buffer_desc);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-                table_ptr = ACPI_CAST_PTR(struct acpi_table_header,
-                                          buffer_desc->buffer.pointer);
-                /* All done with the buffer_desc, delete it */
-                buffer_desc->buffer.pointer = NULL;
-                acpi_ut_remove_reference(buffer_desc);
-                /* Sanity check the table length */
+                table_desc.pointer = ACPI_CAST_PTR(struct acpi_table_header,
+                                                   obj_desc->buffer.pointer);
+                table_desc.length = table_desc.pointer->length;
+                table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED;
-                if (table_ptr->length < sizeof(struct acpi_table_header)) {
+                obj_desc->buffer.pointer = NULL;
-                        status = AE_BAD_HEADER;
-                        goto cleanup;
-                }
                break;
        default:
                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
        }
-        /* The table must be either an SSDT or a PSDT */
+        /*
+         * Install the new table into the local data structures
-        if ((!ACPI_COMPARE_NAME(table_ptr->signature, PSDT_SIG)) &&
+         */
-            (!ACPI_COMPARE_NAME(table_ptr->signature, SSDT_SIG))) {
+        status = acpi_tb_add_table(&table_desc, &table_index);
-                ACPI_ERROR((AE_INFO,
+        if (ACPI_FAILURE(status)) {
-                            "Table has invalid signature [%4.4s], must be SSDT or PSDT",
-                            table_ptr->signature));
-                status = AE_BAD_SIGNATURE;
                goto cleanup;
        }
-        /* Install the new table into the local data structures */
+        status =
+            acpi_ex_add_table(table_index, acpi_gbl_root_node, &ddb_handle);
-        status = acpi_ex_add_table(table_ptr, acpi_gbl_root_node, &ddb_handle);
        if (ACPI_FAILURE(status)) {
                /* On error, table_ptr was deallocated above */
@@ -450,13 +352,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(status);
        }
-        ACPI_INFO((AE_INFO,
-                   "Dynamic SSDT Load - OemId [%6.6s] OemTableId [%8.8s]",
-                   table_ptr->oem_id, table_ptr->oem_table_id));
      cleanup:
        if (ACPI_FAILURE(status)) {
-                ACPI_FREE(table_ptr);
+                acpi_tb_delete_table(&table_desc);
        }
        return_ACPI_STATUS(status);
 }
@@ -477,7 +375,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
 {
        acpi_status status = AE_OK;
        union acpi_operand_object *table_desc = ddb_handle;
-        struct acpi_table_desc *table_info;
+        acpi_native_uint table_index;
        ACPI_FUNCTION_TRACE(ex_unload_table);
@@ -493,19 +391,18 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        /* Get the actual table descriptor from the ddb_handle */
+        /* Get the table index from the ddb_handle */
-        table_info = (struct acpi_table_desc *)table_desc->reference.object;
+        table_index = (acpi_native_uint) table_desc->reference.object;
        /*
         * Delete the entire namespace under this table Node
         * (Offset contains the table_id)
         */
-        acpi_ns_delete_namespace_by_owner(table_info->owner_id);
+        acpi_tb_delete_namespace_by_owner(table_index);
+        acpi_tb_release_owner_id(table_index);
-        /* Delete the table itself */
-        (void)acpi_tb_uninstall_table(table_info->installed_desc);
+        acpi_tb_set_table_loaded_flag(table_index, FALSE);
        /* Delete the table descriptor (ddb_handle) */
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index 544e81a6a438..d470e8b1f4ea 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 34eec82c1b1e..7c38528a7e83 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -359,8 +359,9 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
        union acpi_operand_object **operand = &walk_state->operands[0];
        union acpi_operand_object *obj_desc;
        struct acpi_namespace_node *node;
-        struct acpi_table_header *table;
        union acpi_operand_object *region_obj2;
+        acpi_native_uint table_index;
+        struct acpi_table_header *table;
        ACPI_FUNCTION_TRACE(ex_create_table_region);
@@ -380,7 +381,7 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
        status = acpi_tb_find_table(operand[1]->string.pointer,
                                    operand[2]->string.pointer,
-                                    operand[3]->string.pointer, &table);
+                                    operand[3]->string.pointer, &table_index);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -395,6 +396,11 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
        region_obj2 = obj_desc->common.next_object;
        region_obj2->extra.region_context = NULL;
+        status = acpi_get_table_by_index(table_index, &table);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        /* Init the region from the operands */
        obj_desc->region.space_id = REGION_DATA_TABLE;
@@ -553,7 +559,8 @@ acpi_ex_create_method(u8 * aml_start,
        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_METHOD);
        if (!obj_desc) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
+                status = AE_NO_MEMORY;
+                goto exit;
        }
        /* Save the method's AML pointer and length  */
@@ -576,10 +583,7 @@ acpi_ex_create_method(u8 * aml_start,
         * Get the sync_level. If method is serialized, a mutex will be
         * created for this method when it is parsed.
         */
-        if (acpi_gbl_all_methods_serialized) {
+        if (method_flags & AML_METHOD_SERIALIZED) {
-                obj_desc->method.sync_level = 0;
-                obj_desc->method.method_flags |= AML_METHOD_SERIALIZED;
-        } else if (method_flags & AML_METHOD_SERIALIZED) {
                /*
                 * ACPI 1.0: sync_level = 0
                 * ACPI 2.0: sync_level = sync_level in method declaration
@@ -597,6 +601,7 @@ acpi_ex_create_method(u8 * aml_start,
        acpi_ut_remove_reference(obj_desc);
+      exit:
        /* Remove a reference to the operand */
        acpi_ut_remove_reference(operand[1]);
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 2450943add33..68d283fd60e7 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -59,8 +59,6 @@ static void acpi_ex_out_string(char *title, char *value);
 static void acpi_ex_out_pointer(char *title, void *value);
-static void acpi_ex_out_address(char *title, acpi_physical_address value);
 static void
 acpi_ex_dump_object(union acpi_operand_object *obj_desc,
                    struct acpi_exdump_info *info);
@@ -92,10 +90,11 @@ static struct acpi_exdump_info acpi_ex_dump_string[4] = {
        {ACPI_EXD_STRING, 0, NULL}
 };
-static struct acpi_exdump_info acpi_ex_dump_buffer[4] = {
+static struct acpi_exdump_info acpi_ex_dump_buffer[5] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer), NULL},
        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(buffer.length), "Length"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.pointer), "Pointer"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.node), "Parent Node"},
        {ACPI_EXD_BUFFER, 0, NULL}
 };
@@ -165,8 +164,8 @@ static struct acpi_exdump_info acpi_ex_dump_power[5] = {
 static struct acpi_exdump_info acpi_ex_dump_processor[7] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_processor), NULL},
-        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},
-        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.length), "Length"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.length), "Length"},
        {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify),
         "System Notify"},
@@ -379,18 +378,12 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
                        break;
                case ACPI_EXD_POINTER:
+                case ACPI_EXD_ADDRESS:
                        acpi_ex_out_pointer(name,
                                            *ACPI_CAST_PTR(void *, target));
                        break;
-                case ACPI_EXD_ADDRESS:
-                        acpi_ex_out_address(name,
-                                            *ACPI_CAST_PTR
-                                            (acpi_physical_address, target));
-                        break;
                case ACPI_EXD_STRING:
                        acpi_ut_print_string(obj_desc->string.pointer,
@@ -834,16 +827,6 @@ static void acpi_ex_out_pointer(char *title, void *value)
        acpi_os_printf("%20s : %p\n", title, value);
 }
-static void acpi_ex_out_address(char *title, acpi_physical_address value)
-{
-#if ACPI_MACHINE_WIDTH == 16
-        acpi_os_printf("%20s : %p\n", title, value);
-#else
-        acpi_os_printf("%20s : %8.8X%8.8X\n", title, ACPI_FORMAT_UINT64(value));
-#endif
-}
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ex_dump_namespace_node
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index 9ea9c3a67ca9..2d88a3d8d1ad 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index 40f0bee6faa5..65a48b6170ee 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -257,14 +257,13 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD,
-                              " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n",
+                              " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %p\n",
                              acpi_ut_get_region_name(rgn_desc->region.
                                                      space_id),
                              rgn_desc->region.space_id,
                              obj_desc->common_field.access_byte_width,
                              obj_desc->common_field.base_byte_offset,
-                              field_datum_byte_offset,
+                              field_datum_byte_offset, (void *)address));
-                              ACPI_FORMAT_UINT64(address)));
        /* Invoke the appropriate address_space/op_region handler */
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index bd98aab017cf..f13d1cec2d6d 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 3a39c2e8e104..5101bad5baf8 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acinterp.h>
+#include <acpi/acevents.h>
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmutex")
@@ -150,7 +151,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        /* Sanity check -- we must have a valid thread ID */
+        /* Sanity check: we must have a valid thread ID */
        if (!walk_state->thread) {
                ACPI_ERROR((AE_INFO,
@@ -174,24 +175,28 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
        /* Support for multiple acquires by the owning thread */
        if (obj_desc->mutex.owner_thread) {
+                if (obj_desc->mutex.owner_thread->thread_id ==
-                /* Special case for Global Lock, allow all threads */
+                    walk_state->thread->thread_id) {
-                if ((obj_desc->mutex.owner_thread->thread_id ==
-                     walk_state->thread->thread_id) ||
-                    (obj_desc->mutex.os_mutex == ACPI_GLOBAL_LOCK)) {
                        /*
-                         * The mutex is already owned by this thread,
+                         * The mutex is already owned by this thread, just increment the
-                         * just increment the acquisition depth
+                         * acquisition depth
                         */
                        obj_desc->mutex.acquisition_depth++;
                        return_ACPI_STATUS(AE_OK);
                }
        }
-        /* Acquire the mutex, wait if necessary */
+        /* Acquire the mutex, wait if necessary. Special case for Global Lock */
+        if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
+                status =
+                    acpi_ev_acquire_global_lock((u16) time_desc->integer.value);
+        } else {
+                status = acpi_ex_system_wait_mutex(obj_desc->mutex.os_mutex,
+                                                   (u16) time_desc->integer.
+                                                   value);
+        }
-        status = acpi_ex_system_acquire_mutex(time_desc, obj_desc);
        if (ACPI_FAILURE(status)) {
                /* Includes failure from a timeout on time_desc */
@@ -211,7 +216,6 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
        /* Link the mutex to the current thread for force-unlock at method exit */
        acpi_ex_link_mutex(obj_desc, walk_state->thread);
        return_ACPI_STATUS(AE_OK);
 }
@@ -232,7 +236,7 @@ acpi_status
 acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                      struct acpi_walk_state *walk_state)
 {
-        acpi_status status;
+        acpi_status status = AE_OK;
        ACPI_FUNCTION_TRACE(ex_release_mutex);
@@ -249,7 +253,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(AE_AML_MUTEX_NOT_ACQUIRED);
        }
-        /* Sanity check -- we must have a valid thread ID */
+        /* Sanity check: we must have a valid thread ID */
        if (!walk_state->thread) {
                ACPI_ERROR((AE_INFO,
@@ -264,18 +268,18 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         */
        if ((obj_desc->mutex.owner_thread->thread_id !=
             walk_state->thread->thread_id)
-            && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) {
+            && (obj_desc->mutex.os_mutex != acpi_gbl_global_lock_mutex)) {
                ACPI_ERROR((AE_INFO,
-                            "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
+                            "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
-                            (u32) walk_state->thread->thread_id,
+                            (unsigned long)walk_state->thread->thread_id,
                            acpi_ut_get_node_name(obj_desc->mutex.node),
-                            (u32) obj_desc->mutex.owner_thread->thread_id));
+                            (unsigned long)obj_desc->mutex.owner_thread->thread_id));
                return_ACPI_STATUS(AE_AML_NOT_OWNER);
        }
        /*
-         * The sync level of the mutex must be less than or
+         * The sync level of the mutex must be less than or equal to the current
-         * equal to the current sync level
+         * sync level
         */
        if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
                ACPI_ERROR((AE_INFO,
@@ -298,11 +302,15 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
        acpi_ex_unlink_mutex(obj_desc);
-        /* Release the mutex */
+        /* Release the mutex, special case for Global Lock */
-        status = acpi_ex_system_release_mutex(obj_desc);
+        if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
+                status = acpi_ev_release_global_lock();
+        } else {
+                acpi_os_release_mutex(obj_desc->mutex.os_mutex);
+        }
-        /* Update the mutex and walk state, restore sync_level before acquire */
+        /* Update the mutex and restore sync_level */
        obj_desc->mutex.owner_thread = NULL;
        walk_state->thread->current_sync_level =
@@ -321,39 +329,49 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 *
 * DESCRIPTION: Release all mutexes held by this thread
 *
+ * NOTE: This function is called as the thread is exiting the interpreter.
+ * Mutexes are not released when an individual control method is exited, but
+ * only when the parent thread actually exits the interpreter. This allows one
+ * method to acquire a mutex, and a different method to release it, as long as
+ * this is performed underneath a single parent control method.
+ *
 ******************************************************************************/
 void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
 {
        union acpi_operand_object *next = thread->acquired_mutex_list;
-        union acpi_operand_object *this;
+        union acpi_operand_object *obj_desc;
-        acpi_status status;
        ACPI_FUNCTION_ENTRY();
        /* Traverse the list of owned mutexes, releasing each one */
        while (next) {
-                this = next;
+                obj_desc = next;
-                next = this->mutex.next;
+                next = obj_desc->mutex.next;
+                obj_desc->mutex.prev = NULL;
+                obj_desc->mutex.next = NULL;
+                obj_desc->mutex.acquisition_depth = 0;
+                /* Release the mutex, special case for Global Lock */
-                this->mutex.acquisition_depth = 1;
+                if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
-                this->mutex.prev = NULL;
-                this->mutex.next = NULL;
-                /* Release the mutex */
+                        /* Ignore errors */
-                status = acpi_ex_system_release_mutex(this);
+                        (void)acpi_ev_release_global_lock();
-                if (ACPI_FAILURE(status)) {
+                } else {
-                        continue;
+                        acpi_os_release_mutex(obj_desc->mutex.os_mutex);
                }
                /* Mark mutex unowned */
-                this->mutex.owner_thread = NULL;
+                obj_desc->mutex.owner_thread = NULL;
                /* Update Thread sync_level (Last mutex is the important one) */
-                thread->current_sync_level = this->mutex.original_sync_level;
+                thread->current_sync_level =
+                    obj_desc->mutex.original_sync_level;
        }
 }
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index d3d70364626c..1ee4fb1175c6 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 6374d8be88e0..252f10acbbcc 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -104,9 +104,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
                        status = AE_NO_MEMORY;
                        goto cleanup;
                }
-#if ACPI_MACHINE_WIDTH != 16
                return_desc->integer.value = acpi_os_get_timer();
-#endif
                break;
        default:                /*  Unknown opcode  */
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 7d2cbc113160..17e652e65379 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index e2d945dfd509..7fe67cf82cee 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index f0c0ba6eb408..bd80a9cb3d65 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 44d064f427b9..a6696621ff1b 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 3cc97ba48b36..2e9ce94798c7 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -155,16 +155,15 @@ acpi_ex_system_memory_space_handler(u32 function,
                /* Create a new mapping starting at the address given */
-                status = acpi_os_map_memory(address, window_size,
+                mem_info->mapped_logical_address =
-                                            (void **)&mem_info->
+                    acpi_os_map_memory((acpi_native_uint) address, window_size);
-                                            mapped_logical_address);
+                if (!mem_info->mapped_logical_address) {
-                if (ACPI_FAILURE(status)) {
                        ACPI_ERROR((AE_INFO,
                                    "Could not map memory at %8.8X%8.8X, size %X",
                                    ACPI_FORMAT_UINT64(address),
                                    (u32) window_size));
                        mem_info->mapped_length = 0;
-                        return_ACPI_STATUS(status);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
                /* Save the physical address and mapping size */
@@ -210,11 +209,10 @@ acpi_ex_system_memory_space_handler(u32 function,
                        *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
                        break;
-#if ACPI_MACHINE_WIDTH != 16
                case 64:
                        *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
                        break;
-#endif
                default:
                        /* bit_width was already validated */
                        break;
@@ -236,11 +234,9 @@ acpi_ex_system_memory_space_handler(u32 function,
                        ACPI_SET32(logical_addr_ptr) = (u32) * value;
                        break;
-#if ACPI_MACHINE_WIDTH != 16
                case 64:
                        ACPI_SET64(logical_addr_ptr) = (u64) * value;
                        break;
-#endif
                default:
                        /* bit_width was already validated */
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 3089b05a1368..2b3a01cc4929 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 6499de878017..6c64e55dab0e 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -141,7 +141,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
        acpi_status status = AE_OK;
        union acpi_operand_object *stack_desc;
        void *temp_node;
-        union acpi_operand_object *obj_desc;
+        union acpi_operand_object *obj_desc = NULL;
        u16 opcode;
        ACPI_FUNCTION_TRACE(ex_resolve_object_to_value);
@@ -299,8 +299,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                status = acpi_ds_get_package_arguments(stack_desc);
                break;
-                /* These cases may never happen here, but just in case.. */
        case ACPI_TYPE_BUFFER_FIELD:
        case ACPI_TYPE_LOCAL_REGION_FIELD:
        case ACPI_TYPE_LOCAL_BANK_FIELD:
@@ -314,6 +312,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                status =
                    acpi_ex_read_data_from_field(walk_state, stack_desc,
                                                 &obj_desc);
+                /* Remove a reference to the original operand, then override */
+                acpi_ut_remove_reference(*stack_ptr);
                *stack_ptr = (void *)obj_desc;
                break;
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 4c93d0972333..ba761862a599 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -611,22 +611,20 @@ acpi_ex_resolve_operands(u16 opcode,
                        }
                        goto next_operand;
-                case ARGI_REGION_OR_FIELD:
+                case ARGI_REGION_OR_BUFFER:     /* Used by Load() only */
-                        /* Need an operand of type REGION or a FIELD in a region */
+                        /* Need an operand of type REGION or a BUFFER (which could be a resolved region field) */
                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        case ACPI_TYPE_BUFFER:
                        case ACPI_TYPE_REGION:
-                        case ACPI_TYPE_LOCAL_REGION_FIELD:
-                        case ACPI_TYPE_LOCAL_BANK_FIELD:
-                        case ACPI_TYPE_LOCAL_INDEX_FIELD:
                                /* Valid operand */
                                break;
                        default:
                                ACPI_ERROR((AE_INFO,
-                                            "Needed [Region/RegionField], found [%s] %p",
+                                            "Needed [Region/Buffer], found [%s] %p",
                                            acpi_ut_get_object_type_name
                                            (obj_desc), obj_desc));
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 0456405ba019..f4b69a637820 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 591aaf0e18b3..1d622c625c64 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 99ebe5adfcda..8233d40178ee 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 28aef3e69ecc..9460baff3032 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,6 @@ ACPI_MODULE_NAME("exsystem")
 acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 {
        acpi_status status;
-        acpi_status status2;
        ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
@@ -79,7 +78,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
                /* We must wait, so unlock the interpreter */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = acpi_os_wait_semaphore(semaphore, 1, timeout);
@@ -89,13 +88,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
                /* Reacquire the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        /* Report fatal error, could not acquire interpreter */
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
@@ -119,7 +112,6 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 {
        acpi_status status;
-        acpi_status status2;
        ACPI_FUNCTION_TRACE(ex_system_wait_mutex);
@@ -132,7 +124,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
                /* We must wait, so unlock the interpreter */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
                status = acpi_os_acquire_mutex(mutex, timeout);
@@ -142,13 +134,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
                /* Reacquire the interpreter */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_reacquire_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        /* Report fatal error, could not acquire interpreter */
-                        return_ACPI_STATUS(status2);
-                }
        }
        return_ACPI_STATUS(status);
@@ -209,96 +195,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
 {
-        acpi_status status;
        ACPI_FUNCTION_ENTRY();
        /* Since this thread will sleep, we must release the interpreter */
-        acpi_ex_exit_interpreter();
+        acpi_ex_relinquish_interpreter();
        acpi_os_sleep(how_long);
        /* And now we must get the interpreter again */
-        status = acpi_ex_enter_interpreter();
+        acpi_ex_reacquire_interpreter();
-        return (status);
+        return (AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ex_system_acquire_mutex
- *
- * PARAMETERS:  time_desc       - Maximum time to wait for the mutex
- *              obj_desc        - The object descriptor for this op
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Provides an access point to perform synchronization operations
- *              within the AML.  This function will cause a lock to be generated
- *              for the Mutex pointed to by obj_desc.
- *
- ******************************************************************************/
-acpi_status
-acpi_ex_system_acquire_mutex(union acpi_operand_object * time_desc,
-                             union acpi_operand_object * obj_desc)
-{
-        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE_PTR(ex_system_acquire_mutex, obj_desc);
-        if (!obj_desc) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Support for the _GL_ Mutex object -- go get the global lock */
-        if (obj_desc->mutex.os_mutex == ACPI_GLOBAL_LOCK) {
-                status =
-                    acpi_ev_acquire_global_lock((u16) time_desc->integer.value);
-                return_ACPI_STATUS(status);
-        }
-        status = acpi_ex_system_wait_mutex(obj_desc->mutex.os_mutex,
-                                           (u16) time_desc->integer.value);
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ex_system_release_mutex
- *
- * PARAMETERS:  obj_desc        - The object descriptor for this op
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Provides an access point to perform synchronization operations
- *              within the AML.  This operation is a request to release a
- *              previously acquired Mutex.  If the Mutex variable is set then
- *              it will be decremented.
- *
- ******************************************************************************/
-acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)
-{
-        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE(ex_system_release_mutex);
-        if (!obj_desc) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Support for the _GL_ Mutex object -- release the global lock */
-        if (obj_desc->mutex.os_mutex == ACPI_GLOBAL_LOCK) {
-                status = acpi_ev_release_global_lock();
-                return_ACPI_STATUS(status);
-        }
-        acpi_os_release_mutex(obj_desc->mutex.os_mutex);
-        return_ACPI_STATUS(AE_OK);
 }
 /*******************************************************************************
@@ -314,7 +222,7 @@ acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)
 *
 ******************************************************************************/
-acpi_status acpi_ex_system_signal_event(union acpi_operand_object *obj_desc)
+acpi_status acpi_ex_system_signal_event(union acpi_operand_object * obj_desc)
 {
        acpi_status status = AE_OK;
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 982c8b65876f..6b0aeccbb69b 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -76,14 +76,15 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
 *
 * PARAMETERS:  None
 *
- * RETURN:      Status
+ * RETURN:      None
 *
- * DESCRIPTION: Enter the interpreter execution region.  Failure to enter
+ * DESCRIPTION: Enter the interpreter execution region. Failure to enter
- *              the interpreter region is a fatal system error
+ *              the interpreter region is a fatal system error. Used in
+ *              conjunction with exit_interpreter.
 *
 ******************************************************************************/
-acpi_status acpi_ex_enter_interpreter(void)
+void acpi_ex_enter_interpreter(void)
 {
        acpi_status status;
@@ -91,31 +92,55 @@ acpi_status acpi_ex_enter_interpreter(void)
        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not acquire AML Interpreter mutex"));
        }
-        return_ACPI_STATUS(status);
+        return_VOID;
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ex_exit_interpreter
+ * FUNCTION:    acpi_ex_reacquire_interpreter
 *
 * PARAMETERS:  None
 *
 * RETURN:      None
 *
- * DESCRIPTION: Exit the interpreter execution region
+ * DESCRIPTION: Reacquire the interpreter execution region from within the
+ *              interpreter code. Failure to enter the interpreter region is a
+ *              fatal system error. Used in  conjuction with
+ *              relinquish_interpreter
+ *
+ ******************************************************************************/
+void acpi_ex_reacquire_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_reacquire_interpreter);
+        /*
+         * If the global serialized flag is set, do not release the interpreter,
+         * since it was not actually released by acpi_ex_relinquish_interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_enter_interpreter();
+        }
+        return_VOID;
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_exit_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
 *
- * Cases where the interpreter is unlocked:
+ * DESCRIPTION: Exit the interpreter execution region. This is the top level
- *      1) Completion of the execution of a control method
+ *              routine used to exit the interpreter when all processing has
- *      2) Method blocked on a Sleep() AML opcode
+ *              been completed.
- *      3) Method blocked on an Acquire() AML opcode
- *      4) Method blocked on a Wait() AML opcode
- *      5) Method blocked to acquire the global lock
- *      6) Method blocked to execute a serialized control method that is
- *          already executing
- *      7) About to invoke a user-installed opregion handler
 *
 ******************************************************************************/
@@ -127,7 +152,46 @@ void acpi_ex_exit_interpreter(void)
        status = acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not release AML Interpreter mutex"));
+        }
+        return_VOID;
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_relinquish_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Exit the interpreter execution region, from within the
+ *              interpreter - before attempting an operation that will possibly
+ *              block the running thread.
+ *
+ * Cases where the interpreter is unlocked internally
+ *      1) Method to be blocked on a Sleep() AML opcode
+ *      2) Method to be blocked on an Acquire() AML opcode
+ *      3) Method to be blocked on a Wait() AML opcode
+ *      4) Method to be blocked to acquire the global lock
+ *      5) Method to be blocked waiting to execute a serialized control method
+ *          that is currently executing
+ *      6) About to invoke a user-installed opregion handler
+ *
+ ******************************************************************************/
+void acpi_ex_relinquish_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_relinquish_interpreter);
+        /*
+         * If the global serialized flag is set, do not release the interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_exit_interpreter();
        }
        return_VOID;
@@ -141,8 +205,8 @@ void acpi_ex_exit_interpreter(void)
 *
 * RETURN:      none
 *
- * DESCRIPTION: Truncate a number to 32-bits if the currently executing method
+ * DESCRIPTION: Truncate an ACPI Integer to 32 bits if the execution mode is
- *              belongs to a 32-bit ACPI table.
+ *              32-bit, as determined by the revision of the DSDT.
 *
 ******************************************************************************/
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index b24942041b3f..af22fdf73413 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -99,8 +99,8 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
                     size_t count, loff_t * ppos)
 {
        int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_fan *fan = (struct acpi_fan *)m->private;
+        struct acpi_fan *fan = m->private;
        char state_string[12] = { '\0' };
@@ -186,10 +186,9 @@ static int acpi_fan_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        fan = kmalloc(sizeof(struct acpi_fan), GFP_KERNEL);
+        fan = kzalloc(sizeof(struct acpi_fan), GFP_KERNEL);
        if (!fan)
                return -ENOMEM;
-        memset(fan, 0, sizeof(struct acpi_fan));
        fan->device = device;
        strcpy(acpi_device_name(device), "Fan");
@@ -229,7 +228,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        fan = (struct acpi_fan *)acpi_driver_data(device);
+        fan = acpi_driver_data(device);
        acpi_fan_remove_fs(device);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a2f46d587d55..7b6c9ff9bebe 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -86,125 +86,6 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
        return ret;
 }
-/* Get PCI root bridge's handle from its segment and bus number */
-struct acpi_find_pci_root {
-        unsigned int seg;
-        unsigned int bus;
-        acpi_handle handle;
-};
-static acpi_status
-do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
-{
-        unsigned long *busnr = (unsigned long *)data;
-        struct acpi_resource_address64 address;
-        if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
-            resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 &&
-            resource->type != ACPI_RESOURCE_TYPE_ADDRESS64)
-                return AE_OK;
-        acpi_resource_to_address64(resource, &address);
-        if ((address.address_length > 0) &&
-            (address.resource_type == ACPI_BUS_NUMBER_RANGE))
-                *busnr = address.minimum;
-        return AE_OK;
-}
-static int get_root_bridge_busnr(acpi_handle handle)
-{
-        acpi_status status;
-        unsigned long bus, bbn;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-        status = acpi_evaluate_integer(handle, METHOD_NAME__BBN, NULL,
-                                       &bbn);
-        if (status == AE_NOT_FOUND) {
-                /* Assume bus = 0 */
-                printk(KERN_INFO PREFIX
-                       "Assume root bridge [%s] bus is 0\n",
-                       (char *)buffer.pointer);
-                status = AE_OK;
-                bbn = 0;
-        }
-        if (ACPI_FAILURE(status)) {
-                bbn = -ENODEV;
-                goto exit;
-        }
-        if (bbn > 0)
-                goto exit;
-        /* _BBN in some systems return 0 for all root bridges */
-        bus = -1;
-        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
-                                     do_root_bridge_busnr_callback, &bus);
-        /* If _CRS failed, we just use _BBN */
-        if (ACPI_FAILURE(status) || (bus == -1))
-                goto exit;
-        /* We select _CRS */
-        if (bbn != bus) {
-                printk(KERN_INFO PREFIX
-                       "_BBN and _CRS returns different value for %s. Select _CRS\n",
-                       (char *)buffer.pointer);
-                bbn = bus;
-        }
-      exit:
-        kfree(buffer.pointer);
-        return (int)bbn;
-}
-static acpi_status
-find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
-{
-        struct acpi_find_pci_root *find = (struct acpi_find_pci_root *)context;
-        unsigned long seg, bus;
-        acpi_status status;
-        int tmp;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-        status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL, &seg);
-        if (status == AE_NOT_FOUND) {
-                /* Assume seg = 0 */
-                status = AE_OK;
-                seg = 0;
-        }
-        if (ACPI_FAILURE(status)) {
-                status = AE_CTRL_DEPTH;
-                goto exit;
-        }
-        tmp = get_root_bridge_busnr(handle);
-        if (tmp < 0) {
-                printk(KERN_ERR PREFIX
-                       "Find root bridge failed for %s\n",
-                       (char *)buffer.pointer);
-                status = AE_CTRL_DEPTH;
-                goto exit;
-        }
-        bus = tmp;
-        if (seg == find->seg && bus == find->bus)
-                find->handle = handle;
-        status = AE_OK;
-      exit:
-        kfree(buffer.pointer);
-        return status;
-}
-acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)
-{
-        struct acpi_find_pci_root find = { seg, bus, NULL };
-        acpi_get_devices(PCI_ROOT_HID_STRING, find_pci_rootbridge, &find, NULL);
-        return find.handle;
-}
-EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle);
 /* Get device's handler per its address under its parent */
 struct acpi_find_child {
        acpi_handle handle;
@@ -217,7 +98,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
        acpi_status status;
        struct acpi_device_info *info;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_find_child *find = (struct acpi_find_child *)context;
+        struct acpi_find_child *find = context;
        status = acpi_get_object_info(handle, &buffer);
        if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index de50fab2a910..6031ca13dd2f 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -49,41 +49,6 @@ ACPI_MODULE_NAME("hwacpi")
 /******************************************************************************
 *
- * FUNCTION:    acpi_hw_initialize
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Initialize and validate the various ACPI registers defined in
- *              the FADT.
- *
- ******************************************************************************/
-acpi_status acpi_hw_initialize(void)
-{
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(hw_initialize);
-        /* We must have the ACPI tables by the time we get here */
-        if (!acpi_gbl_FADT) {
-                ACPI_ERROR((AE_INFO, "No FADT is present"));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
-        /* Sanity check the FADT for valid values */
-        status = acpi_ut_validate_fadt();
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        return_ACPI_STATUS(AE_OK);
-}
-/******************************************************************************
- *
 * FUNCTION:    acpi_hw_set_mode
 *
 * PARAMETERS:  Mode            - SYS_MODE_ACPI or SYS_MODE_LEGACY
@@ -93,7 +58,6 @@ acpi_status acpi_hw_initialize(void)
 * DESCRIPTION: Transitions the system into the requested mode.
 *
 ******************************************************************************/
 acpi_status acpi_hw_set_mode(u32 mode)
 {
@@ -106,7 +70,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
         * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
         * system does not support mode transition.
         */
-        if (!acpi_gbl_FADT->smi_cmd) {
+        if (!acpi_gbl_FADT.smi_command) {
                ACPI_ERROR((AE_INFO,
                            "No SMI_CMD in FADT, mode transition failed"));
                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
@@ -119,7 +83,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
         * we make sure both the numbers are zero to determine these
         * transitions are not supported.
         */
-        if (!acpi_gbl_FADT->acpi_enable && !acpi_gbl_FADT->acpi_disable) {
+        if (!acpi_gbl_FADT.acpi_enable && !acpi_gbl_FADT.acpi_disable) {
                ACPI_ERROR((AE_INFO,
                            "No ACPI mode transition supported in this system (enable/disable both zero)"));
                return_ACPI_STATUS(AE_OK);
@@ -130,9 +94,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
                /* BIOS should have disabled ALL fixed and GP events */
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
+                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
-                                            (u32) acpi_gbl_FADT->acpi_enable,
+                                            (u32) acpi_gbl_FADT.acpi_enable, 8);
-                                            8);
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Attempting to enable ACPI mode\n"));
                break;
@@ -143,8 +106,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 * BIOS should clear all fixed status bits and restore fixed event
                 * enable bits to default
                 */
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
+                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
-                                            (u32) acpi_gbl_FADT->acpi_disable,
+                                            (u32) acpi_gbl_FADT.acpi_disable,
                                            8);
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Attempting to enable Legacy (non-ACPI) mode\n"));
@@ -204,12 +167,11 @@ u32 acpi_hw_get_mode(void)
         * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
         * system does not support mode transition.
         */
-        if (!acpi_gbl_FADT->smi_cmd) {
+        if (!acpi_gbl_FADT.smi_command) {
                return_UINT32(ACPI_SYS_MODE_ACPI);
        }
-        status =
+        status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);
-            acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value, ACPI_MTX_LOCK);
        if (ACPI_FAILURE(status)) {
                return_UINT32(ACPI_SYS_MODE_LEGACY);
        }
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 608a3a60ee11..117a05cadaaa 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -105,14 +105,20 @@ acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info *gpe_event_info)
 acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
 {
        acpi_status status;
+        u8 register_bit;
        ACPI_FUNCTION_ENTRY();
+        register_bit = (u8)
+            (1 <<
+             (gpe_event_info->gpe_number -
+              gpe_event_info->register_info->base_gpe_number));
        /*
         * Write a one to the appropriate bit in the status register to
         * clear this GPE.
         */
-        status = acpi_hw_low_level_write(8, gpe_event_info->register_bit,
+        status = acpi_hw_low_level_write(8, register_bit,
                                         &gpe_event_info->register_info->
                                         status_address);
@@ -155,7 +161,10 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
        /* Get the register bitmask for this GPE */
-        register_bit = gpe_event_info->register_bit;
+        register_bit = (u8)
+            (1 <<
+             (gpe_event_info->gpe_number -
+              gpe_event_info->register_info->base_gpe_number));
        /* GPE currently enabled? (enabled for runtime?) */
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index fa58c1edce1e..1d371fa663f2 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -7,7 +7,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -54,17 +54,15 @@ ACPI_MODULE_NAME("hwregs")
 *
 * FUNCTION:    acpi_hw_clear_acpi_status
 *
- * PARAMETERS:  Flags           - Lock the hardware or not
+ * PARAMETERS:  None
 *
- * RETURN:      none
+ * RETURN:      None
 *
 * DESCRIPTION: Clears all fixed and general purpose status bits
 *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
 *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
 ******************************************************************************/
-acpi_status acpi_hw_clear_acpi_status(u32 flags)
+acpi_status acpi_hw_clear_acpi_status(void)
 {
        acpi_status status;
        acpi_cpu_flags lock_flags = 0;
@@ -73,7 +71,7 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)
        ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",
                          ACPI_BITMASK_ALL_FIXED_STATUS,
-                          (u16) acpi_gbl_FADT->xpm1a_evt_blk.address));
+                          (u16) acpi_gbl_FADT.xpm1a_event_block.address));
        lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
@@ -86,10 +84,10 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)
        /* Clear the fixed events */
-        if (acpi_gbl_FADT->xpm1b_evt_blk.address) {
+        if (acpi_gbl_FADT.xpm1b_event_block.address) {
                status =
                    acpi_hw_low_level_write(16, ACPI_BITMASK_ALL_FIXED_STATUS,
-                                            &acpi_gbl_FADT->xpm1b_evt_blk);
+                                            &acpi_gbl_FADT.xpm1b_event_block);
                if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
@@ -253,18 +251,15 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
 *
 * PARAMETERS:  register_id     - ID of ACPI bit_register to access
 *              return_value    - Value that was read from the register
- *              Flags           - Lock the hardware or not
 *
 * RETURN:      Status and the value read from specified Register. Value
 *              returned is normalized to bit0 (is shifted all the way right)
 *
 * DESCRIPTION: ACPI bit_register read function.
 *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
 ******************************************************************************/
-acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)
+acpi_status acpi_get_register(u32 register_id, u32 * return_value)
 {
        u32 register_value = 0;
        struct acpi_bit_register_info *bit_reg_info;
@@ -312,16 +307,13 @@ ACPI_EXPORT_SYMBOL(acpi_get_register)
 * PARAMETERS:  register_id     - ID of ACPI bit_register to access
 *              Value           - (only used on write) value to write to the
 *                                Register, NOT pre-normalized to the bit pos
- *              Flags           - Lock the hardware or not
 *
 * RETURN:      Status
 *
 * DESCRIPTION: ACPI Bit Register write function.
 *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
 ******************************************************************************/
-acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
+acpi_status acpi_set_register(u32 register_id, u32 value)
 {
        u32 register_value = 0;
        struct acpi_bit_register_info *bit_reg_info;
@@ -422,8 +414,9 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
                ACPI_DEBUG_PRINT((ACPI_DB_IO,
                                  "PM2 control: Read %X from %8.8X%8.8X\n",
                                  register_value,
-                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT->
+                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT.
-                                                     xpm2_cnt_blk.address)));
+                                                     xpm2_control_block.
+                                                     address)));
                ACPI_REGISTER_INSERT_VALUE(register_value,
                                           bit_reg_info->bit_position,
@@ -433,8 +426,9 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
                ACPI_DEBUG_PRINT((ACPI_DB_IO,
                                  "About to write %4.4X to %8.8X%8.8X\n",
                                  register_value,
-                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT->
+                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT.
-                                                     xpm2_cnt_blk.address)));
+                                                     xpm2_control_block.
+                                                     address)));
                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
                                                ACPI_REGISTER_PM2_CONTROL,
@@ -495,7 +489,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                status =
                    acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT->xpm1a_evt_blk);
+                                           &acpi_gbl_FADT.xpm1a_event_block);
                if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
@@ -504,7 +498,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                status =
                    acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT->xpm1b_evt_blk);
+                                           &acpi_gbl_FADT.xpm1b_event_block);
                value1 |= value2;
                break;
@@ -527,14 +521,14 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                status =
                    acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                           &acpi_gbl_FADT.xpm1a_control_block);
                if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
                status =
                    acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                           &acpi_gbl_FADT.xpm1b_control_block);
                value1 |= value2;
                break;
@@ -542,19 +536,20 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                status =
                    acpi_hw_low_level_read(8, &value1,
-                                           &acpi_gbl_FADT->xpm2_cnt_blk);
+                                           &acpi_gbl_FADT.xpm2_control_block);
                break;
        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
                status =
                    acpi_hw_low_level_read(32, &value1,
-                                           &acpi_gbl_FADT->xpm_tmr_blk);
+                                           &acpi_gbl_FADT.xpm_timer_block);
                break;
        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
-                status = acpi_os_read_port(acpi_gbl_FADT->smi_cmd, &value1, 8);
+                status =
+                    acpi_os_read_port(acpi_gbl_FADT.smi_command, &value1, 8);
                break;
        default:
@@ -635,7 +630,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_evt_blk);
+                                            &acpi_gbl_FADT.xpm1a_event_block);
                if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
@@ -644,7 +639,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_evt_blk);
+                                            &acpi_gbl_FADT.xpm1b_event_block);
                break;
        case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
@@ -682,49 +677,50 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1a_control_block);
                if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1b_control_block);
                break;
        case ACPI_REGISTER_PM1A_CONTROL:        /* 16-bit access */
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1a_control_block);
                break;
        case ACPI_REGISTER_PM1B_CONTROL:        /* 16-bit access */
                status =
                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1b_control_block);
                break;
        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
                status =
                    acpi_hw_low_level_write(8, value,
-                                            &acpi_gbl_FADT->xpm2_cnt_blk);
+                                            &acpi_gbl_FADT.xpm2_control_block);
                break;
        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
                status =
                    acpi_hw_low_level_write(32, value,
-                                            &acpi_gbl_FADT->xpm_tmr_blk);
+                                            &acpi_gbl_FADT.xpm_timer_block);
                break;
        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
                /* SMI_CMD is currently always in IO space */
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd, value, 8);
+                status =
+                    acpi_os_write_port(acpi_gbl_FADT.smi_command, value, 8);
                break;
        default:
@@ -783,7 +779,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
         * Two address spaces supported: Memory or IO.
         * PCI_Config is not supported here because the GAS struct is insufficient
         */
-        switch (reg->address_space_id) {
+        switch (reg->space_id) {
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                status = acpi_os_read_memory((acpi_physical_address) address,
@@ -792,22 +788,20 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
        case ACPI_ADR_SPACE_SYSTEM_IO:
-                status = acpi_os_read_port((acpi_io_address) address,
+                status =
-                                           value, width);
+                    acpi_os_read_port((acpi_io_address) address, value, width);
                break;
        default:
                ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X",
+                            "Unsupported address space: %X", reg->space_id));
-                            reg->address_space_id));
                return (AE_BAD_PARAMETER);
        }
        ACPI_DEBUG_PRINT((ACPI_DB_IO,
                          "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
-                          *value, width,
+                          *value, width, ACPI_FORMAT_UINT64(address),
-                          ACPI_FORMAT_UINT64(address),
+                          acpi_ut_get_region_name(reg->space_id)));
-                          acpi_ut_get_region_name(reg->address_space_id)));
        return (status);
 }
@@ -854,7 +848,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
         * Two address spaces supported: Memory or IO.
         * PCI_Config is not supported here because the GAS struct is insufficient
         */
-        switch (reg->address_space_id) {
+        switch (reg->space_id) {
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                status = acpi_os_write_memory((acpi_physical_address) address,
@@ -863,22 +857,20 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
        case ACPI_ADR_SPACE_SYSTEM_IO:
-                status = acpi_os_write_port((acpi_io_address) address,
+                status = acpi_os_write_port((acpi_io_address) address, value,
-                                            value, width);
+                                            width);
                break;
        default:
                ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X",
+                            "Unsupported address space: %X", reg->space_id));
-                            reg->address_space_id));
                return (AE_BAD_PARAMETER);
        }
        ACPI_DEBUG_PRINT((ACPI_DB_IO,
                          "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                          value, width,
+                          value, width, ACPI_FORMAT_UINT64(address),
-                          ACPI_FORMAT_UINT64(address),
+                          acpi_ut_get_region_name(reg->space_id)));
-                          acpi_ut_get_region_name(reg->address_space_id)));
        return (status);
 }
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 8bb43cae60c2..57901ca3ade9 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 */
 #include <acpi/acpi.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
@@ -62,17 +63,32 @@ ACPI_MODULE_NAME("hwsleep")
 acpi_status
 acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
 {
+        struct acpi_table_facs *facs;
+        acpi_status status;
        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
+        /* Get the FACS */
+        status =
+            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                    (struct acpi_table_header **)&facs);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        /* Set the vector */
-        if (acpi_gbl_common_fACS.vector_width == 32) {
+        if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {
-                *(ACPI_CAST_PTR
+                /*
-                  (u32, acpi_gbl_common_fACS.firmware_waking_vector))
+                 * ACPI 1.0 FACS or short table or optional X_ field is zero
-                    = (u32) physical_address;
+                 */
+                facs->firmware_waking_vector = (u32) physical_address;
        } else {
-                *acpi_gbl_common_fACS.firmware_waking_vector = physical_address;
+                /*
+                 * ACPI 2.0 FACS with valid X_ field
+                 */
+                facs->xfirmware_waking_vector = physical_address;
        }
        return_ACPI_STATUS(AE_OK);
@@ -97,6 +113,8 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
 acpi_status
 acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 {
+        struct acpi_table_facs *facs;
+        acpi_status status;
        ACPI_FUNCTION_TRACE(acpi_get_firmware_waking_vector);
@@ -104,16 +122,29 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
+        /* Get the FACS */
+        status =
+            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                    (struct acpi_table_header **)&facs);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        /* Get the vector */
-        if (acpi_gbl_common_fACS.vector_width == 32) {
+        if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {
-                *physical_address = (acpi_physical_address)
+                /*
-                    *
+                 * ACPI 1.0 FACS or short table or optional X_ field is zero
-                    (ACPI_CAST_PTR
+                 */
-                     (u32, acpi_gbl_common_fACS.firmware_waking_vector));
+                *physical_address =
+                    (acpi_physical_address) facs->firmware_waking_vector;
        } else {
+                /*
+                 * ACPI 2.0 FACS with valid X_ field
+                 */
                *physical_address =
-                    *acpi_gbl_common_fACS.firmware_waking_vector;
+                    (acpi_physical_address) facs->xfirmware_waking_vector;
        }
        return_ACPI_STATUS(AE_OK);
@@ -246,15 +277,14 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
        /* Clear wake status */
-        status =
+        status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
-            acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
        /* Clear all fixed and general purpose status bits */
-        status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_hw_clear_acpi_status();
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -367,8 +397,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
        /* Wait until we enter sleep state */
        do {
-                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value,
+                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
-                                           ACPI_MTX_DO_NOT_LOCK);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }
@@ -401,13 +430,12 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
        ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
-        status =
+        status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
-            acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
-        status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_hw_clear_acpi_status();
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -429,13 +457,12 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
        ACPI_FLUSH_CPU_CACHE();
-        status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
+        status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
-                                    (u32) acpi_gbl_FADT->S4bios_req, 8);
+                                    (u32) acpi_gbl_FADT.S4bios_request, 8);
        do {
                acpi_os_stall(1000);
-                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value,
+                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
-                                           ACPI_MTX_DO_NOT_LOCK);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }
@@ -568,13 +595,11 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
        (void)
            acpi_set_register(acpi_gbl_fixed_event_info
-                              [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1,
+                              [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1);
-                              ACPI_MTX_DO_NOT_LOCK);
        (void)
            acpi_set_register(acpi_gbl_fixed_event_info
-                              [ACPI_EVENT_POWER_BUTTON].status_register_id, 1,
+                              [ACPI_EVENT_POWER_BUTTON].status_register_id, 1);
-                              ACPI_MTX_DO_NOT_LOCK);
        arg.integer.value = ACPI_SST_WORKING;
        status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index c4ec47c939fd..c32eab696acd 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ acpi_status acpi_get_timer_resolution(u32 * resolution)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        if (acpi_gbl_FADT->tmr_val_ext == 0) {
+        if ((acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) == 0) {
                *resolution = 24;
        } else {
                *resolution = 32;
@@ -98,7 +98,8 @@ acpi_status acpi_get_timer(u32 * ticks)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        status = acpi_hw_low_level_read(32, ticks, &acpi_gbl_FADT->xpm_tmr_blk);
+        status =
+            acpi_hw_low_level_read(32, ticks, &acpi_gbl_FADT.xpm_timer_block);
        return_ACPI_STATUS(status);
 }
@@ -153,7 +154,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
        if (start_ticks < end_ticks) {
                delta_ticks = end_ticks - start_ticks;
        } else if (start_ticks > end_ticks) {
-                if (acpi_gbl_FADT->tmr_val_ext == 0) {
+                if ((acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) == 0) {
                        /* 24-bit Timer */
diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index 1ba2db671865..8edfb92f7ede 100644
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -265,8 +265,7 @@ static char *format_result(union acpi_object *object)
 static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_polling_hotkey *poll_hotkey =
+        struct acpi_polling_hotkey *poll_hotkey = seq->private;
-            (struct acpi_polling_hotkey *)seq->private;
        char *buf;
@@ -577,7 +576,7 @@ init_poll_hotkey_device(union acpi_hotkey *key, char **config_entry,
        if (ACPI_FAILURE(status))
                goto do_fail_zero;
        key->poll_hotkey.poll_result =
-            (union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+            kmalloc(sizeof(union acpi_object), GFP_KERNEL);
        if (!key->poll_hotkey.poll_result)
                goto do_fail_zero;
        return AE_OK;
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c
index 6342e612c203..8338be0990bc 100644
--- a/drivers/acpi/i2c_ec.c
+++ b/drivers/acpi/i2c_ec.c
@@ -309,18 +309,16 @@ static int acpi_ec_hc_add(struct acpi_device *device)
                return -EINVAL;
        }
-        ec_hc = kmalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);
+        ec_hc = kzalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);
        if (!ec_hc) {
                return -ENOMEM;
        }
-        memset(ec_hc, 0, sizeof(struct acpi_ec_hc));
-        smbus = kmalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);
+        smbus = kzalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);
        if (!smbus) {
                kfree(ec_hc);
                return -ENOMEM;
        }
-        memset(smbus, 0, sizeof(struct acpi_ec_smbus));
        ec_hc->handle = device->handle;
        strcpy(acpi_device_name(device), ACPI_EC_HC_DEVICE_NAME);
@@ -393,7 +391,7 @@ static void __exit acpi_ec_hc_exit(void)
 struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)
 {
-        return ((struct acpi_ec_hc *)acpi_driver_data(device->parent));
+        return acpi_driver_data(device->parent);
 }
 EXPORT_SYMBOL(acpi_get_ec_hc);
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 003a9876c968..c6144ca66638 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -3,6 +3,7 @@
 *
 *
 *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
+ *  Copyright (C) 2006 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
 *
 *  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
@@ -19,10 +20,14 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#define IBM_VERSION "0.12a"
+#define IBM_VERSION "0.13"
 /*
 *  Changelog:
+ *
+ *  2006-11-22  0.13    new maintainer
+ *                      changelog now lives in git commit history, and will
+ *                      not be updated further in-file.
 *  
 *  2005-08-17  0.12    fix compilation on 2.6.13-rc kernels
 *  2005-03-17  0.11    support for 600e, 770x
@@ -77,9 +82,16 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/string.h>
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
 #include <asm/uaccess.h>
+#include <linux/dmi.h>
+#include <linux/jiffies.h>
+#include <linux/workqueue.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acnamesp.h>
@@ -88,7 +100,7 @@
 #define IBM_FILE "ibm_acpi"
 #define IBM_URL "http://ibm-acpi.sf.net/"
-MODULE_AUTHOR("Borislav Deianov");
+MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
 MODULE_DESCRIPTION(IBM_DESC);
 MODULE_VERSION(IBM_VERSION);
 MODULE_LICENSE("GPL");
@@ -116,28 +128,6 @@ static acpi_handle root_handle = NULL;
        static char        *object##_path;                      \
        static char        *object##_paths[] = { paths }
-/*
- * The following models are supported to various degrees:
- *
- * 570, 600e, 600x, 770e, 770x
- * A20m, A21e, A21m, A21p, A22p, A30, A30p, A31, A31p
- * G40, G41
- * R30, R31, R32, R40, R40e, R50, R50e, R50p, R51
- * T20, T21, T22, T23, T30, T40, T40p, T41, T41p, T42, T42p, T43
- * X20, X21, X22, X23, X24, X30, X31, X40
- *
- * The following models have no supported features:
- *
- * 240, 240x, i1400
- *
- * Still missing DSDTs for the following models:
- *
- * A20p, A22e, A22m
- * R52
- * S31
- * T43p
- */
 IBM_HANDLE(ec, root, "\\_SB.PCI0.ISA.EC0",      /* 240, 240x */
           "\\_SB.PCI.ISA.EC",  /* 570 */
           "\\_SB.PCI0.ISA0.EC0",       /* 600e/x, 770e, 770x */
@@ -169,6 +159,7 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK",	/* X30, X31, X40 */
 #endif
 IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",        /* 570 */
           "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */
+           "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */ 
           "\\_SB.PCI0.IDE0.SCND.MSTR", /* all others */
    );                          /* A21e, R30, R31 */
@@ -203,7 +194,7 @@ IBM_HANDLE(led, ec, "SLED",	/* 570 */
 IBM_HANDLE(beep, ec, "BEEP");   /* all except R30, R31 */
 IBM_HANDLE(ecrd, ec, "ECRD");   /* 570 */
 IBM_HANDLE(ecwr, ec, "ECWR");   /* 570 */
-IBM_HANDLE(fans, ec, "FANS");   /* X31, X40 */
+IBM_HANDLE(fans, ec, "FANS");   /* X31, X40, X41 */
 IBM_HANDLE(gfan, ec, "GFAN",    /* 570 */
           "\\FSPD",            /* 600e/x, 770e, 770x */
@@ -216,6 +207,152 @@ IBM_HANDLE(sfan, ec, "SFAN",	/* 570 */
 #define IBM_HKEY_HID    "IBM0068"
 #define IBM_PCI_HID     "PNP0A03"
+enum thermal_access_mode {
+        IBMACPI_THERMAL_NONE = 0,       /* No thermal support */
+        IBMACPI_THERMAL_ACPI_TMP07,     /* Use ACPI TMP0-7 */
+        IBMACPI_THERMAL_ACPI_UPDT,      /* Use ACPI TMP0-7 with UPDT */
+        IBMACPI_THERMAL_TPEC_8,         /* Use ACPI EC regs, 8 sensors */
+        IBMACPI_THERMAL_TPEC_16,        /* Use ACPI EC regs, 16 sensors */
+};
+#define IBMACPI_MAX_THERMAL_SENSORS 16  /* Max thermal sensors supported */
+struct ibm_thermal_sensors_struct {
+        s32 temp[IBMACPI_MAX_THERMAL_SENSORS];
+};
+/*
+ * FAN ACCESS MODES
+ *
+ * IBMACPI_FAN_RD_ACPI_GFAN:
+ *      ACPI GFAN method: returns fan level
+ *
+ *      see IBMACPI_FAN_WR_ACPI_SFAN
+ *      EC 0x2f not available if GFAN exists
+ *
+ * IBMACPI_FAN_WR_ACPI_SFAN:
+ *      ACPI SFAN method: sets fan level, 0 (stop) to 7 (max)
+ *
+ *      EC 0x2f might be available *for reading*, but never for writing.
+ *
+ * IBMACPI_FAN_WR_TPEC:
+ *      ThinkPad EC register 0x2f (HFSP): fan control loop mode Supported
+ *      on almost all ThinkPads
+ *
+ *      Fan speed changes of any sort (including those caused by the
+ *      disengaged mode) are usually done slowly by the firmware as the
+ *      maximum ammount of fan duty cycle change per second seems to be
+ *      limited.
+ *
+ *      Reading is not available if GFAN exists.
+ *      Writing is not available if SFAN exists.
+ *
+ *      Bits
+ *       7      automatic mode engaged;
+ *              (default operation mode of the ThinkPad)
+ *              fan level is ignored in this mode.
+ *       6      disengage mode (takes precedence over bit 7);
+ *              not available on all thinkpads.  May disable
+ *              the tachometer, and speeds up fan to 100% duty-cycle,
+ *              which speeds it up far above the standard RPM
+ *              levels.  It is not impossible that it could cause
+ *              hardware damage.
+ *      5-3     unused in some models.  Extra bits for fan level
+ *              in others, but still useless as all values above
+ *              7 map to the same speed as level 7 in these models.
+ *      2-0     fan level (0..7 usually)
+ *                      0x00 = stop
+ *                      0x07 = max (set when temperatures critical)
+ *              Some ThinkPads may have other levels, see
+ *              IBMACPI_FAN_WR_ACPI_FANS (X31/X40/X41)
+ *
+ *      FIRMWARE BUG: on some models, EC 0x2f might not be initialized at
+ *      boot. Apparently the EC does not intialize it, so unless ACPI DSDT
+ *      does so, its initial value is meaningless (0x07).
+ *
+ *      For firmware bugs, refer to:
+ *      http://thinkwiki.org/wiki/Embedded_Controller_Firmware#Firmware_Issues
+ *
+ *      ----
+ *
+ *      ThinkPad EC register 0x84 (LSB), 0x85 (MSB):
+ *      Main fan tachometer reading (in RPM)
+ *
+ *      This register is present on all ThinkPads with a new-style EC, and
+ *      it is known not to be present on the A21m/e, and T22, as there is
+ *      something else in offset 0x84 according to the ACPI DSDT.  Other
+ *      ThinkPads from this same time period (and earlier) probably lack the
+ *      tachometer as well.
+ *
+ *      Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
+ *      was never fixed by IBM to report the EC firmware version string
+ *      probably support the tachometer (like the early X models), so
+ *      detecting it is quite hard.  We need more data to know for sure.
+ *
+ *      FIRMWARE BUG: always read 0x84 first, otherwise incorrect readings
+ *      might result.
+ *
+ *      FIRMWARE BUG: when EC 0x2f bit 6 is set (disengaged mode), this
+ *      register is not invalidated in ThinkPads that disable tachometer
+ *      readings.  Thus, the tachometer readings go stale.
+ *
+ *      For firmware bugs, refer to:
+ *      http://thinkwiki.org/wiki/Embedded_Controller_Firmware#Firmware_Issues
+ *
+ * IBMACPI_FAN_WR_ACPI_FANS:
+ *      ThinkPad X31, X40, X41.  Not available in the X60.
+ *
+ *      FANS ACPI handle: takes three arguments: low speed, medium speed,
+ *      high speed.  ACPI DSDT seems to map these three speeds to levels
+ *      as follows: STOP LOW LOW MED MED HIGH HIGH HIGH HIGH
+ *      (this map is stored on FAN0..FAN8 as "0,1,1,2,2,3,3,3,3")
+ *
+ *      The speeds are stored on handles
+ *      (FANA:FAN9), (FANC:FANB), (FANE:FAND).
+ *
+ *      There are three default speed sets, acessible as handles:
+ *      FS1L,FS1M,FS1H; FS2L,FS2M,FS2H; FS3L,FS3M,FS3H
+ *
+ *      ACPI DSDT switches which set is in use depending on various
+ *      factors.
+ *
+ *      IBMACPI_FAN_WR_TPEC is also available and should be used to
+ *      command the fan.  The X31/X40/X41 seems to have 8 fan levels,
+ *      but the ACPI tables just mention level 7.
+ */
+enum fan_status_access_mode {
+        IBMACPI_FAN_NONE = 0,           /* No fan status or control */
+        IBMACPI_FAN_RD_ACPI_GFAN,       /* Use ACPI GFAN */
+        IBMACPI_FAN_RD_TPEC,            /* Use ACPI EC regs 0x2f, 0x84-0x85 */
+};
+enum fan_control_access_mode {
+        IBMACPI_FAN_WR_NONE = 0,        /* No fan control */
+        IBMACPI_FAN_WR_ACPI_SFAN,       /* Use ACPI SFAN */
+        IBMACPI_FAN_WR_TPEC,            /* Use ACPI EC reg 0x2f */
+        IBMACPI_FAN_WR_ACPI_FANS,       /* Use ACPI FANS and EC reg 0x2f */
+};
+enum fan_control_commands {
+        IBMACPI_FAN_CMD_SPEED   = 0x0001,       /* speed command */
+        IBMACPI_FAN_CMD_LEVEL   = 0x0002,       /* level command  */
+        IBMACPI_FAN_CMD_ENABLE  = 0x0004,       /* enable/disable cmd,
+                                                 * and also watchdog cmd */
+};
+enum {                                  /* Fan control constants */
+        fan_status_offset = 0x2f,       /* EC register 0x2f */
+        fan_rpm_offset = 0x84,          /* EC register 0x84: LSB, 0x85 MSB (RPM)
+                                         * 0x84 must be read before 0x85 */
+        IBMACPI_FAN_EC_DISENGAGED       = 0x40, /* EC mode: tachometer
+                                                 * disengaged */
+        IBMACPI_FAN_EC_AUTO             = 0x80, /* EC mode: auto fan
+                                                 * control */
+};
+static char *ibm_thinkpad_ec_found = NULL;
 struct ibm_struct {
        char *name;
        char param[32];
@@ -243,6 +380,8 @@ struct ibm_struct {
 static struct proc_dir_entry *proc_dir = NULL;
+static struct backlight_device *ibm_backlight_device = NULL;
 #define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off")
 #define enabled(status,bit) ((status) & (1 << (bit)) ? "enabled" : "disabled")
 #define strlencmp(a,b) (strncmp((a), (b), strlen(b)))
@@ -352,7 +491,7 @@ static char *next_cmd(char **cmds)
        return start;
 }
-static int driver_init(void)
+static int ibm_acpi_driver_init(void)
 {
        printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
        printk(IBM_INFO "%s\n", IBM_URL);
@@ -581,8 +720,7 @@ static int wan_status(void)
 {
        int status;
-        if (!wan_supported ||
+        if (!wan_supported || !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
-            !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
                status = 0;
        return status;
@@ -630,12 +768,15 @@ static int wan_write(char *buf)
        return 0;
 }
-static int video_supported;
+enum video_access_mode {
-static int video_orig_autosw;
+        IBMACPI_VIDEO_NONE = 0,
+        IBMACPI_VIDEO_570,      /* 570 */
+        IBMACPI_VIDEO_770,      /* 600e/x, 770e, 770x */
+        IBMACPI_VIDEO_NEW,      /* all others */
+};
-#define VIDEO_570 1
+static enum video_access_mode video_supported;
-#define VIDEO_770 2
+static int video_orig_autosw;
-#define VIDEO_NEW 3
 static int video_init(void)
 {
@@ -647,16 +788,16 @@ static int video_init(void)
        if (!vid_handle)
                /* video switching not supported on R30, R31 */
-                video_supported = 0;
+                video_supported = IBMACPI_VIDEO_NONE;
        else if (acpi_evalf(vid_handle, &video_orig_autosw, "SWIT", "qd"))
                /* 570 */
-                video_supported = VIDEO_570;
+                video_supported = IBMACPI_VIDEO_570;
        else if (acpi_evalf(vid_handle, &video_orig_autosw, "^VADL", "qd"))
                /* 600e/x, 770e, 770x */
-                video_supported = VIDEO_770;
+                video_supported = IBMACPI_VIDEO_770;
        else
                /* all others */
-                video_supported = VIDEO_NEW;
+                video_supported = IBMACPI_VIDEO_NEW;
        return 0;
 }
@@ -666,15 +807,15 @@ static int video_status(void)
        int status = 0;
        int i;
-        if (video_supported == VIDEO_570) {
+        if (video_supported == IBMACPI_VIDEO_570) {
                if (acpi_evalf(NULL, &i, "\\_SB.PHS", "dd", 0x87))
                        status = i & 3;
-        } else if (video_supported == VIDEO_770) {
+        } else if (video_supported == IBMACPI_VIDEO_770) {
                if (acpi_evalf(NULL, &i, "\\VCDL", "d"))
                        status |= 0x01 * i;
                if (acpi_evalf(NULL, &i, "\\VCDC", "d"))
                        status |= 0x02 * i;
-        } else if (video_supported == VIDEO_NEW) {
+        } else if (video_supported == IBMACPI_VIDEO_NEW) {
                acpi_evalf(NULL, NULL, "\\VUPS", "vd", 1);
                if (acpi_evalf(NULL, &i, "\\VCDC", "d"))
                        status |= 0x02 * i;
@@ -693,9 +834,10 @@ static int video_autosw(void)
 {
        int autosw = 0;
-        if (video_supported == VIDEO_570)
+        if (video_supported == IBMACPI_VIDEO_570)
                acpi_evalf(vid_handle, &autosw, "SWIT", "d");
-        else if (video_supported == VIDEO_770 || video_supported == VIDEO_NEW)
+        else if (video_supported == IBMACPI_VIDEO_770 ||
+                 video_supported == IBMACPI_VIDEO_NEW)
                acpi_evalf(vid_handle, &autosw, "^VDEE", "d");
        return autosw & 1;
@@ -715,12 +857,12 @@ static int video_read(char *p)
        len += sprintf(p + len, "status:\t\tsupported\n");
        len += sprintf(p + len, "lcd:\t\t%s\n", enabled(status, 0));
        len += sprintf(p + len, "crt:\t\t%s\n", enabled(status, 1));
-        if (video_supported == VIDEO_NEW)
+        if (video_supported == IBMACPI_VIDEO_NEW)
                len += sprintf(p + len, "dvi:\t\t%s\n", enabled(status, 3));
        len += sprintf(p + len, "auto:\t\t%s\n", enabled(autosw, 0));
        len += sprintf(p + len, "commands:\tlcd_enable, lcd_disable\n");
        len += sprintf(p + len, "commands:\tcrt_enable, crt_disable\n");
-        if (video_supported == VIDEO_NEW)
+        if (video_supported == IBMACPI_VIDEO_NEW)
                len += sprintf(p + len, "commands:\tdvi_enable, dvi_disable\n");
        len += sprintf(p + len, "commands:\tauto_enable, auto_disable\n");
        len += sprintf(p + len, "commands:\tvideo_switch, expand_toggle\n");
@@ -735,7 +877,7 @@ static int video_switch(void)
        if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", 1))
                return -EIO;
-        ret = video_supported == VIDEO_570 ?
+        ret = video_supported == IBMACPI_VIDEO_570 ?
            acpi_evalf(ec_handle, NULL, "_Q16", "v") :
            acpi_evalf(vid_handle, NULL, "VSWT", "v");
        acpi_evalf(vid_handle, NULL, "_DOS", "vd", autosw);
@@ -745,9 +887,9 @@ static int video_switch(void)
 static int video_expand(void)
 {
-        if (video_supported == VIDEO_570)
+        if (video_supported == IBMACPI_VIDEO_570)
                return acpi_evalf(ec_handle, NULL, "_Q17", "v");
-        else if (video_supported == VIDEO_770)
+        else if (video_supported == IBMACPI_VIDEO_770)
                return acpi_evalf(vid_handle, NULL, "VEXP", "v");
        else
                return acpi_evalf(NULL, NULL, "\\VEXP", "v");
@@ -757,10 +899,10 @@ static int video_switch2(int status)
 {
        int ret;
-        if (video_supported == VIDEO_570) {
+        if (video_supported == IBMACPI_VIDEO_570) {
                ret = acpi_evalf(NULL, NULL,
                                 "\\_SB.PHS2", "vdd", 0x8b, status | 0x80);
-        } else if (video_supported == VIDEO_770) {
+        } else if (video_supported == IBMACPI_VIDEO_770) {
                int autosw = video_autosw();
                if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", 1))
                        return -EIO;
@@ -796,10 +938,10 @@ static int video_write(char *buf)
                        enable |= 0x02;
                } else if (strlencmp(cmd, "crt_disable") == 0) {
                        disable |= 0x02;
-                } else if (video_supported == VIDEO_NEW &&
+                } else if (video_supported == IBMACPI_VIDEO_NEW &&
                           strlencmp(cmd, "dvi_enable") == 0) {
                        enable |= 0x08;
-                } else if (video_supported == VIDEO_NEW &&
+                } else if (video_supported == IBMACPI_VIDEO_NEW &&
                           strlencmp(cmd, "dvi_disable") == 0) {
                        disable |= 0x08;
                } else if (strlencmp(cmd, "auto_enable") == 0) {
@@ -907,6 +1049,7 @@ static int _sta(acpi_handle handle)
        return status;
 }
 #ifdef CONFIG_ACPI_IBM_DOCK
 #define dock_docked() (_sta(dock_handle) & 1)
@@ -1094,26 +1237,28 @@ static int cmos_write(char *buf)
        return 0;
 }
-static int led_supported;
+enum led_access_mode {
+        IBMACPI_LED_NONE = 0,
-#define LED_570 1
+        IBMACPI_LED_570,        /* 570 */
-#define LED_OLD 2
+        IBMACPI_LED_OLD,        /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
-#define LED_NEW 3
+        IBMACPI_LED_NEW,        /* all others */
+};
+static enum led_access_mode led_supported;
 static int led_init(void)
 {
        if (!led_handle)
                /* led not supported on R30, R31 */
-                led_supported = 0;
+                led_supported = IBMACPI_LED_NONE;
        else if (strlencmp(led_path, "SLED") == 0)
                /* 570 */
-                led_supported = LED_570;
+                led_supported = IBMACPI_LED_570;
        else if (strlencmp(led_path, "SYSL") == 0)
                /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
-                led_supported = LED_OLD;
+                led_supported = IBMACPI_LED_OLD;
        else
                /* all others */
-                led_supported = LED_NEW;
+                led_supported = IBMACPI_LED_NEW;
        return 0;
 }
@@ -1130,7 +1275,7 @@ static int led_read(char *p)
        }
        len += sprintf(p + len, "status:\t\tsupported\n");
-        if (led_supported == LED_570) {
+        if (led_supported == IBMACPI_LED_570) {
                /* 570 */
                int i, status;
                for (i = 0; i < 8; i++) {
@@ -1179,13 +1324,13 @@ static int led_write(char *buf)
                } else
                        return -EINVAL;
-                if (led_supported == LED_570) {
+                if (led_supported == IBMACPI_LED_570) {
                        /* 570 */
                        led = 1 << led;
                        if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
                                        led, led_sled_arg1[ind]))
                                return -EIO;
-                } else if (led_supported == LED_OLD) {
+                } else if (led_supported == IBMACPI_LED_OLD) {
                        /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */
                        led = 1 << led;
                        ret = ec_write(EC_HLMS, led);
@@ -1272,50 +1417,142 @@ static int acpi_ec_write(int i, u8 v)
        return 1;
 }
-static int thermal_tmp_supported;
+static enum thermal_access_mode thermal_read_mode;
-static int thermal_updt_supported;
 static int thermal_init(void)
 {
-        /* temperatures not supported on 570, G4x, R30, R31, R32 */
+        u8 t, ta1, ta2;
-        thermal_tmp_supported = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
+        int i;
+        int acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
+        if (ibm_thinkpad_ec_found && experimental) {
+                /*
+                 * Direct EC access mode: sensors at registers
+                 * 0x78-0x7F, 0xC0-0xC7.  Registers return 0x00 for
+                 * non-implemented, thermal sensors return 0x80 when
+                 * not available
+                 */
-        /* 600e/x, 770e, 770x */
+                ta1 = ta2 = 0;
-        thermal_updt_supported = acpi_evalf(ec_handle, NULL, "UPDT", "qv");
+                for (i = 0; i < 8; i++) {
+                        if (likely(acpi_ec_read(0x78 + i, &t))) {
+                                ta1 |= t;
+                        } else {
+                                ta1 = 0;
+                                break;
+                        }
+                        if (likely(acpi_ec_read(0xC0 + i, &t))) {
+                                ta2 |= t;
+                        } else {
+                                ta1 = 0;
+                                break;
+                        }
+                }
+                if (ta1 == 0) {
+                        /* This is sheer paranoia, but we handle it anyway */
+                        if (acpi_tmp7) {
+                                printk(IBM_ERR
+                                       "ThinkPad ACPI EC access misbehaving, "
+                                       "falling back to ACPI TMPx access mode\n");
+                                thermal_read_mode = IBMACPI_THERMAL_ACPI_TMP07;
+                        } else {
+                                printk(IBM_ERR
+                                       "ThinkPad ACPI EC access misbehaving, "
+                                       "disabling thermal sensors access\n");
+                                thermal_read_mode = IBMACPI_THERMAL_NONE;
+                        }
+                } else {
+                        thermal_read_mode =
+                            (ta2 != 0) ?
+                            IBMACPI_THERMAL_TPEC_16 : IBMACPI_THERMAL_TPEC_8;
+                }
+        } else if (acpi_tmp7) {
+                if (acpi_evalf(ec_handle, NULL, "UPDT", "qv")) {
+                        /* 600e/x, 770e, 770x */
+                        thermal_read_mode = IBMACPI_THERMAL_ACPI_UPDT;
+                } else {
+                        /* Standard ACPI TMPx access, max 8 sensors */
+                        thermal_read_mode = IBMACPI_THERMAL_ACPI_TMP07;
+                }
+        } else {
+                /* temperatures not supported on 570, G4x, R30, R31, R32 */
+                thermal_read_mode = IBMACPI_THERMAL_NONE;
+        }
        return 0;
 }
-static int thermal_read(char *p)
+static int thermal_get_sensors(struct ibm_thermal_sensors_struct *s)
 {
-        int len = 0;
+        int i, t;
+        s8 tmp;
+        char tmpi[] = "TMPi";
-        if (!thermal_tmp_supported)
+        if (!s)
-                len += sprintf(p + len, "temperatures:\tnot supported\n");
+                return -EINVAL;
-        else {
-                int i, t;
-                char tmpi[] = "TMPi";
-                s8 tmp[8];
-                if (thermal_updt_supported)
+        switch (thermal_read_mode) {
-                        if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
+#if IBMACPI_MAX_THERMAL_SENSORS >= 16
+        case IBMACPI_THERMAL_TPEC_16:
+                for (i = 0; i < 8; i++) {
+                        if (!acpi_ec_read(0xC0 + i, &tmp))
+                                return -EIO;
+                        s->temp[i + 8] = tmp * 1000;
+                }
+                /* fallthrough */
+#endif
+        case IBMACPI_THERMAL_TPEC_8:
+                for (i = 0; i < 8; i++) {
+                        if (!acpi_ec_read(0x78 + i, &tmp))
                                return -EIO;
+                        s->temp[i] = tmp * 1000;
+                }
+                return (thermal_read_mode == IBMACPI_THERMAL_TPEC_16) ? 16 : 8;
+        case IBMACPI_THERMAL_ACPI_UPDT:
+                if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
+                        return -EIO;
                for (i = 0; i < 8; i++) {
                        tmpi[3] = '0' + i;
                        if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
                                return -EIO;
-                        if (thermal_updt_supported)
+                        s->temp[i] = (t - 2732) * 100;
-                                tmp[i] = (t - 2732 + 5) / 10;
-                        else
-                                tmp[i] = t;
                }
+                return 8;
-                len += sprintf(p + len,
+        case IBMACPI_THERMAL_ACPI_TMP07:
-                               "temperatures:\t%d %d %d %d %d %d %d %d\n",
+                for (i = 0; i < 8; i++) {
-                               tmp[0], tmp[1], tmp[2], tmp[3],
+                        tmpi[3] = '0' + i;
-                               tmp[4], tmp[5], tmp[6], tmp[7]);
+                        if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
+                                return -EIO;
+                        s->temp[i] = t * 1000;
+                }
+                return 8;
+        case IBMACPI_THERMAL_NONE:
+        default:
+                return 0;
        }
+}
+static int thermal_read(char *p)
+{
+        int len = 0;
+        int n, i;
+        struct ibm_thermal_sensors_struct t;
+        n = thermal_get_sensors(&t);
+        if (unlikely(n < 0))
+                return n;
+        len += sprintf(p + len, "temperatures:\t");
+        if (n > 0) {
+                for (i = 0; i < (n - 1); i++)
+                        len += sprintf(p + len, "%d ", t.temp[i] / 1000);
+                len += sprintf(p + len, "%d\n", t.temp[i] / 1000);
+        } else
+                len += sprintf(p + len, "not supported\n");
        return len;
 }
@@ -1381,12 +1618,23 @@ static int ecdump_write(char *buf)
 static int brightness_offset = 0x31;
+static int brightness_get(struct backlight_device *bd)
+{
+        u8 level;
+        if (!acpi_ec_read(brightness_offset, &level))
+                return -EIO;
+        level &= 0x7;
+        return level;
+}
 static int brightness_read(char *p)
 {
        int len = 0;
-        u8 level;
+        int level;
-        if (!acpi_ec_read(brightness_offset, &level)) {
+        if ((level = brightness_get(NULL)) < 0) {
                len += sprintf(p + len, "level:\t\tunreadable\n");
        } else {
                len += sprintf(p + len, "level:\t\t%d\n", level & 0x7);
@@ -1401,16 +1649,34 @@ static int brightness_read(char *p)
 #define BRIGHTNESS_UP   4
 #define BRIGHTNESS_DOWN 5
-static int brightness_write(char *buf)
+static int brightness_set(int value)
 {
        int cmos_cmd, inc, i;
-        u8 level;
+        int current_value = brightness_get(NULL);
+        value &= 7;
+        cmos_cmd = value > current_value ? BRIGHTNESS_UP : BRIGHTNESS_DOWN;
+        inc = value > current_value ? 1 : -1;
+        for (i = current_value; i != value; i += inc) {
+                if (!cmos_eval(cmos_cmd))
+                        return -EIO;
+                if (!acpi_ec_write(brightness_offset, i + inc))
+                        return -EIO;
+        }
+        return 0;
+}
+static int brightness_write(char *buf)
+{
+        int level;
        int new_level;
        char *cmd;
        while ((cmd = next_cmd(&buf))) {
-                if (!acpi_ec_read(brightness_offset, &level))
+                if ((level = brightness_get(NULL)) < 0)
-                        return -EIO;
+                        return level;
                level &= 7;
                if (strlencmp(cmd, "up") == 0) {
@@ -1423,19 +1689,44 @@ static int brightness_write(char *buf)
                } else
                        return -EINVAL;
-                cmos_cmd = new_level > level ? BRIGHTNESS_UP : BRIGHTNESS_DOWN;
+                brightness_set(new_level);
-                inc = new_level > level ? 1 : -1;
+        }
-                for (i = level; i != new_level; i += inc) {
-                        if (!cmos_eval(cmos_cmd))
+        return 0;
-                                return -EIO;
+}
-                        if (!acpi_ec_write(brightness_offset, i + inc))
-                                return -EIO;
+static int brightness_update_status(struct backlight_device *bd)
-                }
+{
+        return brightness_set(bd->props->brightness);
+}
+static struct backlight_properties ibm_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = brightness_get,
+        .update_status  = brightness_update_status,
+        .max_brightness = 7,
+};
+static int brightness_init(void)
+{
+        ibm_backlight_device = backlight_device_register("ibm", NULL, NULL,
+                                                         &ibm_backlight_data);
+        if (IS_ERR(ibm_backlight_device)) {
+                printk(IBM_ERR "Could not register backlight device\n");
+                return PTR_ERR(ibm_backlight_device);
        }
        return 0;
 }
+static void brightness_exit(void)
+{
+        if (ibm_backlight_device) {
+                backlight_device_unregister(ibm_backlight_device);
+                ibm_backlight_device = NULL;
+        }
+}
 static int volume_offset = 0x30;
 static int volume_read(char *p)
@@ -1522,90 +1813,486 @@ static int volume_write(char *buf)
        return 0;
 }
-static int fan_status_offset = 0x2f;
+static enum fan_status_access_mode fan_status_access_mode;
-static int fan_rpm_offset = 0x84;
+static enum fan_control_access_mode fan_control_access_mode;
+static enum fan_control_commands fan_control_commands;
-static int fan_read(char *p)
+static int fan_control_status_known;
+static u8 fan_control_initial_status;
+static void fan_watchdog_fire(struct work_struct *ignored);
+static int fan_watchdog_maxinterval;
+static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);
+static int fan_init(void)
 {
-        int len = 0;
+        fan_status_access_mode = IBMACPI_FAN_NONE;
-        int s;
+        fan_control_access_mode = IBMACPI_FAN_WR_NONE;
-        u8 lo, hi, status;
+        fan_control_commands = 0;
+        fan_control_status_known = 1;
+        fan_watchdog_maxinterval = 0;
        if (gfan_handle) {
                /* 570, 600e/x, 770e, 770x */
-                if (!acpi_evalf(gfan_handle, &s, NULL, "d"))
+                fan_status_access_mode = IBMACPI_FAN_RD_ACPI_GFAN;
-                        return -EIO;
+        } else {
+                /* all other ThinkPads: note that even old-style
+                 * ThinkPad ECs supports the fan control register */
+                if (likely(acpi_ec_read(fan_status_offset,
+                                        &fan_control_initial_status))) {
+                        fan_status_access_mode = IBMACPI_FAN_RD_TPEC;
+                        /* In some ThinkPads, neither the EC nor the ACPI
+                         * DSDT initialize the fan status, and it ends up
+                         * being set to 0x07 when it *could* be either
+                         * 0x07 or 0x80.
+                         *
+                         * Enable for TP-1Y (T43), TP-78 (R51e),
+                         * TP-76 (R52), TP-70 (T43, R52), which are known
+                         * to be buggy. */
+                        if (fan_control_initial_status == 0x07 &&
+                            ibm_thinkpad_ec_found &&
+                            ((ibm_thinkpad_ec_found[0] == '1' &&
+                              ibm_thinkpad_ec_found[1] == 'Y') ||
+                             (ibm_thinkpad_ec_found[0] == '7' &&
+                              (ibm_thinkpad_ec_found[1] == '6' ||
+                               ibm_thinkpad_ec_found[1] == '8' ||
+                               ibm_thinkpad_ec_found[1] == '0'))
+                            )) {
+                                printk(IBM_NOTICE
+                                       "fan_init: initial fan status is "
+                                       "unknown, assuming it is in auto "
+                                       "mode\n");
+                                fan_control_status_known = 0;
+                        }
+                } else {
+                        printk(IBM_ERR
+                               "ThinkPad ACPI EC access misbehaving, "
+                               "fan status and control unavailable\n");
+                        return 0;
+                }
+        }
-                len += sprintf(p + len, "level:\t\t%d\n", s);
+        if (sfan_handle) {
+                /* 570, 770x-JL */
+                fan_control_access_mode = IBMACPI_FAN_WR_ACPI_SFAN;
+                fan_control_commands |=
+                    IBMACPI_FAN_CMD_LEVEL | IBMACPI_FAN_CMD_ENABLE;
        } else {
+                if (!gfan_handle) {
+                        /* gfan without sfan means no fan control */
+                        /* all other models implement TP EC 0x2f control */
+                        if (fans_handle) {
+                                /* X31, X40, X41 */
+                                fan_control_access_mode =
+                                    IBMACPI_FAN_WR_ACPI_FANS;
+                                fan_control_commands |=
+                                    IBMACPI_FAN_CMD_SPEED |
+                                    IBMACPI_FAN_CMD_LEVEL |
+                                    IBMACPI_FAN_CMD_ENABLE;
+                        } else {
+                                fan_control_access_mode = IBMACPI_FAN_WR_TPEC;
+                                fan_control_commands |=
+                                    IBMACPI_FAN_CMD_LEVEL |
+                                    IBMACPI_FAN_CMD_ENABLE;
+                        }
+                }
+        }
+        return 0;
+}
+static int fan_get_status(u8 *status)
+{
+        u8 s;
+        /* TODO:
+         * Add IBMACPI_FAN_RD_ACPI_FANS ? */
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_ACPI_GFAN:
+                /* 570, 600e/x, 770e, 770x */
+                if (unlikely(!acpi_evalf(gfan_handle, &s, NULL, "d")))
+                        return -EIO;
+                if (likely(status))
+                        *status = s & 0x07;
+                break;
+        case IBMACPI_FAN_RD_TPEC:
                /* all except 570, 600e/x, 770e, 770x */
-                if (!acpi_ec_read(fan_status_offset, &status))
+                if (unlikely(!acpi_ec_read(fan_status_offset, &s)))
-                        len += sprintf(p + len, "status:\t\tunreadable\n");
+                        return -EIO;
-                else
-                        len += sprintf(p + len, "status:\t\t%s\n",
-                                       enabled(status, 7));
-                if (!acpi_ec_read(fan_rpm_offset, &lo) ||
+                if (likely(status))
-                    !acpi_ec_read(fan_rpm_offset + 1, &hi))
+                        *status = s;
-                        len += sprintf(p + len, "speed:\t\tunreadable\n");
-                else
+                break;
-                        len += sprintf(p + len, "speed:\t\t%d\n",
-                                       (hi << 8) + lo);
+        default:
+                return -ENXIO;
        }
-        if (sfan_handle)
+        return 0;
-                /* 570, 770x-JL */
+}
-                len += sprintf(p + len, "commands:\tlevel <level>"
-                               " (<level> is 0-7)\n");
+static int fan_get_speed(unsigned int *speed)
-        if (!gfan_handle)
+{
+        u8 hi, lo;
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_TPEC:
                /* all except 570, 600e/x, 770e, 770x */
-                len += sprintf(p + len, "commands:\tenable, disable\n");
+                if (unlikely(!acpi_ec_read(fan_rpm_offset, &lo) ||
-        if (fans_handle)
+                             !acpi_ec_read(fan_rpm_offset + 1, &hi)))
-                /* X31, X40 */
+                        return -EIO;
+                if (likely(speed))
+                        *speed = (hi << 8) | lo;
+                break;
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+static void fan_exit(void)
+{
+        cancel_delayed_work(&fan_watchdog_task);
+        flush_scheduled_work();
+}
+static void fan_watchdog_reset(void)
+{
+        static int fan_watchdog_active = 0;
+        if (fan_watchdog_active)
+                cancel_delayed_work(&fan_watchdog_task);
+        if (fan_watchdog_maxinterval > 0) {
+                fan_watchdog_active = 1;
+                if (!schedule_delayed_work(&fan_watchdog_task,
+                                msecs_to_jiffies(fan_watchdog_maxinterval
+                                                 * 1000))) {
+                        printk(IBM_ERR "failed to schedule the fan watchdog, "
+                               "watchdog will not trigger\n");
+                }
+        } else
+                fan_watchdog_active = 0;
+}
+static int fan_read(char *p)
+{
+        int len = 0;
+        int rc;
+        u8 status;
+        unsigned int speed = 0;
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_ACPI_GFAN:
+                /* 570, 600e/x, 770e, 770x */
+                if ((rc = fan_get_status(&status)) < 0)
+                        return rc;
+                len += sprintf(p + len, "status:\t\t%s\n"
+                               "level:\t\t%d\n",
+                               (status != 0) ? "enabled" : "disabled", status);
+                break;
+        case IBMACPI_FAN_RD_TPEC:
+                /* all except 570, 600e/x, 770e, 770x */
+                if ((rc = fan_get_status(&status)) < 0)
+                        return rc;
+                if (unlikely(!fan_control_status_known)) {
+                        if (status != fan_control_initial_status)
+                                fan_control_status_known = 1;
+                        else
+                                /* Return most likely status. In fact, it
+                                 * might be the only possible status */
+                                status = IBMACPI_FAN_EC_AUTO;
+                }
+                len += sprintf(p + len, "status:\t\t%s\n",
+                               (status != 0) ? "enabled" : "disabled");
+                /* No ThinkPad boots on disengaged mode, we can safely
+                 * assume the tachometer is online if fan control status
+                 * was unknown */
+                if ((rc = fan_get_speed(&speed)) < 0)
+                        return rc;
+                len += sprintf(p + len, "speed:\t\t%d\n", speed);
+                if (status & IBMACPI_FAN_EC_DISENGAGED)
+                        /* Disengaged mode takes precedence */
+                        len += sprintf(p + len, "level:\t\tdisengaged\n");
+                else if (status & IBMACPI_FAN_EC_AUTO)
+                        len += sprintf(p + len, "level:\t\tauto\n");
+                else
+                        len += sprintf(p + len, "level:\t\t%d\n", status);
+                break;
+        case IBMACPI_FAN_NONE:
+        default:
+                len += sprintf(p + len, "status:\t\tnot supported\n");
+        }
+        if (fan_control_commands & IBMACPI_FAN_CMD_LEVEL) {
+                len += sprintf(p + len, "commands:\tlevel <level>");
+                switch (fan_control_access_mode) {
+                case IBMACPI_FAN_WR_ACPI_SFAN:
+                        len += sprintf(p + len, " (<level> is 0-7)\n");
+                        break;
+                default:
+                        len += sprintf(p + len, " (<level> is 0-7, "
+                                       "auto, disengaged)\n");
+                        break;
+                }
+        }
+        if (fan_control_commands & IBMACPI_FAN_CMD_ENABLE)
+                len += sprintf(p + len, "commands:\tenable, disable\n"
+                               "commands:\twatchdog <timeout> (<timeout> is 0 (off), "
+                               "1-120 (seconds))\n");
+        if (fan_control_commands & IBMACPI_FAN_CMD_SPEED)
                len += sprintf(p + len, "commands:\tspeed <speed>"
                               " (<speed> is 0-65535)\n");
        return len;
 }
-static int fan_write(char *buf)
+static int fan_set_level(int level)
 {
-        char *cmd;
+        switch (fan_control_access_mode) {
-        int level, speed;
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if (level >= 0 && level <= 7) {
-        while ((cmd = next_cmd(&buf))) {
-                if (sfan_handle &&
-                    sscanf(cmd, "level %d", &level) == 1 &&
-                    level >= 0 && level <= 7) {
-                        /* 570, 770x-JL */
                        if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
                                return -EIO;
-                } else if (!gfan_handle && strlencmp(cmd, "enable") == 0) {
+                } else
-                        /* all except 570, 600e/x, 770e, 770x */
+                        return -EINVAL;
-                        if (!acpi_ec_write(fan_status_offset, 0x80))
+                break;
-                                return -EIO;
-                } else if (!gfan_handle && strlencmp(cmd, "disable") == 0) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
-                        /* all except 570, 600e/x, 770e, 770x */
+        case IBMACPI_FAN_WR_TPEC:
-                        if (!acpi_ec_write(fan_status_offset, 0x00))
+                if ((level != IBMACPI_FAN_EC_AUTO) &&
-                                return -EIO;
+                    (level != IBMACPI_FAN_EC_DISENGAGED) &&
-                } else if (fans_handle &&
+                    ((level < 0) || (level > 7)))
-                           sscanf(cmd, "speed %d", &speed) == 1 &&
+                        return -EINVAL;
-                           speed >= 0 && speed <= 65535) {
-                        /* X31, X40 */
+                if (!acpi_ec_write(fan_status_offset, level))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+static int fan_set_enable(void)
+{
+        u8 s;
+        int rc;
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+        case IBMACPI_FAN_WR_TPEC:
+                if ((rc = fan_get_status(&s)) < 0)
+                        return rc;
+                /* Don't go out of emergency fan mode */
+                if (s != 7)
+                        s = IBMACPI_FAN_EC_AUTO;
+                if (!acpi_ec_write(fan_status_offset, s))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if ((rc = fan_get_status(&s)) < 0)
+                        return rc;
+                s &= 0x07;
+                /* Set fan to at least level 4 */
+                if (s < 4)
+                        s = 4;
+                if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", s))
+                        return -EIO;
+                break;
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+static int fan_set_disable(void)
+{
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+        case IBMACPI_FAN_WR_TPEC:
+                if (!acpi_ec_write(fan_status_offset, 0x00))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", 0x00))
+                        return -EIO;
+                break;
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+static int fan_set_speed(int speed)
+{
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+                if (speed >= 0 && speed <= 65535) {
                        if (!acpi_evalf(fans_handle, NULL, NULL, "vddd",
                                        speed, speed, speed))
                                return -EIO;
                } else
                        return -EINVAL;
-        }
+                break;
+        default:
+                return -ENXIO;
+        }
        return 0;
 }
+static int fan_write_cmd_level(const char *cmd, int *rc)
+{
+        int level;
+        if (strlencmp(cmd, "level auto") == 0)
+                level = IBMACPI_FAN_EC_AUTO;
+        else if (strlencmp(cmd, "level disengaged") == 0)
+                level = IBMACPI_FAN_EC_DISENGAGED;
+        else if (sscanf(cmd, "level %d", &level) != 1)
+                return 0;
+        if ((*rc = fan_set_level(level)) == -ENXIO)
+                printk(IBM_ERR "level command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+        return 1;
+}
+static int fan_write_cmd_enable(const char *cmd, int *rc)
+{
+        if (strlencmp(cmd, "enable") != 0)
+                return 0;
+        if ((*rc = fan_set_enable()) == -ENXIO)
+                printk(IBM_ERR "enable command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+        return 1;
+}
+static int fan_write_cmd_disable(const char *cmd, int *rc)
+{
+        if (strlencmp(cmd, "disable") != 0)
+                return 0;
+        if ((*rc = fan_set_disable()) == -ENXIO)
+                printk(IBM_ERR "disable command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+        return 1;
+}
+static int fan_write_cmd_speed(const char *cmd, int *rc)
+{
+        int speed;
+        /* TODO:
+         * Support speed <low> <medium> <high> ? */
+        if (sscanf(cmd, "speed %d", &speed) != 1)
+                return 0;
+        if ((*rc = fan_set_speed(speed)) == -ENXIO)
+                printk(IBM_ERR "speed command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+        return 1;
+}
+static int fan_write_cmd_watchdog(const char *cmd, int *rc)
+{
+        int interval;
+        if (sscanf(cmd, "watchdog %d", &interval) != 1)
+                return 0;
+        if (interval < 0 || interval > 120)
+                *rc = -EINVAL;
+        else
+                fan_watchdog_maxinterval = interval;
+        return 1;
+}
+static int fan_write(char *buf)
+{
+        char *cmd;
+        int rc = 0;
+        while (!rc && (cmd = next_cmd(&buf))) {
+                if (!((fan_control_commands & IBMACPI_FAN_CMD_LEVEL) &&
+                      fan_write_cmd_level(cmd, &rc)) &&
+                    !((fan_control_commands & IBMACPI_FAN_CMD_ENABLE) &&
+                      (fan_write_cmd_enable(cmd, &rc) ||
+                       fan_write_cmd_disable(cmd, &rc) ||
+                       fan_write_cmd_watchdog(cmd, &rc))) &&
+                    !((fan_control_commands & IBMACPI_FAN_CMD_SPEED) &&
+                      fan_write_cmd_speed(cmd, &rc))
+                    )
+                        rc = -EINVAL;
+                else if (!rc)
+                        fan_watchdog_reset();
+        }
+        return rc;
+}
+static void fan_watchdog_fire(struct work_struct *ignored)
+{
+        printk(IBM_NOTICE "fan watchdog: enabling fan\n");
+        if (fan_set_enable()) {
+                printk(IBM_ERR "fan watchdog: error while enabling fan\n");
+                /* reschedule for later */
+                fan_watchdog_reset();
+        }
+}
 static struct ibm_struct ibms[] = {
        {
         .name = "driver",
-         .init = driver_init,
+         .init = ibm_acpi_driver_init,
         .read = driver_read,
         },
        {
@@ -1702,6 +2389,8 @@ static struct ibm_struct ibms[] = {
         .name = "brightness",
         .read = brightness_read,
         .write = brightness_write,
+         .init = brightness_init,
+         .exit = brightness_exit,
         },
        {
         .name = "volume",
@@ -1712,6 +2401,8 @@ static struct ibm_struct ibms[] = {
         .name = "fan",
         .read = fan_read,
         .write = fan_write,
+         .init = fan_init,
+         .exit = fan_exit,
         .experimental = 1,
         },
 };
@@ -1719,7 +2410,7 @@ static struct ibm_struct ibms[] = {
 static int dispatch_read(char *page, char **start, off_t off, int count,
                         int *eof, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
        int len;
        if (!ibm || !ibm->read)
@@ -1744,7 +2435,7 @@ static int dispatch_read(char *page, char **start, off_t off, int count,
 static int dispatch_write(struct file *file, const char __user * userbuf,
                          unsigned long count, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
        char *kernbuf;
        int ret;
@@ -1773,7 +2464,7 @@ static int dispatch_write(struct file *file, const char __user * userbuf,
 static void dispatch_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
        if (!ibm || !ibm->notify)
                return;
@@ -1805,7 +2496,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
                       ibm->name, status);
                return -ENODEV;
        }
+        ibm->notify_installed = 1;
        return 0;
 }
@@ -1818,14 +2509,13 @@ static int __init register_driver(struct ibm_struct *ibm)
 {
        int ret;
-        ibm->driver = kmalloc(sizeof(struct acpi_driver), GFP_KERNEL);
+        ibm->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
        if (!ibm->driver) {
                printk(IBM_ERR "kmalloc(ibm->driver) failed\n");
                return -1;
        }
-        memset(ibm->driver, 0, sizeof(struct acpi_driver));
+        sprintf(ibm->driver->name, "%s_%s", IBM_NAME, ibm->name);
-        sprintf(ibm->driver->name, "%s/%s", IBM_NAME, ibm->name);
        ibm->driver->ids = ibm->hid;
        ibm->driver->ops.add = &ibm_device_add;
@@ -1882,7 +2572,6 @@ static int __init ibm_init(struct ibm_struct *ibm)
                ret = setup_notify(ibm);
                if (ret < 0)
                        return ret;
-                ibm->notify_installed = 1;
        }
        return 0;
@@ -1971,6 +2660,33 @@ static void acpi_ibm_exit(void)
                ibm_exit(&ibms[i]);
        remove_proc_entry(IBM_DIR, acpi_root_dir);
+        if (ibm_thinkpad_ec_found)
+                kfree(ibm_thinkpad_ec_found);
+}
+static char* __init check_dmi_for_ec(void)
+{
+        struct dmi_device *dev = NULL;
+        char ec_fw_string[18];
+        /*
+         * ThinkPad T23 or newer, A31 or newer, R50e or newer,
+         * X32 or newer, all Z series;  Some models must have an
+         * up-to-date BIOS or they will not be detected.
+         *
+         * See http://thinkwiki.org/wiki/List_of_DMI_IDs
+         */
+        while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
+                if (sscanf(dev->name,
+                           "IBM ThinkPad Embedded Controller -[%17c",
+                           ec_fw_string) == 1) {
+                        ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
+                        ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
+                        return kstrdup(ec_fw_string, GFP_KERNEL);
+                }
+        }
+        return NULL;
 }
 static int __init acpi_ibm_init(void)
@@ -1992,6 +2708,12 @@ static int __init acpi_ibm_init(void)
                return -ENODEV;
        }
+        /* Models with newer firmware report the EC in DMI */
+        ibm_thinkpad_ec_found = check_dmi_for_ec();
+        if (ibm_thinkpad_ec_found)
+                printk(IBM_INFO "ThinkPad EC firmware %s\n",
+                       ibm_thinkpad_ec_found);
        /* these handles are not required */
        IBM_HANDLE_INIT(vid);
        IBM_HANDLE_INIT(vid2);
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index bedb5118e312..8f13b4f3e906 100644
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -124,41 +124,41 @@ static void __init acpi_request_region (struct acpi_generic_address *addr,
        if (!addr->address || !length)
                return;
-        if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+        if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
                request_region(addr->address, length, desc);
-        else if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+        else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
                request_mem_region(addr->address, length, desc);
 }
 static void __init acpi_reserve_resources(void)
 {
-        acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk,
+        acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block,
-                               acpi_gbl_FADT->pm1_evt_len, "ACPI PM1a_EVT_BLK");
+                               acpi_gbl_FADT.pm1_event_length, "ACPI PM1a_EVT_BLK");
-        acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk,
+        acpi_request_region(&acpi_gbl_FADT.xpm1b_event_block,
-                               acpi_gbl_FADT->pm1_evt_len, "ACPI PM1b_EVT_BLK");
+                               acpi_gbl_FADT.pm1_event_length, "ACPI PM1b_EVT_BLK");
-        acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk,
+        acpi_request_region(&acpi_gbl_FADT.xpm1a_control_block,
-                               acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1a_CNT_BLK");
+                               acpi_gbl_FADT.pm1_control_length, "ACPI PM1a_CNT_BLK");
-        acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk,
+        acpi_request_region(&acpi_gbl_FADT.xpm1b_control_block,
-                               acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1b_CNT_BLK");
+                               acpi_gbl_FADT.pm1_control_length, "ACPI PM1b_CNT_BLK");
-        if (acpi_gbl_FADT->pm_tm_len == 4)
+        if (acpi_gbl_FADT.pm_timer_length == 4)
-                acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "ACPI PM_TMR");
+                acpi_request_region(&acpi_gbl_FADT.xpm_timer_block, 4, "ACPI PM_TMR");
-        acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk,
+        acpi_request_region(&acpi_gbl_FADT.xpm2_control_block,
-                               acpi_gbl_FADT->pm2_cnt_len, "ACPI PM2_CNT_BLK");
+                               acpi_gbl_FADT.pm2_control_length, "ACPI PM2_CNT_BLK");
        /* Length of GPE blocks must be a non-negative multiple of 2 */
-        if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1))
+        if (!(acpi_gbl_FADT.gpe0_block_length & 0x1))
-                acpi_request_region(&acpi_gbl_FADT->xgpe0_blk,
+                acpi_request_region(&acpi_gbl_FADT.xgpe0_block,
-                               acpi_gbl_FADT->gpe0_blk_len, "ACPI GPE0_BLK");
+                               acpi_gbl_FADT.gpe0_block_length, "ACPI GPE0_BLK");
-        if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1))
+        if (!(acpi_gbl_FADT.gpe1_block_length & 0x1))
-                acpi_request_region(&acpi_gbl_FADT->xgpe1_blk,
+                acpi_request_region(&acpi_gbl_FADT.xgpe1_block,
-                               acpi_gbl_FADT->gpe1_blk_len, "ACPI GPE1_BLK");
+                               acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK");
 }
 static int __init acpi_motherboard_init(void)
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index c1c6c236df9a..57faf598bad8 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -195,31 +195,27 @@ acpi_status acpi_ns_root_initialize(void)
                                obj_desc->mutex.sync_level =
                                    (u8) (ACPI_TO_INTEGER(val) - 1);
-                                if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
+                                /* Create a mutex */
-                                        /* Create a counting semaphore for the global lock */
+                                status =
+                                    acpi_os_create_mutex(&obj_desc->mutex.
+                                                         os_mutex);
+                                if (ACPI_FAILURE(status)) {
+                                        acpi_ut_remove_reference(obj_desc);
+                                        goto unlock_and_exit;
+                                }
-                                        status =
+                                /* Special case for ACPI Global Lock */
-                                            acpi_os_create_semaphore
-                                            (ACPI_NO_UNIT_LIMIT, 1,
-                                             &acpi_gbl_global_lock_semaphore);
-                                        if (ACPI_FAILURE(status)) {
-                                                acpi_ut_remove_reference
-                                                    (obj_desc);
-                                                goto unlock_and_exit;
-                                        }
-                                        /* Mark this mutex as very special */
+                                if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
+                                        acpi_gbl_global_lock_mutex =
+                                            obj_desc->mutex.os_mutex;
-                                        obj_desc->mutex.os_mutex =
+                                        /* Create additional counting semaphore for global lock */
-                                            ACPI_GLOBAL_LOCK;
-                                } else {
-                                        /* Create a mutex */
                                        status =
-                                            acpi_os_create_mutex(&obj_desc->
+                                            acpi_os_create_semaphore(1, 0,
-                                                                 mutex.
+                                                                     &acpi_gbl_global_lock_semaphore);
-                                                                 os_mutex);
                                        if (ACPI_FAILURE(status)) {
                                                acpi_ut_remove_reference
                                                    (obj_desc);
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 55b407aae266..1d693d8ad2d8 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,9 @@ ACPI_MODULE_NAME("nsalloc")
 struct acpi_namespace_node *acpi_ns_create_node(u32 name)
 {
        struct acpi_namespace_node *node;
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+        u32 temp;
+#endif
        ACPI_FUNCTION_TRACE(ns_create_node);
@@ -71,6 +74,15 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
        ACPI_MEM_TRACKING(acpi_gbl_ns_node_list->total_allocated++);
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+        temp =
+            acpi_gbl_ns_node_list->total_allocated -
+            acpi_gbl_ns_node_list->total_freed;
+        if (temp > acpi_gbl_ns_node_list->max_occupied) {
+                acpi_gbl_ns_node_list->max_occupied = temp;
+        }
+#endif
        node->name.integer = name;
        ACPI_SET_DESCRIPTOR_TYPE(node, ACPI_DESC_TYPE_NAMED);
        return_PTR(node);
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index d72df66aa965..1fc4f86676e1 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -205,7 +205,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
                        this_node->name.integer =
-                            acpi_ut_repair_name(this_node->name.integer);
+                            acpi_ut_repair_name(this_node->name.ascii);
                        ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
                                      this_node->name.integer));
@@ -226,6 +226,12 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
        obj_desc = acpi_ns_get_attached_object(this_node);
        acpi_dbg_level = dbg_level;
+        /* Temp nodes are those nodes created by a control method */
+        if (this_node->flags & ANOBJ_TEMPORARY) {
+                acpi_os_printf("(T) ");
+        }
        switch (info->display_type & ACPI_DISPLAY_MASK) {
        case ACPI_DISPLAY_SUMMARY:
@@ -623,7 +629,8 @@ acpi_ns_dump_objects(acpi_object_type type,
        info.display_type = display_type;
        (void)acpi_ns_walk_namespace(type, start_handle, max_depth,
-                                     ACPI_NS_WALK_NO_UNLOCK,
+                                     ACPI_NS_WALK_NO_UNLOCK |
+                                     ACPI_NS_WALK_TEMP_NODES,
                                     acpi_ns_dump_one_object, (void *)&info,
                                     NULL);
 }
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index c6bf5d30fca3..5097e167939e 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 4b0a4a8c9843..aa6370c67ec1 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -154,11 +154,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * Execute the method via the interpreter. The interpreter is locked
                 * here before calling into the AML parser
                 */
-                status = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
                status = acpi_ps_execute_method(info);
                acpi_ex_exit_interpreter();
        } else {
@@ -182,10 +178,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * resolution, we must lock it because we could access an opregion.
                 * The opregion access code assumes that the interpreter is locked.
                 */
-                status = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
                /* Function has a strange interface */
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index aec8488c0019..326af8fc0ce7 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -213,7 +213,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                        u32 level, void *context, void **return_value)
 {
        acpi_object_type type;
-        acpi_status status;
+        acpi_status status = AE_OK;
        struct acpi_init_walk_info *info =
            (struct acpi_init_walk_info *)context;
        struct acpi_namespace_node *node =
@@ -267,10 +267,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
        /*
         * Must lock the interpreter before executing AML code
         */
-        status = acpi_ex_enter_interpreter();
+        acpi_ex_enter_interpreter();
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
        /*
         * Each of these types can contain executable AML code within the
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index fe75d888e183..d4f9654fd20f 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,12 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsload")
 /* Local prototypes */
-static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type);
 #ifdef ACPI_FUTURE_IMPLEMENTATION
 acpi_status acpi_ns_unload_namespace(acpi_handle handle);
@@ -62,7 +61,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
 *
 * FUNCTION:    acpi_ns_load_table
 *
- * PARAMETERS:  table_desc      - Descriptor for table to be loaded
+ * PARAMETERS:  table_index     - Index for table to be loaded
 *              Node            - Owning NS node
 *
 * RETURN:      Status
@@ -72,42 +71,13 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
 ******************************************************************************/
 acpi_status
-acpi_ns_load_table(struct acpi_table_desc *table_desc,
+acpi_ns_load_table(acpi_native_uint table_index,
                   struct acpi_namespace_node *node)
 {
        acpi_status status;
        ACPI_FUNCTION_TRACE(ns_load_table);
-        /* Check if table contains valid AML (must be DSDT, PSDT, SSDT, etc.) */
-        if (!
-            (acpi_gbl_table_data[table_desc->type].
-             flags & ACPI_TABLE_EXECUTABLE)) {
-                /* Just ignore this table */
-                return_ACPI_STATUS(AE_OK);
-        }
-        /* Check validity of the AML start and length */
-        if (!table_desc->aml_start) {
-                ACPI_ERROR((AE_INFO, "Null AML pointer"));
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AML block at %p\n",
-                          table_desc->aml_start));
-        /* Ignore table if there is no AML contained within */
-        if (!table_desc->aml_length) {
-                ACPI_WARNING((AE_INFO, "Zero-length AML block in table [%4.4s]",
-                              table_desc->pointer->signature));
-                return_ACPI_STATUS(AE_OK);
-        }
        /*
         * Parse the table and load the namespace with all named
         * objects found within.  Control methods are NOT parsed
@@ -117,15 +87,34 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         * to another control method, we can't continue parsing
         * because we don't know how many arguments to parse next!
         */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        /* If table already loaded into namespace, just return */
+        if (acpi_tb_is_table_loaded(table_index)) {
+                status = AE_ALREADY_EXISTS;
+                goto unlock;
+        }
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "**** Loading table into namespace ****\n"));
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        status = acpi_tb_allocate_owner_id(table_index);
        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                goto unlock;
+        }
+        status = acpi_ns_parse_table(table_index, node->child);
+        if (ACPI_SUCCESS(status)) {
+                acpi_tb_set_table_loaded_flag(table_index, TRUE);
+        } else {
+                acpi_tb_release_owner_id(table_index);
        }
-        status = acpi_ns_parse_table(table_desc, node->child);
+      unlock:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
@@ -141,7 +130,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "**** Begin Table Method Parsing and Object Initialization ****\n"));
-        status = acpi_ds_initialize_objects(table_desc, node);
+        status = acpi_ds_initialize_objects(table_index, node);
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "**** Completed Table Method Parsing and Object Initialization ****\n"));
@@ -149,99 +138,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
        return_ACPI_STATUS(status);
 }
-/*******************************************************************************
+#ifdef ACPI_OBSOLETE_FUNCTIONS
- *
- * FUNCTION:    acpi_ns_load_table_by_type
- *
- * PARAMETERS:  table_type          - Id of the table type to load
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load an ACPI table or tables into the namespace.  All tables
- *              of the given type are loaded.  The mechanism allows this
- *              routine to be called repeatedly.
- *
- ******************************************************************************/
-static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)
-{
-        u32 i;
-        acpi_status status;
-        struct acpi_table_desc *table_desc;
-        ACPI_FUNCTION_TRACE(ns_load_table_by_type);
-        status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /*
-         * Table types supported are:
-         * DSDT (one), SSDT/PSDT (multiple)
-         */
-        switch (table_type) {
-        case ACPI_TABLE_ID_DSDT:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace load: DSDT\n"));
-                table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_DSDT].next;
-                /* If table already loaded into namespace, just return */
-                if (table_desc->loaded_into_namespace) {
-                        goto unlock_and_exit;
-                }
-                /* Now load the single DSDT */
-                status = acpi_ns_load_table(table_desc, acpi_gbl_root_node);
-                if (ACPI_SUCCESS(status)) {
-                        table_desc->loaded_into_namespace = TRUE;
-                }
-                break;
-        case ACPI_TABLE_ID_SSDT:
-        case ACPI_TABLE_ID_PSDT:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Namespace load: %d SSDT or PSDTs\n",
-                                  acpi_gbl_table_lists[table_type].count));
-                /*
-                 * Traverse list of SSDT or PSDT tables
-                 */
-                table_desc = acpi_gbl_table_lists[table_type].next;
-                for (i = 0; i < acpi_gbl_table_lists[table_type].count; i++) {
-                        /*
-                         * Only attempt to load table into namespace if it is not
-                         * already loaded!
-                         */
-                        if (!table_desc->loaded_into_namespace) {
-                                status =
-                                    acpi_ns_load_table(table_desc,
-                                                       acpi_gbl_root_node);
-                                if (ACPI_FAILURE(status)) {
-                                        break;
-                                }
-                                table_desc->loaded_into_namespace = TRUE;
-                        }
-                        table_desc = table_desc->next;
-                }
-                break;
-        default:
-                status = AE_SUPPORT;
-                break;
-        }
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
-}
 /*******************************************************************************
 *
 * FUNCTION:    acpi_load_namespace
@@ -288,6 +185,7 @@ acpi_status acpi_ns_load_namespace(void)
        return_ACPI_STATUS(status);
 }
+#endif
 #ifdef ACPI_FUTURE_IMPLEMENTATION
 /*******************************************************************************
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 97b8332c9746..cbd94af08cc5 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index aabe8794b908..d9d7377bc6e6 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 155505a4ef69..e696aa847990 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
@@ -62,14 +63,24 @@ ACPI_MODULE_NAME("nsparse")
 *
 ******************************************************************************/
 acpi_status
-acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc *table_desc)
+acpi_ns_one_complete_parse(acpi_native_uint pass_number,
+                           acpi_native_uint table_index)
 {
        union acpi_parse_object *parse_root;
        acpi_status status;
+        acpi_native_uint aml_length;
+        u8 *aml_start;
        struct acpi_walk_state *walk_state;
+        struct acpi_table_header *table;
+        acpi_owner_id owner_id;
        ACPI_FUNCTION_TRACE(ns_one_complete_parse);
+        status = acpi_tb_get_owner_id(table_index, &owner_id);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
        /* Create and init a Root Node */
        parse_root = acpi_ps_create_scope_op();
@@ -79,26 +90,41 @@ acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc *table_desc)
        /* Create and initialize a new walk state */
-        walk_state = acpi_ds_create_walk_state(table_desc->owner_id,
+        walk_state = acpi_ds_create_walk_state(owner_id, NULL, NULL, NULL);
-                                               NULL, NULL, NULL);
        if (!walk_state) {
                acpi_ps_free_op(parse_root);
                return_ACPI_STATUS(AE_NO_MEMORY);
        }
-        status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
+        status = acpi_get_table_by_index(table_index, &table);
-                                       table_desc->aml_start,
+        if (ACPI_FAILURE(status)) {
-                                       table_desc->aml_length, NULL,
+                acpi_ds_delete_walk_state(walk_state);
-                                       pass_number);
+                acpi_ps_free_op(parse_root);
+                return_ACPI_STATUS(status);
+        }
+        /* Table must consist of at least a complete header */
+        if (table->length < sizeof(struct acpi_table_header)) {
+                status = AE_BAD_HEADER;
+        } else {
+                aml_start = (u8 *) table + sizeof(struct acpi_table_header);
+                aml_length = table->length - sizeof(struct acpi_table_header);
+                status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
+                                               aml_start, aml_length, NULL,
+                                               (u8) pass_number);
+        }
        if (ACPI_FAILURE(status)) {
                acpi_ds_delete_walk_state(walk_state);
+                acpi_ps_delete_parse_tree(parse_root);
                return_ACPI_STATUS(status);
        }
        /* Parse the AML */
        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "*PARSE* pass %d parse\n",
-                          pass_number));
+                          (unsigned)pass_number));
        status = acpi_ps_parse_aml(walk_state);
        acpi_ps_delete_parse_tree(parse_root);
@@ -119,7 +145,7 @@ acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc *table_desc)
 ******************************************************************************/
 acpi_status
-acpi_ns_parse_table(struct acpi_table_desc *table_desc,
+acpi_ns_parse_table(acpi_native_uint table_index,
                    struct acpi_namespace_node *start_node)
 {
        acpi_status status;
@@ -134,10 +160,10 @@ acpi_ns_parse_table(struct acpi_table_desc *table_desc,
         * each Parser Op subtree is deleted when it is finished.  This saves
         * a great deal of memory, and allows a small cache of parse objects
         * to service the entire parse.  The second pass of the parse then
-         * performs another complete parse of the AML..
+         * performs another complete parse of the AML.
         */
        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
-        status = acpi_ns_one_complete_parse(1, table_desc);
+        status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, table_index);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -152,7 +178,7 @@ acpi_ns_parse_table(struct acpi_table_desc *table_desc,
         * parse objects are all cached.
         */
        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 2\n"));
-        status = acpi_ns_one_complete_parse(2, table_desc);
+        status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, table_index);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 500e2bbcfaf7..e863be665ce8 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -321,7 +321,8 @@ acpi_ns_search_and_enter(u32 target_name,
         * even though there are a few bad names.
         */
        if (!acpi_ut_valid_acpi_name(target_name)) {
-                target_name = acpi_ut_repair_name(target_name);
+                target_name =
+                    acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
                /* Report warning only if in strict mode or debug mode */
@@ -401,6 +402,10 @@ acpi_ns_search_and_enter(u32 target_name,
        }
 #endif
+        if (flags & ACPI_NS_TEMPORARY) {
+                new_node->flags |= ANOBJ_TEMPORARY;
+        }
        /* Install the new object into the parent's list of children */
        acpi_ns_install_node(walk_state, node, new_node, type);
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index aa4e799d9a8c..90fd059615ff 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -770,13 +770,6 @@ void acpi_ns_terminate(void)
        }
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace freed\n"));
-        /*
-         * 2) Now we can delete the ACPI tables
-         */
-        acpi_tb_delete_all_tables();
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
        return_VOID;
 }
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index c8f6bef16ed0..94eb8f332d94 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -126,7 +126,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
 * PARAMETERS:  Type                - acpi_object_type to search for
 *              start_node          - Handle in namespace where search begins
 *              max_depth           - Depth to which search is to reach
- *              unlock_before_callback- Whether to unlock the NS before invoking
+ *              Flags               - Whether to unlock the NS before invoking
 *                                    the callback routine
 *              user_function       - Called when an object of "Type" is found
 *              Context             - Passed to user function
@@ -153,7 +153,7 @@ acpi_status
 acpi_ns_walk_namespace(acpi_object_type type,
                       acpi_handle start_node,
                       u32 max_depth,
-                       u8 unlock_before_callback,
+                       u32 flags,
                       acpi_walk_callback user_function,
                       void *context, void **return_value)
 {
@@ -193,20 +193,34 @@ acpi_ns_walk_namespace(acpi_object_type type,
                    acpi_ns_get_next_node(ACPI_TYPE_ANY, parent_node,
                                          child_node);
                if (child_node) {
-                        /*
-                         * Found node, Get the type if we are not
+                        /* Found next child, get the type if we are not searching for ANY */
-                         * searching for ANY
-                         */
                        if (type != ACPI_TYPE_ANY) {
                                child_type = child_node->type;
                        }
-                        if (child_type == type) {
+                        /*
+                         * Ignore all temporary namespace nodes (created during control
+                         * method execution) unless told otherwise. These temporary nodes
+                         * can cause a race condition because they can be deleted during the
+                         * execution of the user function (if the namespace is unlocked before
+                         * invocation of the user function.) Only the debugger namespace dump
+                         * will examine the temporary nodes.
+                         */
+                        if ((child_node->flags & ANOBJ_TEMPORARY) &&
+                            !(flags & ACPI_NS_WALK_TEMP_NODES)) {
+                                status = AE_CTRL_DEPTH;
+                        }
+                        /* Type must match requested type */
+                        else if (child_type == type) {
                                /*
-                                 * Found a matching node, invoke the user
+                                 * Found a matching node, invoke the user callback function.
-                                 * callback function
+                                 * Unlock the namespace if flag is set.
                                 */
-                                if (unlock_before_callback) {
+                                if (flags & ACPI_NS_WALK_UNLOCK) {
                                        mutex_status =
                                            acpi_ut_release_mutex
                                            (ACPI_MTX_NAMESPACE);
@@ -216,10 +230,11 @@ acpi_ns_walk_namespace(acpi_object_type type,
                                        }
                                }
-                                status = user_function(child_node, level,
+                                status =
-                                                       context, return_value);
+                                    user_function(child_node, level, context,
+                                                  return_value);
-                                if (unlock_before_callback) {
+                                if (flags & ACPI_NS_WALK_UNLOCK) {
                                        mutex_status =
                                            acpi_ut_acquire_mutex
                                            (ACPI_MTX_NAMESPACE);
@@ -251,20 +266,17 @@ acpi_ns_walk_namespace(acpi_object_type type,
                        }
                        /*
-                         * Depth first search:
+                         * Depth first search: Attempt to go down another level in the
-                         * Attempt to go down another level in the namespace
+                         * namespace if we are allowed to.  Don't go any further if we have
-                         * if we are allowed to.  Don't go any further if we
+                         * reached the caller specified maximum depth or if the user
-                         * have reached the caller specified maximum depth
+                         * function has specified that the maximum depth has been reached.
-                         * or if the user function has specified that the
-                         * maximum depth has been reached.
                         */
                        if ((level < max_depth) && (status != AE_CTRL_DEPTH)) {
                                if (acpi_ns_get_next_node
                                    (ACPI_TYPE_ANY, child_node, NULL)) {
-                                        /*
-                                         * There is at least one child of this
+                                        /* There is at least one child of this node, visit it */
-                                         * node, visit the onde
-                                         */
                                        level++;
                                        parent_node = child_node;
                                        child_node = NULL;
@@ -272,9 +284,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
                        }
                } else {
                        /*
-                         * No more children of this node (acpi_ns_get_next_node
+                         * No more children of this node (acpi_ns_get_next_node failed), go
-                         * failed), go back upwards in the namespace tree to
+                         * back upwards in the namespace tree to the node's parent.
-                         * the node's parent.
                         */
                        level--;
                        child_node = parent_node;
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index dca6799ac678..7ac6ace50059 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -170,7 +170,6 @@ acpi_evaluate_object(acpi_handle handle,
                     struct acpi_buffer *return_buffer)
 {
        acpi_status status;
-        acpi_status status2;
        struct acpi_evaluate_info *info;
        acpi_size buffer_space_needed;
        u32 i;
@@ -329,14 +328,12 @@ acpi_evaluate_object(acpi_handle handle,
                 * Delete the internal return object. NOTE: Interpreter must be
                 * locked to avoid race condition.
                 */
-                status2 = acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
-                if (ACPI_SUCCESS(status2)) {
-                        /* Remove one reference on the return object (should delete it) */
+                /* Remove one reference on the return object (should delete it) */
-                        acpi_ut_remove_reference(info->return_object);
+                acpi_ut_remove_reference(info->return_object);
-                        acpi_ex_exit_interpreter();
+                acpi_ex_exit_interpreter();
-                }
        }
      cleanup:
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 978213a6c19f..b489781b22a8 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -84,38 +84,41 @@ acpi_get_handle(acpi_handle parent,
        /* Convert a parent handle to a prefix node */
        if (parent) {
-                status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
                prefix_node = acpi_ns_map_handle_to_node(parent);
                if (!prefix_node) {
-                        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                        return (AE_BAD_PARAMETER);
                }
+        }
+        /*
+         * Valid cases are:
+         * 1) Fully qualified pathname
+         * 2) Parent + Relative pathname
+         *
+         * Error for <null Parent + relative path>
+         */
+        if (acpi_ns_valid_root_prefix(pathname[0])) {
-                status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+                /* Pathname is fully qualified (starts with '\') */
-                if (ACPI_FAILURE(status)) {
-                        return (status);
+                /* Special case for root-only, since we can't search for it */
+                if (!ACPI_STRCMP(pathname, ACPI_NS_ROOT_PATH)) {
+                        *ret_handle =
+                            acpi_ns_convert_entry_to_handle(acpi_gbl_root_node);
+                        return (AE_OK);
                }
-        }
+        } else if (!prefix_node) {
-        /* Special case for root, since we can't search for it */
+                /* Relative path with null prefix is disallowed */
-        if (ACPI_STRCMP(pathname, ACPI_NS_ROOT_PATH) == 0) {
+                return (AE_BAD_PARAMETER);
-                *ret_handle =
-                    acpi_ns_convert_entry_to_handle(acpi_gbl_root_node);
-                return (AE_OK);
        }
-        /*
+        /* Find the Node and convert to a handle */
-         *  Find the Node and convert to a handle
-         */
-        status = acpi_ns_get_node(prefix_node, pathname, ACPI_NS_NO_UPSEARCH,
-                                  &node);
-        *ret_handle = NULL;
+        status =
+            acpi_ns_get_node(prefix_node, pathname, ACPI_NS_NO_UPSEARCH, &node);
        if (ACPI_SUCCESS(status)) {
                *ret_handle = acpi_ns_convert_entry_to_handle(node);
        }
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index a163e1d3708d..faa375887201 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,50 @@ ACPI_MODULE_NAME("nsxfobj")
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_get_id
+ *
+ * PARAMETERS:  Handle          - Handle of object whose id is desired
+ *              ret_id          - Where the id will be placed
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This routine returns the owner id associated with a handle
+ *
+ ******************************************************************************/
+acpi_status acpi_get_id(acpi_handle handle, acpi_owner_id * ret_id)
+{
+        struct acpi_namespace_node *node;
+        acpi_status status;
+        /* Parameter Validation */
+        if (!ret_id) {
+                return (AE_BAD_PARAMETER);
+        }
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+        /* Convert and validate the handle */
+        node = acpi_ns_map_handle_to_node(handle);
+        if (!node) {
+                (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+                return (AE_BAD_PARAMETER);
+        }
+        *ret_id = node->owner_id;
+        status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return (status);
+}
+ACPI_EXPORT_SYMBOL(acpi_get_id)
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_get_type
 *
 * PARAMETERS:  Handle          - Handle of object whose type is desired
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index e5e448edca41..4a9faff4c01d 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -45,7 +45,7 @@ int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
 int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
                                = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
-extern int __init acpi_table_parse_madt_family(enum acpi_table_id id,
+extern int __init acpi_table_parse_madt_family(char *id,
                                               unsigned long madt_size,
                                               int entry_id,
                                               acpi_madt_entry_handler handler,
@@ -89,7 +89,7 @@ void __cpuinit acpi_unmap_pxm_to_node(int node)
        node_clear(node, nodes_found_map);
 }
-void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
+void __init acpi_table_print_srat_entry(struct acpi_subtable_header * header)
 {
        ACPI_FUNCTION_NAME("acpi_table_print_srat_entry");
@@ -99,36 +99,35 @@ void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
        switch (header->type) {
-        case ACPI_SRAT_PROCESSOR_AFFINITY:
+        case ACPI_SRAT_TYPE_CPU_AFFINITY:
 #ifdef ACPI_DEBUG_OUTPUT
                {
-                        struct acpi_table_processor_affinity *p =
+                        struct acpi_srat_cpu_affinity *p =
-                            (struct acpi_table_processor_affinity *)header;
+                            (struct acpi_srat_cpu_affinity *)header;
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                          "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
-                                          p->apic_id, p->lsapic_eid,
+                                          p->apic_id, p->local_sapic_eid,
-                                          p->proximity_domain,
+                                          p->proximity_domain_lo,
-                                          p->flags.
+                                          (p->flags & ACPI_SRAT_CPU_ENABLED)?
-                                          enabled ? "enabled" : "disabled"));
+                                          "enabled" : "disabled"));
                }
 #endif                          /* ACPI_DEBUG_OUTPUT */
                break;
-        case ACPI_SRAT_MEMORY_AFFINITY:
+        case ACPI_SRAT_TYPE_MEMORY_AFFINITY:
 #ifdef ACPI_DEBUG_OUTPUT
                {
-                        struct acpi_table_memory_affinity *p =
+                        struct acpi_srat_mem_affinity *p =
-                            (struct acpi_table_memory_affinity *)header;
+                            (struct acpi_srat_mem_affinity *)header;
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n",
+                                          "SRAT Memory (0x%lx length 0x%lx type 0x%x) in proximity domain %d %s%s\n",
-                                          p->base_addr_hi, p->base_addr_lo,
+                                          (unsigned long)p->base_address,
-                                          p->length_hi, p->length_lo,
+                                          (unsigned long)p->length,
                                          p->memory_type, p->proximity_domain,
-                                          p->flags.
+                                          (p->flags & ACPI_SRAT_MEM_ENABLED)?
-                                          enabled ? "enabled" : "disabled",
+                                          "enabled" : "disabled",
-                                          p->flags.
+                                          (p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)?
-                                          hot_pluggable ? " hot-pluggable" :
+                                          " hot-pluggable" : ""));
-                                          ""));
                }
 #endif                          /* ACPI_DEBUG_OUTPUT */
                break;
@@ -141,18 +140,18 @@ void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
        }
 }
-static int __init acpi_parse_slit(unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_slit(struct acpi_table_header *table)
 {
        struct acpi_table_slit *slit;
        u32 localities;
-        if (!phys_addr || !size)
+        if (!table)
                return -EINVAL;
-        slit = (struct acpi_table_slit *)__va(phys_addr);
+        slit = (struct acpi_table_slit *)table;
        /* downcast just for %llu vs %lu for i386/ia64  */
-        localities = (u32) slit->localities;
+        localities = (u32) slit->locality_count;
        acpi_numa_slit_init(slit);
@@ -160,12 +159,12 @@ static int __init acpi_parse_slit(unsigned long phys_addr, unsigned long size)
 }
 static int __init
-acpi_parse_processor_affinity(acpi_table_entry_header * header,
+acpi_parse_processor_affinity(struct acpi_subtable_header * header,
                              const unsigned long end)
 {
-        struct acpi_table_processor_affinity *processor_affinity;
+        struct acpi_srat_cpu_affinity *processor_affinity;
-        processor_affinity = (struct acpi_table_processor_affinity *)header;
+        processor_affinity = (struct acpi_srat_cpu_affinity *)header;
        if (!processor_affinity)
                return -EINVAL;
@@ -178,12 +177,12 @@ acpi_parse_processor_affinity(acpi_table_entry_header * header,
 }
 static int __init
-acpi_parse_memory_affinity(acpi_table_entry_header * header,
+acpi_parse_memory_affinity(struct acpi_subtable_header * header,
                           const unsigned long end)
 {
-        struct acpi_table_memory_affinity *memory_affinity;
+        struct acpi_srat_mem_affinity *memory_affinity;
-        memory_affinity = (struct acpi_table_memory_affinity *)header;
+        memory_affinity = (struct acpi_srat_mem_affinity *)header;
        if (!memory_affinity)
                return -EINVAL;
@@ -195,23 +194,23 @@ acpi_parse_memory_affinity(acpi_table_entry_header * header,
        return 0;
 }
-static int __init acpi_parse_srat(unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
        struct acpi_table_srat *srat;
-        if (!phys_addr || !size)
+        if (!table)
                return -EINVAL;
-        srat = (struct acpi_table_srat *)__va(phys_addr);
+        srat = (struct acpi_table_srat *)table;
        return 0;
 }
 int __init
-acpi_table_parse_srat(enum acpi_srat_entry_id id,
+acpi_table_parse_srat(enum acpi_srat_type id,
                      acpi_madt_entry_handler handler, unsigned int max_entries)
 {
-        return acpi_table_parse_madt_family(ACPI_SRAT,
+        return acpi_table_parse_madt_family(ACPI_SIG_SRAT,
                                            sizeof(struct acpi_table_srat), id,
                                            handler, max_entries);
 }
@@ -221,17 +220,17 @@ int __init acpi_numa_init(void)
        int result;
        /* SRAT: Static Resource Affinity Table */
-        result = acpi_table_parse(ACPI_SRAT, acpi_parse_srat);
+        result = acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat);
        if (result > 0) {
-                result = acpi_table_parse_srat(ACPI_SRAT_PROCESSOR_AFFINITY,
+                result = acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
                                               acpi_parse_processor_affinity,
                                               NR_CPUS);
-                result = acpi_table_parse_srat(ACPI_SRAT_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); // IA64 specific
+                result = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS);    // IA64 specific
        }
        /* SLIT: System Locality Information Table */
-        result = acpi_table_parse(ACPI_SLIT, acpi_parse_slit);
+        result = acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
        acpi_numa_arch_fixup();
        return 0;
@@ -248,7 +247,7 @@ int acpi_get_pxm(acpi_handle h)
                handle = phandle;
                status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
                if (ACPI_SUCCESS(status))
-                        return (int)pxm;
+                        return pxm;
                status = acpi_get_parent(handle, &phandle);
        } while (ACPI_SUCCESS(status));
        return -1;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 02b30ae6a68e..a28f5b8972b4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
+#include <linux/acpi.h>
 #include <acpi/acpi.h>
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
@@ -136,53 +137,43 @@ void acpi_os_vprintf(const char *fmt, va_list args)
 #endif
 }
-acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
+acpi_physical_address __init acpi_os_get_root_pointer(void)
 {
        if (efi_enabled) {
-                addr->pointer_type = ACPI_PHYSICAL_POINTER;
                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
-                        addr->pointer.physical = efi.acpi20;
+                        return efi.acpi20;
                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
-                        addr->pointer.physical = efi.acpi;
+                        return efi.acpi;
                else {
                        printk(KERN_ERR PREFIX
                               "System description tables not found\n");
-                        return AE_NOT_FOUND;
+                        return 0;
                }
-        } else {
+        } else
-                if (ACPI_FAILURE(acpi_find_root_pointer(flags, addr))) {
+                return acpi_find_rsdp();
-                        printk(KERN_ERR PREFIX
-                               "System description tables not found\n");
-                        return AE_NOT_FOUND;
-                }
-        }
-        return AE_OK;
 }
-acpi_status
+void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
-acpi_os_map_memory(acpi_physical_address phys, acpi_size size,
-                   void __iomem ** virt)
 {
        if (phys > ULONG_MAX) {
                printk(KERN_ERR PREFIX "Cannot map memory that high\n");
-                return AE_BAD_PARAMETER;
+                return 0;
        }
-        /*
+        if (acpi_gbl_permanent_mmap)
-         * ioremap checks to ensure this is in reserved space
+                /*
-         */
+                * ioremap checks to ensure this is in reserved space
-        *virt = ioremap((unsigned long)phys, size);
+                */
+                return ioremap((unsigned long)phys, size);
-        if (!*virt)
+        else
-                return AE_NO_MEMORY;
+                return __acpi_map_table((unsigned long)phys, size);
-        return AE_OK;
 }
 EXPORT_SYMBOL_GPL(acpi_os_map_memory);
 void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
 {
-        iounmap(virt);
+        if (acpi_gbl_permanent_mmap) {
+                iounmap(virt);
+        }
 }
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
@@ -254,7 +245,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
         * FADT. It may not be the same if an interrupt source override exists
         * for the SCI.
         */
-        gsi = acpi_fadt.sci_int;
+        gsi = acpi_gbl_FADT.sci_interrupt;
        if (acpi_gsi_to_irq(gsi, &irq) < 0) {
                printk(KERN_ERR PREFIX "SCI (ACPI GSI %d) not registered\n",
                       gsi);
@@ -568,6 +559,7 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
        if (!dpc) {
                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
                return;
@@ -1031,7 +1023,7 @@ acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
        *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
-        if (cache == NULL)
+        if (*cache == NULL)
                return AE_ERROR;
        else
                return AE_OK;
@@ -1051,7 +1043,7 @@ acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 acpi_status acpi_os_purge_cache(acpi_cache_t * cache)
 {
-        (void)kmem_cache_shrink(cache);
+        kmem_cache_shrink(cache);
        return (AE_OK);
 }
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index bf88e076c3e9..c2b9835c890b 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index e1541db3753a..773aee82fbb8 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,12 +42,11 @@
 */
 /*
- * Parse the AML and build an operation tree as most interpreters,
+ * Parse the AML and build an operation tree as most interpreters, (such as
- * like Perl, do.  Parsing is done by hand rather than with a YACC
+ * Perl) do. Parsing is done by hand rather than with a YACC generated parser
- * generated parser to tightly constrain stack and dynamic memory
+ * to tightly constrain stack and dynamic memory usage. Parsing is kept
- * usage.  At the same time, parsing is kept flexible and the code
+ * flexible and the code fairly compact by parsing based on a list of AML
- * fairly compact by parsing based on a list of AML opcode
+ * opcode templates in aml_op_info[].
- * templates in aml_op_info[]
 */
 #include <acpi/acpi.h>
@@ -60,766 +59,679 @@ ACPI_MODULE_NAME("psloop")
 static u32 acpi_gbl_depth = 0;
+/* Local prototypes */
+static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state);
+static acpi_status
+acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
+                       u8 * aml_op_start,
+                       union acpi_parse_object *unnamed_op,
+                       union acpi_parse_object **op);
+static acpi_status
+acpi_ps_create_op(struct acpi_walk_state *walk_state,
+                  u8 * aml_op_start, union acpi_parse_object **new_op);
+static acpi_status
+acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
+                      u8 * aml_op_start, union acpi_parse_object *op);
+static acpi_status
+acpi_ps_complete_op(struct acpi_walk_state *walk_state,
+                    union acpi_parse_object **op, acpi_status status);
+static acpi_status
+acpi_ps_complete_final_op(struct acpi_walk_state *walk_state,
+                          union acpi_parse_object *op, acpi_status status);
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ps_parse_loop
+ * FUNCTION:    acpi_ps_get_aml_opcode
 *
 * PARAMETERS:  walk_state          - Current state
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Parse AML (pointed to by the current parser state) and return
+ * DESCRIPTION: Extract the next AML opcode from the input stream.
- *              a tree of ops.
 *
 ******************************************************************************/
-acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
+static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
 {
-        acpi_status status = AE_OK;
-        acpi_status status2;
-        union acpi_parse_object *op = NULL;     /* current op */
-        union acpi_parse_object *arg = NULL;
-        union acpi_parse_object *pre_op = NULL;
-        struct acpi_parse_state *parser_state;
-        u8 *aml_op_start = NULL;
-        ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ps_get_aml_opcode, walk_state);
-        if (walk_state->descending_callback == NULL) {
+        walk_state->aml_offset =
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+            (u32) ACPI_PTR_DIFF(walk_state->parser_state.aml,
-        }
+                                walk_state->parser_state.aml_start);
+        walk_state->opcode = acpi_ps_peek_opcode(&(walk_state->parser_state));
-        parser_state = &walk_state->parser_state;
+        /*
-        walk_state->arg_types = 0;
+         * First cut to determine what we have found:
+         * 1) A valid AML opcode
+         * 2) A name string
+         * 3) An unknown/invalid opcode
+         */
+        walk_state->op_info = acpi_ps_get_opcode_info(walk_state->opcode);
-#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
+        switch (walk_state->op_info->class) {
+        case AML_CLASS_ASCII:
+        case AML_CLASS_PREFIX:
+                /*
+                 * Starts with a valid prefix or ASCII char, this is a name
+                 * string. Convert the bare name string to a namepath.
+                 */
+                walk_state->opcode = AML_INT_NAMEPATH_OP;
+                walk_state->arg_types = ARGP_NAMESTRING;
+                break;
-        if (walk_state->walk_type & ACPI_WALK_METHOD_RESTART) {
+        case AML_CLASS_UNKNOWN:
-                /* We are restarting a preempted control method */
+                /* The opcode is unrecognized. Just skip unknown opcodes */
-                if (acpi_ps_has_completed_scope(parser_state)) {
+                ACPI_ERROR((AE_INFO,
-                        /*
+                            "Found unknown opcode %X at AML address %p offset %X, ignoring",
-                         * We must check if a predicate to an IF or WHILE statement
+                            walk_state->opcode, walk_state->parser_state.aml,
-                         * was just completed
+                            walk_state->aml_offset));
-                         */
-                        if ((parser_state->scope->parse_scope.op) &&
-                            ((parser_state->scope->parse_scope.op->common.
-                              aml_opcode == AML_IF_OP)
-                             || (parser_state->scope->parse_scope.op->common.
-                                 aml_opcode == AML_WHILE_OP))
-                            && (walk_state->control_state)
-                            && (walk_state->control_state->common.state ==
-                                ACPI_CONTROL_PREDICATE_EXECUTING)) {
-                                /*
-                                 * A predicate was just completed, get the value of the
-                                 * predicate and branch based on that value
-                                 */
-                                walk_state->op = NULL;
-                                status =
-                                    acpi_ds_get_predicate_value(walk_state,
-                                                                ACPI_TO_POINTER
-                                                                (TRUE));
-                                if (ACPI_FAILURE(status)
-                                    && ((status & AE_CODE_MASK) !=
-                                        AE_CODE_CONTROL)) {
-                                        if (status == AE_AML_NO_RETURN_VALUE) {
-                                                ACPI_EXCEPTION((AE_INFO, status,
-                                                                "Invoked method did not return a value"));
-                                        }
+                ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128);
-                                        ACPI_EXCEPTION((AE_INFO, status,
-                                                        "GetPredicate Failed"));
-                                        return_ACPI_STATUS(status);
-                                }
-                                status =
+                /* Assume one-byte bad opcode */
-                                    acpi_ps_next_parse_state(walk_state, op,
-                                                             status);
-                        }
-                        acpi_ps_pop_scope(parser_state, &op,
+                walk_state->parser_state.aml++;
-                                          &walk_state->arg_types,
+                return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
-                                          &walk_state->arg_count);
-                        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                          "Popped scope, Op=%p\n", op));
-                } else if (walk_state->prev_op) {
-                        /* We were in the middle of an op */
+        default:
-                        op = walk_state->prev_op;
+                /* Found opcode info, this is a normal opcode */
-                        walk_state->arg_types = walk_state->prev_arg_types;
-                }
+                walk_state->parser_state.aml +=
+                    acpi_ps_get_opcode_size(walk_state->opcode);
+                walk_state->arg_types = walk_state->op_info->parse_args;
+                break;
        }
-#endif
-        /* Iterative parsing loop, while there is more AML to process: */
+        return_ACPI_STATUS(AE_OK);
+}
-        while ((parser_state->aml < parser_state->aml_end) || (op)) {
+/*******************************************************************************
-                aml_op_start = parser_state->aml;
+ *
-                if (!op) {
+ * FUNCTION:    acpi_ps_build_named_op
+ *
+ * PARAMETERS:  walk_state          - Current state
+ *              aml_op_start        - Begin of named Op in AML
+ *              unnamed_op          - Early Op (not a named Op)
+ *              Op                  - Returned Op
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Parse a named Op
+ *
+ ******************************************************************************/
-                        /* Get the next opcode from the AML stream */
+static acpi_status
+acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
+                       u8 * aml_op_start,
+                       union acpi_parse_object *unnamed_op,
+                       union acpi_parse_object **op)
+{
+        acpi_status status = AE_OK;
+        union acpi_parse_object *arg = NULL;
-                        walk_state->aml_offset =
+        ACPI_FUNCTION_TRACE_PTR(ps_build_named_op, walk_state);
-                            (u32) ACPI_PTR_DIFF(parser_state->aml,
-                                                parser_state->aml_start);
-                        walk_state->opcode = acpi_ps_peek_opcode(parser_state);
-                        /*
+        unnamed_op->common.value.arg = NULL;
-                         * First cut to determine what we have found:
+        unnamed_op->common.aml_opcode = walk_state->opcode;
-                         * 1) A valid AML opcode
-                         * 2) A name string
-                         * 3) An unknown/invalid opcode
-                         */
-                        walk_state->op_info =
-                            acpi_ps_get_opcode_info(walk_state->opcode);
-                        switch (walk_state->op_info->class) {
-                        case AML_CLASS_ASCII:
-                        case AML_CLASS_PREFIX:
-                                /*
-                                 * Starts with a valid prefix or ASCII char, this is a name
-                                 * string.  Convert the bare name string to a namepath.
-                                 */
-                                walk_state->opcode = AML_INT_NAMEPATH_OP;
-                                walk_state->arg_types = ARGP_NAMESTRING;
-                                break;
-                        case AML_CLASS_UNKNOWN:
+        /*
+         * Get and append arguments until we find the node that contains
+         * the name (the type ARGP_NAME).
+         */
+        while (GET_CURRENT_ARG_TYPE(walk_state->arg_types) &&
+               (GET_CURRENT_ARG_TYPE(walk_state->arg_types) != ARGP_NAME)) {
+                status =
+                    acpi_ps_get_next_arg(walk_state,
+                                         &(walk_state->parser_state),
+                                         GET_CURRENT_ARG_TYPE(walk_state->
+                                                              arg_types), &arg);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
-                                /* The opcode is unrecognized.  Just skip unknown opcodes */
+                acpi_ps_append_arg(unnamed_op, arg);
+                INCREMENT_ARG_LIST(walk_state->arg_types);
+        }
-                                ACPI_ERROR((AE_INFO,
+        /*
-                                            "Found unknown opcode %X at AML address %p offset %X, ignoring",
+         * Make sure that we found a NAME and didn't run out of arguments
-                                            walk_state->opcode,
+         */
-                                            parser_state->aml,
+        if (!GET_CURRENT_ARG_TYPE(walk_state->arg_types)) {
-                                            walk_state->aml_offset));
+                return_ACPI_STATUS(AE_AML_NO_OPERAND);
+        }
-                                ACPI_DUMP_BUFFER(parser_state->aml, 128);
+        /* We know that this arg is a name, move to next arg */
-                                /* Assume one-byte bad opcode */
+        INCREMENT_ARG_LIST(walk_state->arg_types);
-                                parser_state->aml++;
+        /*
-                                continue;
+         * Find the object. This will either insert the object into
+         * the namespace or simply look it up
+         */
+        walk_state->op = NULL;
-                        default:
+        status = walk_state->descending_callback(walk_state, op);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "During name lookup/catalog"));
+                return_ACPI_STATUS(status);
+        }
-                                /* Found opcode info, this is a normal opcode */
+        if (!*op) {
+                return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
+        }
-                                parser_state->aml +=
+        status = acpi_ps_next_parse_state(walk_state, *op, status);
-                                    acpi_ps_get_opcode_size(walk_state->opcode);
+        if (ACPI_FAILURE(status)) {
-                                walk_state->arg_types =
+                if (status == AE_CTRL_PENDING) {
-                                    walk_state->op_info->parse_args;
+                        return_ACPI_STATUS(AE_CTRL_PARSE_PENDING);
-                                break;
+                }
-                        }
+                return_ACPI_STATUS(status);
+        }
-                        /* Create Op structure and append to parent's argument list */
+        acpi_ps_append_arg(*op, unnamed_op->common.value.arg);
+        acpi_gbl_depth++;
-                        if (walk_state->op_info->flags & AML_NAMED) {
+        if ((*op)->common.aml_opcode == AML_REGION_OP) {
+                /*
+                 * Defer final parsing of an operation_region body, because we don't
+                 * have enough info in the first pass to parse it correctly (i.e.,
+                 * there may be method calls within the term_arg elements of the body.)
+                 *
+                 * However, we must continue parsing because the opregion is not a
+                 * standalone package -- we don't know where the end is at this point.
+                 *
+                 * (Length is unknown until parse of the body complete)
+                 */
+                (*op)->named.data = aml_op_start;
+                (*op)->named.length = 0;
+        }
-                                /* Allocate a new pre_op if necessary */
+        return_ACPI_STATUS(AE_OK);
+}
-                                if (!pre_op) {
+/*******************************************************************************
-                                        pre_op =
+ *
-                                            acpi_ps_alloc_op(walk_state->
+ * FUNCTION:    acpi_ps_create_op
-                                                             opcode);
+ *
-                                        if (!pre_op) {
+ * PARAMETERS:  walk_state          - Current state
-                                                status = AE_NO_MEMORY;
+ *              aml_op_start        - Op start in AML
-                                                goto close_this_op;
+ *              new_op              - Returned Op
-                                        }
+ *
-                                }
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get Op from AML
+ *
+ ******************************************************************************/
-                                pre_op->common.value.arg = NULL;
+static acpi_status
-                                pre_op->common.aml_opcode = walk_state->opcode;
+acpi_ps_create_op(struct acpi_walk_state *walk_state,
+                  u8 * aml_op_start, union acpi_parse_object **new_op)
+{
+        acpi_status status = AE_OK;
+        union acpi_parse_object *op;
+        union acpi_parse_object *named_op = NULL;
-                                /*
+        ACPI_FUNCTION_TRACE_PTR(ps_create_op, walk_state);
-                                 * Get and append arguments until we find the node that contains
-                                 * the name (the type ARGP_NAME).
-                                 */
-                                while (GET_CURRENT_ARG_TYPE
-                                       (walk_state->arg_types)
-                                       &&
-                                       (GET_CURRENT_ARG_TYPE
-                                        (walk_state->arg_types) != ARGP_NAME)) {
-                                        status =
-                                            acpi_ps_get_next_arg(walk_state,
-                                                                 parser_state,
-                                                                 GET_CURRENT_ARG_TYPE
-                                                                 (walk_state->
-                                                                  arg_types),
-                                                                 &arg);
-                                        if (ACPI_FAILURE(status)) {
-                                                goto close_this_op;
-                                        }
-                                        acpi_ps_append_arg(pre_op, arg);
+        status = acpi_ps_get_aml_opcode(walk_state);
-                                        INCREMENT_ARG_LIST(walk_state->
+        if (status == AE_CTRL_PARSE_CONTINUE) {
-                                                           arg_types);
+                return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
-                                }
+        }
-                                /*
+        /* Create Op structure and append to parent's argument list */
-                                 * Make sure that we found a NAME and didn't run out of
-                                 * arguments
-                                 */
-                                if (!GET_CURRENT_ARG_TYPE
-                                    (walk_state->arg_types)) {
-                                        status = AE_AML_NO_OPERAND;
-                                        goto close_this_op;
-                                }
-                                /* We know that this arg is a name, move to next arg */
+        walk_state->op_info = acpi_ps_get_opcode_info(walk_state->opcode);
+        op = acpi_ps_alloc_op(walk_state->opcode);
+        if (!op) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
-                                INCREMENT_ARG_LIST(walk_state->arg_types);
+        if (walk_state->op_info->flags & AML_NAMED) {
+                status =
+                    acpi_ps_build_named_op(walk_state, aml_op_start, op,
+                                           &named_op);
+                acpi_ps_free_op(op);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
-                                /*
+                *new_op = named_op;
-                                 * Find the object.  This will either insert the object into
+                return_ACPI_STATUS(AE_OK);
-                                 * the namespace or simply look it up
+        }
-                                 */
-                                walk_state->op = NULL;
-                                status =
+        /* Not a named opcode, just allocate Op and append to parent */
-                                    walk_state->descending_callback(walk_state,
-                                                                    &op);
-                                if (ACPI_FAILURE(status)) {
-                                        ACPI_EXCEPTION((AE_INFO, status,
-                                                        "During name lookup/catalog"));
-                                        goto close_this_op;
-                                }
-                                if (!op) {
+        if (walk_state->op_info->flags & AML_CREATE) {
-                                        continue;
+                /*
-                                }
+                 * Backup to beginning of create_xXXfield declaration
+                 * body_length is unknown until we parse the body
+                 */
+                op->named.data = aml_op_start;
+                op->named.length = 0;
+        }
-                                status =
+        acpi_ps_append_arg(acpi_ps_get_parent_scope
-                                    acpi_ps_next_parse_state(walk_state, op,
+                           (&(walk_state->parser_state)), op);
-                                                             status);
-                                if (status == AE_CTRL_PENDING) {
-                                        status = AE_OK;
-                                        goto close_this_op;
-                                }
-                                if (ACPI_FAILURE(status)) {
+        if (walk_state->descending_callback != NULL) {
-                                        goto close_this_op;
+                /*
-                                }
+                 * Find the object. This will either insert the object into
+                 * the namespace or simply look it up
+                 */
+                walk_state->op = *new_op = op;
-                                acpi_ps_append_arg(op,
+                status = walk_state->descending_callback(walk_state, &op);
-                                                   pre_op->common.value.arg);
+                status = acpi_ps_next_parse_state(walk_state, op, status);
-                                acpi_gbl_depth++;
+                if (status == AE_CTRL_PENDING) {
+                        status = AE_CTRL_PARSE_PENDING;
-                                if (op->common.aml_opcode == AML_REGION_OP) {
+                }
-                                        /*
+        }
-                                         * Defer final parsing of an operation_region body,
-                                         * because we don't have enough info in the first pass
-                                         * to parse it correctly (i.e., there may be method
-                                         * calls within the term_arg elements of the body.)
-                                         *
-                                         * However, we must continue parsing because
-                                         * the opregion is not a standalone package --
-                                         * we don't know where the end is at this point.
-                                         *
-                                         * (Length is unknown until parse of the body complete)
-                                         */
-                                        op->named.data = aml_op_start;
-                                        op->named.length = 0;
-                                }
-                        } else {
-                                /* Not a named opcode, just allocate Op and append to parent */
-                                walk_state->op_info =
+        return_ACPI_STATUS(status);
-                                    acpi_ps_get_opcode_info(walk_state->opcode);
+}
-                                op = acpi_ps_alloc_op(walk_state->opcode);
-                                if (!op) {
-                                        status = AE_NO_MEMORY;
-                                        goto close_this_op;
-                                }
-                                if (walk_state->op_info->flags & AML_CREATE) {
+/*******************************************************************************
-                                        /*
+ *
-                                         * Backup to beginning of create_xXXfield declaration
+ * FUNCTION:    acpi_ps_get_arguments
-                                         * body_length is unknown until we parse the body
+ *
-                                         */
+ * PARAMETERS:  walk_state          - Current state
-                                        op->named.data = aml_op_start;
+ *              aml_op_start        - Op start in AML
-                                        op->named.length = 0;
+ *              Op                  - Current Op
-                                }
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get arguments for passed Op.
+ *
+ ******************************************************************************/
-                                acpi_ps_append_arg(acpi_ps_get_parent_scope
+static acpi_status
-                                                   (parser_state), op);
+acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
+                      u8 * aml_op_start, union acpi_parse_object *op)
+{
+        acpi_status status = AE_OK;
+        union acpi_parse_object *arg = NULL;
-                                if ((walk_state->descending_callback != NULL)) {
+        ACPI_FUNCTION_TRACE_PTR(ps_get_arguments, walk_state);
-                                        /*
-                                         * Find the object. This will either insert the object into
-                                         * the namespace or simply look it up
-                                         */
-                                        walk_state->op = op;
-                                        status =
+        switch (op->common.aml_opcode) {
-                                            walk_state->
+        case AML_BYTE_OP:       /* AML_BYTEDATA_ARG */
-                                            descending_callback(walk_state,
+        case AML_WORD_OP:       /* AML_WORDDATA_ARG */
-                                                                &op);
+        case AML_DWORD_OP:      /* AML_DWORDATA_ARG */
-                                        status =
+        case AML_QWORD_OP:      /* AML_QWORDATA_ARG */
-                                            acpi_ps_next_parse_state(walk_state,
+        case AML_STRING_OP:     /* AML_ASCIICHARLIST_ARG */
-                                                                     op,
-                                                                     status);
-                                        if (status == AE_CTRL_PENDING) {
-                                                status = AE_OK;
-                                                goto close_this_op;
-                                        }
-                                        if (ACPI_FAILURE(status)) {
+                /* Fill in constant or string argument directly */
-                                                goto close_this_op;
-                                        }
-                                }
-                        }
-                        op->common.aml_offset = walk_state->aml_offset;
+                acpi_ps_get_next_simple_arg(&(walk_state->parser_state),
+                                            GET_CURRENT_ARG_TYPE(walk_state->
+                                                                 arg_types),
+                                            op);
+                break;
-                        if (walk_state->op_info) {
+        case AML_INT_NAMEPATH_OP:       /* AML_NAMESTRING_ARG */
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
+                status =
-                                                  (u32) op->common.aml_opcode,
+                    acpi_ps_get_next_namepath(walk_state,
-                                                  walk_state->op_info->name, op,
+                                              &(walk_state->parser_state), op,
-                                                  parser_state->aml,
+                                              1);
-                                                  op->common.aml_offset));
+                if (ACPI_FAILURE(status)) {
-                        }
+                        return_ACPI_STATUS(status);
                }
+                walk_state->arg_types = 0;
+                break;
+        default:
                /*
-                 * Start arg_count at zero because we don't know if there are
+                 * Op is not a constant or string, append each argument to the Op
-                 * any args yet
                 */
-                walk_state->arg_count = 0;
+                while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
+                       && !walk_state->arg_count) {
-                /* Are there any arguments that must be processed? */
+                        walk_state->aml_offset =
+                            (u32) ACPI_PTR_DIFF(walk_state->parser_state.aml,
-                if (walk_state->arg_types) {
+                                                walk_state->parser_state.
+                                                aml_start);
-                        /* Get arguments */
-                        switch (op->common.aml_opcode) {
-                        case AML_BYTE_OP:       /* AML_BYTEDATA_ARG */
-                        case AML_WORD_OP:       /* AML_WORDDATA_ARG */
-                        case AML_DWORD_OP:      /* AML_DWORDATA_ARG */
-                        case AML_QWORD_OP:      /* AML_QWORDATA_ARG */
-                        case AML_STRING_OP:     /* AML_ASCIICHARLIST_ARG */
-                                /* Fill in constant or string argument directly */
-                                acpi_ps_get_next_simple_arg(parser_state,
-                                                            GET_CURRENT_ARG_TYPE
-                                                            (walk_state->
-                                                             arg_types), op);
-                                break;
-                        case AML_INT_NAMEPATH_OP:       /* AML_NAMESTRING_ARG */
-                                status =
-                                    acpi_ps_get_next_namepath(walk_state,
-                                                              parser_state, op,
-                                                              1);
-                                if (ACPI_FAILURE(status)) {
-                                        goto close_this_op;
-                                }
-                                walk_state->arg_types = 0;
-                                break;
-                        default:
+                        status =
-                                /*
+                            acpi_ps_get_next_arg(walk_state,
-                                 * Op is not a constant or string, append each argument
+                                                 &(walk_state->parser_state),
-                                 * to the Op
+                                                 GET_CURRENT_ARG_TYPE
-                                 */
+                                                 (walk_state->arg_types), &arg);
-                                while (GET_CURRENT_ARG_TYPE
+                        if (ACPI_FAILURE(status)) {
-                                       (walk_state->arg_types)
+                                return_ACPI_STATUS(status);
-                                       && !walk_state->arg_count) {
+                        }
-                                        walk_state->aml_offset = (u32)
-                                            ACPI_PTR_DIFF(parser_state->aml,
-                                                          parser_state->
-                                                          aml_start);
-                                        status =
+                        if (arg) {
-                                            acpi_ps_get_next_arg(walk_state,
+                                arg->common.aml_offset = walk_state->aml_offset;
-                                                                 parser_state,
+                                acpi_ps_append_arg(op, arg);
-                                                                 GET_CURRENT_ARG_TYPE
+                        }
-                                                                 (walk_state->
-                                                                  arg_types),
-                                                                 &arg);
-                                        if (ACPI_FAILURE(status)) {
-                                                goto close_this_op;
-                                        }
-                                        if (arg) {
+                        INCREMENT_ARG_LIST(walk_state->arg_types);
-                                                arg->common.aml_offset =
+                }
-                                                    walk_state->aml_offset;
-                                                acpi_ps_append_arg(op, arg);
-                                        }
-                                        INCREMENT_ARG_LIST(walk_state->
-                                                           arg_types);
-                                }
-                                /* Special processing for certain opcodes */
+                /* Special processing for certain opcodes */
-                                /* TBD (remove): Temporary mechanism to disable this code if needed */
+                /* TBD (remove): Temporary mechanism to disable this code if needed */
 #ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-                                if ((walk_state->pass_number <=
+                if ((walk_state->pass_number <= ACPI_IMODE_LOAD_PASS1) &&
-                                     ACPI_IMODE_LOAD_PASS1)
+                    ((walk_state->parse_flags & ACPI_PARSE_DISASSEMBLE) == 0)) {
-                                    &&
+                        /*
-                                    ((walk_state->
+                         * We want to skip If/Else/While constructs during Pass1 because we
-                                      parse_flags & ACPI_PARSE_DISASSEMBLE) ==
+                         * want to actually conditionally execute the code during Pass2.
-                                     0)) {
+                         *
-                                        /*
+                         * Except for disassembly, where we always want to walk the
-                                         * We want to skip If/Else/While constructs during Pass1
+                         * If/Else/While packages
-                                         * because we want to actually conditionally execute the
+                         */
-                                         * code during Pass2.
+                        switch (op->common.aml_opcode) {
-                                         *
+                        case AML_IF_OP:
-                                         * Except for disassembly, where we always want to
+                        case AML_ELSE_OP:
-                                         * walk the If/Else/While packages
+                        case AML_WHILE_OP:
-                                         */
-                                        switch (op->common.aml_opcode) {
-                                        case AML_IF_OP:
-                                        case AML_ELSE_OP:
-                                        case AML_WHILE_OP:
-                                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                                  "Pass1: Skipping an If/Else/While body\n"));
-                                                /* Skip body of if/else/while in pass 1 */
-                                                parser_state->aml =
-                                                    parser_state->pkg_end;
-                                                walk_state->arg_count = 0;
-                                                break;
-                                        default:
-                                                break;
-                                        }
-                                }
-#endif
-                                switch (op->common.aml_opcode) {
-                                case AML_METHOD_OP:
-                                        /*
-                                         * Skip parsing of control method
-                                         * because we don't have enough info in the first pass
-                                         * to parse it correctly.
-                                         *
-                                         * Save the length and address of the body
-                                         */
-                                        op->named.data = parser_state->aml;
-                                        op->named.length =
-                                            (u32) (parser_state->pkg_end -
-                                                   parser_state->aml);
-                                        /* Skip body of method */
-                                        parser_state->aml =
-                                            parser_state->pkg_end;
-                                        walk_state->arg_count = 0;
-                                        break;
-                                case AML_BUFFER_OP:
-                                case AML_PACKAGE_OP:
-                                case AML_VAR_PACKAGE_OP:
-                                        if ((op->common.parent) &&
-                                            (op->common.parent->common.
-                                             aml_opcode == AML_NAME_OP)
-                                            && (walk_state->pass_number <=
-                                                ACPI_IMODE_LOAD_PASS2)) {
-                                                /*
-                                                 * Skip parsing of Buffers and Packages
-                                                 * because we don't have enough info in the first pass
-                                                 * to parse them correctly.
-                                                 */
-                                                op->named.data = aml_op_start;
-                                                op->named.length =
-                                                    (u32) (parser_state->
-                                                           pkg_end -
-                                                           aml_op_start);
-                                                /* Skip body */
-                                                parser_state->aml =
-                                                    parser_state->pkg_end;
-                                                walk_state->arg_count = 0;
-                                        }
-                                        break;
-                                case AML_WHILE_OP:
+                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                                  "Pass1: Skipping an If/Else/While body\n"));
-                                        if (walk_state->control_state) {
+                                /* Skip body of if/else/while in pass 1 */
-                                                walk_state->control_state->
-                                                    control.package_end =
-                                                    parser_state->pkg_end;
-                                        }
-                                        break;
-                                default:
+                                walk_state->parser_state.aml =
+                                    walk_state->parser_state.pkg_end;
+                                walk_state->arg_count = 0;
+                                break;
-                                        /* No action for all other opcodes */
+                        default:
-                                        break;
-                                }
                                break;
                        }
                }
+#endif
-                /* Check for arguments that need to be processed */
+                switch (op->common.aml_opcode) {
+                case AML_METHOD_OP:
-                if (walk_state->arg_count) {
                        /*
-                         * There are arguments (complex ones), push Op and
+                         * Skip parsing of control method because we don't have enough
-                         * prepare for argument
+                         * info in the first pass to parse it correctly.
+                         *
+                         * Save the length and address of the body
                         */
-                        status = acpi_ps_push_scope(parser_state, op,
+                        op->named.data = walk_state->parser_state.aml;
-                                                    walk_state->arg_types,
+                        op->named.length = (u32)
-                                                    walk_state->arg_count);
+                            (walk_state->parser_state.pkg_end -
-                        if (ACPI_FAILURE(status)) {
+                             walk_state->parser_state.aml);
-                                goto close_this_op;
-                        }
-                        op = NULL;
-                        continue;
-                }
-                /*
+                        /* Skip body of method */
-                 * All arguments have been processed -- Op is complete,
-                 * prepare for next
-                 */
-                walk_state->op_info =
-                    acpi_ps_get_opcode_info(op->common.aml_opcode);
-                if (walk_state->op_info->flags & AML_NAMED) {
-                        if (acpi_gbl_depth) {
-                                acpi_gbl_depth--;
-                        }
-                        if (op->common.aml_opcode == AML_REGION_OP) {
+                        walk_state->parser_state.aml =
+                            walk_state->parser_state.pkg_end;
+                        walk_state->arg_count = 0;
+                        break;
+                case AML_BUFFER_OP:
+                case AML_PACKAGE_OP:
+                case AML_VAR_PACKAGE_OP:
+                        if ((op->common.parent) &&
+                            (op->common.parent->common.aml_opcode ==
+                             AML_NAME_OP)
+                            && (walk_state->pass_number <=
+                                ACPI_IMODE_LOAD_PASS2)) {
                                /*
-                                 * Skip parsing of control method or opregion body,
+                                 * Skip parsing of Buffers and Packages because we don't have
-                                 * because we don't have enough info in the first pass
+                                 * enough info in the first pass to parse them correctly.
-                                 * to parse them correctly.
-                                 *
-                                 * Completed parsing an op_region declaration, we now
-                                 * know the length.
                                 */
-                                op->named.length =
+                                op->named.data = aml_op_start;
-                                    (u32) (parser_state->aml - op->named.data);
+                                op->named.length = (u32)
-                        }
+                                    (walk_state->parser_state.pkg_end -
-                }
+                                     aml_op_start);
-                if (walk_state->op_info->flags & AML_CREATE) {
+                                /* Skip body */
-                        /*
-                         * Backup to beginning of create_xXXfield declaration (1 for
-                         * Opcode)
-                         *
-                         * body_length is unknown until we parse the body
-                         */
-                        op->named.length =
-                            (u32) (parser_state->aml - op->named.data);
-                }
-                /* This op complete, notify the dispatcher */
+                                walk_state->parser_state.aml =
+                                    walk_state->parser_state.pkg_end;
+                                walk_state->arg_count = 0;
+                        }
+                        break;
-                if (walk_state->ascending_callback != NULL) {
+                case AML_WHILE_OP:
-                        walk_state->op = op;
-                        walk_state->opcode = op->common.aml_opcode;
-                        status = walk_state->ascending_callback(walk_state);
+                        if (walk_state->control_state) {
-                        status =
+                                walk_state->control_state->control.package_end =
-                            acpi_ps_next_parse_state(walk_state, op, status);
+                                    walk_state->parser_state.pkg_end;
-                        if (status == AE_CTRL_PENDING) {
-                                status = AE_OK;
-                                goto close_this_op;
                        }
-                }
+                        break;
-              close_this_op:
-                /*
-                 * Finished one argument of the containing scope
-                 */
-                parser_state->scope->parse_scope.arg_count--;
-                /* Finished with pre_op */
+                default:
-                if (pre_op) {
+                        /* No action for all other opcodes */
-                        acpi_ps_free_op(pre_op);
+                        break;
-                        pre_op = NULL;
                }
-                /* Close this Op (will result in parse subtree deletion) */
+                break;
+        }
-                status2 = acpi_ps_complete_this_op(walk_state, op);
+        return_ACPI_STATUS(AE_OK);
-                if (ACPI_FAILURE(status2)) {
+}
-                        return_ACPI_STATUS(status2);
-                }
-                op = NULL;
-                switch (status) {
+/*******************************************************************************
-                case AE_OK:
+ *
-                        break;
+ * FUNCTION:    acpi_ps_complete_op
+ *
+ * PARAMETERS:  walk_state          - Current state
+ *              Op                  - Returned Op
+ *              Status              - Parse status before complete Op
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Complete Op
+ *
+ ******************************************************************************/
-                case AE_CTRL_TRANSFER:
+static acpi_status
+acpi_ps_complete_op(struct acpi_walk_state *walk_state,
+                    union acpi_parse_object **op, acpi_status status)
+{
+        acpi_status status2;
-                        /* We are about to transfer to a called method. */
+        ACPI_FUNCTION_TRACE_PTR(ps_complete_op, walk_state);
-                        walk_state->prev_op = op;
+        /*
-                        walk_state->prev_arg_types = walk_state->arg_types;
+         * Finished one argument of the containing scope
-                        return_ACPI_STATUS(status);
+         */
+        walk_state->parser_state.scope->parse_scope.arg_count--;
-                case AE_CTRL_END:
+        /* Close this Op (will result in parse subtree deletion) */
-                        acpi_ps_pop_scope(parser_state, &op,
+        status2 = acpi_ps_complete_this_op(walk_state, *op);
-                                          &walk_state->arg_types,
+        if (ACPI_FAILURE(status2)) {
-                                          &walk_state->arg_count);
+                return_ACPI_STATUS(status2);
+        }
-                        if (op) {
+        *op = NULL;
-                                walk_state->op = op;
-                                walk_state->op_info =
-                                    acpi_ps_get_opcode_info(op->common.
-                                                            aml_opcode);
-                                walk_state->opcode = op->common.aml_opcode;
-                                status =
+        switch (status) {
-                                    walk_state->ascending_callback(walk_state);
+        case AE_OK:
-                                status =
+                break;
-                                    acpi_ps_next_parse_state(walk_state, op,
-                                                             status);
-                                status2 =
+        case AE_CTRL_TRANSFER:
-                                    acpi_ps_complete_this_op(walk_state, op);
-                                if (ACPI_FAILURE(status2)) {
-                                        return_ACPI_STATUS(status2);
-                                }
-                                op = NULL;
-                        }
-                        status = AE_OK;
-                        break;
-                case AE_CTRL_BREAK:
+                /* We are about to transfer to a called method */
-                case AE_CTRL_CONTINUE:
-                        /* Pop off scopes until we find the While */
+                walk_state->prev_op = NULL;
+                walk_state->prev_arg_types = walk_state->arg_types;
+                return_ACPI_STATUS(status);
-                        while (!op || (op->common.aml_opcode != AML_WHILE_OP)) {
+        case AE_CTRL_END:
-                                acpi_ps_pop_scope(parser_state, &op,
-                                                  &walk_state->arg_types,
-                                                  &walk_state->arg_count);
-                                if (op->common.aml_opcode != AML_WHILE_OP) {
+                acpi_ps_pop_scope(&(walk_state->parser_state), op,
-                                        status2 =
+                                  &walk_state->arg_types,
-                                            acpi_ds_result_stack_pop
+                                  &walk_state->arg_count);
-                                            (walk_state);
-                                        if (ACPI_FAILURE(status2)) {
-                                                return_ACPI_STATUS(status2);
-                                        }
-                                }
-                        }
-                        /* Close this iteration of the While loop */
-                        walk_state->op = op;
+                if (*op) {
+                        walk_state->op = *op;
                        walk_state->op_info =
-                            acpi_ps_get_opcode_info(op->common.aml_opcode);
+                            acpi_ps_get_opcode_info((*op)->common.aml_opcode);
-                        walk_state->opcode = op->common.aml_opcode;
+                        walk_state->opcode = (*op)->common.aml_opcode;
                        status = walk_state->ascending_callback(walk_state);
                        status =
-                            acpi_ps_next_parse_state(walk_state, op, status);
+                            acpi_ps_next_parse_state(walk_state, *op, status);
-                        status2 = acpi_ps_complete_this_op(walk_state, op);
+                        status2 = acpi_ps_complete_this_op(walk_state, *op);
                        if (ACPI_FAILURE(status2)) {
                                return_ACPI_STATUS(status2);
                        }
-                        op = NULL;
+                }
-                        status = AE_OK;
-                        break;
-                case AE_CTRL_TERMINATE:
+                status = AE_OK;
+                break;
-                        status = AE_OK;
+        case AE_CTRL_BREAK:
+        case AE_CTRL_CONTINUE:
-                        /* Clean up */
+                /* Pop off scopes until we find the While */
-                        do {
-                                if (op) {
-                                        status2 =
-                                            acpi_ps_complete_this_op(walk_state,
-                                                                     op);
-                                        if (ACPI_FAILURE(status2)) {
-                                                return_ACPI_STATUS(status2);
-                                        }
-                                        status2 =
+                while (!(*op) || ((*op)->common.aml_opcode != AML_WHILE_OP)) {
-                                            acpi_ds_result_stack_pop
+                        acpi_ps_pop_scope(&(walk_state->parser_state), op,
-                                            (walk_state);
+                                          &walk_state->arg_types,
-                                        if (ACPI_FAILURE(status2)) {
+                                          &walk_state->arg_count);
-                                                return_ACPI_STATUS(status2);
-                                        }
-                                        acpi_ut_delete_generic_state
+                        if ((*op)->common.aml_opcode != AML_WHILE_OP) {
-                                            (acpi_ut_pop_generic_state
+                                status2 = acpi_ds_result_stack_pop(walk_state);
-                                             (&walk_state->control_state));
+                                if (ACPI_FAILURE(status2)) {
+                                        return_ACPI_STATUS(status2);
                                }
+                        }
+                }
-                                acpi_ps_pop_scope(parser_state, &op,
+                /* Close this iteration of the While loop */
-                                                  &walk_state->arg_types,
-                                                  &walk_state->arg_count);
-                        } while (op);
+                walk_state->op = *op;
+                walk_state->op_info =
+                    acpi_ps_get_opcode_info((*op)->common.aml_opcode);
+                walk_state->opcode = (*op)->common.aml_opcode;
-                        return_ACPI_STATUS(status);
+                status = walk_state->ascending_callback(walk_state);
+                status = acpi_ps_next_parse_state(walk_state, *op, status);
-                default:        /* All other non-AE_OK status */
+                status2 = acpi_ps_complete_this_op(walk_state, *op);
+                if (ACPI_FAILURE(status2)) {
+                        return_ACPI_STATUS(status2);
+                }
-                        do {
+                status = AE_OK;
-                                if (op) {
+                break;
-                                        status2 =
-                                            acpi_ps_complete_this_op(walk_state,
+        case AE_CTRL_TERMINATE:
-                                                                     op);
-                                        if (ACPI_FAILURE(status2)) {
+                /* Clean up */
-                                                return_ACPI_STATUS(status2);
+                do {
-                                        }
+                        if (*op) {
+                                status2 =
+                                    acpi_ps_complete_this_op(walk_state, *op);
+                                if (ACPI_FAILURE(status2)) {
+                                        return_ACPI_STATUS(status2);
+                                }
+                                status2 = acpi_ds_result_stack_pop(walk_state);
+                                if (ACPI_FAILURE(status2)) {
+                                        return_ACPI_STATUS(status2);
                                }
-                                acpi_ps_pop_scope(parser_state, &op,
+                                acpi_ut_delete_generic_state
-                                                  &walk_state->arg_types,
+                                    (acpi_ut_pop_generic_state
-                                                  &walk_state->arg_count);
+                                     (&walk_state->control_state));
+                        }
-                        } while (op);
+                        acpi_ps_pop_scope(&(walk_state->parser_state), op,
+                                          &walk_state->arg_types,
+                                          &walk_state->arg_count);
-                        /*
+                } while (*op);
-                         * TBD: Cleanup parse ops on error
-                         */
+                return_ACPI_STATUS(AE_OK);
-#if 0
-                        if (op == NULL) {
+        default:                /* All other non-AE_OK status */
-                                acpi_ps_pop_scope(parser_state, &op,
-                                                  &walk_state->arg_types,
+                do {
-                                                  &walk_state->arg_count);
+                        if (*op) {
+                                status2 =
+                                    acpi_ps_complete_this_op(walk_state, *op);
+                                if (ACPI_FAILURE(status2)) {
+                                        return_ACPI_STATUS(status2);
+                                }
                        }
-#endif
-                        walk_state->prev_op = op;
-                        walk_state->prev_arg_types = walk_state->arg_types;
-                        return_ACPI_STATUS(status);
-                }
-                /* This scope complete? */
+                        acpi_ps_pop_scope(&(walk_state->parser_state), op,
+                                          &walk_state->arg_types,
+                                          &walk_state->arg_count);
-                if (acpi_ps_has_completed_scope(parser_state)) {
+                } while (*op);
-                        acpi_ps_pop_scope(parser_state, &op,
+#if 0
+                /*
+                 * TBD: Cleanup parse ops on error
+                 */
+                if (*op == NULL) {
+                        acpi_ps_pop_scope(parser_state, op,
                                          &walk_state->arg_types,
                                          &walk_state->arg_count);
-                        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                          "Popped scope, Op=%p\n", op));
-                } else {
-                        op = NULL;
                }
+#endif
+                walk_state->prev_op = NULL;
+                walk_state->prev_arg_types = walk_state->arg_types;
+                return_ACPI_STATUS(status);
+        }
-        }                       /* while parser_state->Aml */
+        /* This scope complete? */
+        if (acpi_ps_has_completed_scope(&(walk_state->parser_state))) {
+                acpi_ps_pop_scope(&(walk_state->parser_state), op,
+                                  &walk_state->arg_types,
+                                  &walk_state->arg_count);
+                ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Popped scope, Op=%p\n", *op));
+        } else {
+                *op = NULL;
+        }
+        return_ACPI_STATUS(AE_OK);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_complete_final_op
+ *
+ * PARAMETERS:  walk_state          - Current state
+ *              Op                  - Current Op
+ *              Status              - Current parse status before complete last
+ *                                    Op
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Complete last Op.
+ *
+ ******************************************************************************/
+static acpi_status
+acpi_ps_complete_final_op(struct acpi_walk_state *walk_state,
+                          union acpi_parse_object *op, acpi_status status)
+{
+        acpi_status status2;
+        ACPI_FUNCTION_TRACE_PTR(ps_complete_final_op, walk_state);
        /*
         * Complete the last Op (if not completed), and clear the scope stack.
         * It is easily possible to end an AML "package" with an unbounded number
         * of open scopes (such as when several ASL blocks are closed with
-         * sequential closing braces).  We want to terminate each one cleanly.
+         * sequential closing braces). We want to terminate each one cleanly.
         */
        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "AML package complete at Op %p\n",
                          op));
@@ -838,8 +750,12 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                    acpi_ps_next_parse_state(walk_state, op,
                                                             status);
                                if (status == AE_CTRL_PENDING) {
-                                        status = AE_OK;
+                                        status =
-                                        goto close_this_op;
+                                            acpi_ps_complete_op(walk_state, &op,
+                                                                AE_OK);
+                                        if (ACPI_FAILURE(status)) {
+                                                return_ACPI_STATUS(status);
+                                        }
                                }
                                if (status == AE_CTRL_TERMINATE) {
@@ -858,7 +774,9 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                                        }
                                                }
-                                                acpi_ps_pop_scope(parser_state,
+                                                acpi_ps_pop_scope(&
+                                                                  (walk_state->
+                                                                   parser_state),
                                                                  &op,
                                                                  &walk_state->
                                                                  arg_types,
@@ -887,10 +805,252 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                        }
                }
-                acpi_ps_pop_scope(parser_state, &op, &walk_state->arg_types,
+                acpi_ps_pop_scope(&(walk_state->parser_state), &op,
+                                  &walk_state->arg_types,
                                  &walk_state->arg_count);
        } while (op);
        return_ACPI_STATUS(status);
 }
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_parse_loop
+ *
+ * PARAMETERS:  walk_state          - Current state
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Parse AML (pointed to by the current parser state) and return
+ *              a tree of ops.
+ *
+ ******************************************************************************/
+acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
+{
+        acpi_status status = AE_OK;
+        union acpi_parse_object *op = NULL;     /* current op */
+        struct acpi_parse_state *parser_state;
+        u8 *aml_op_start = NULL;
+        ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);
+        if (walk_state->descending_callback == NULL) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        parser_state = &walk_state->parser_state;
+        walk_state->arg_types = 0;
+#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
+        if (walk_state->walk_type & ACPI_WALK_METHOD_RESTART) {
+                /* We are restarting a preempted control method */
+                if (acpi_ps_has_completed_scope(parser_state)) {
+                        /*
+                         * We must check if a predicate to an IF or WHILE statement
+                         * was just completed
+                         */
+                        if ((parser_state->scope->parse_scope.op) &&
+                            ((parser_state->scope->parse_scope.op->common.
+                              aml_opcode == AML_IF_OP)
+                             || (parser_state->scope->parse_scope.op->common.
+                                 aml_opcode == AML_WHILE_OP))
+                            && (walk_state->control_state)
+                            && (walk_state->control_state->common.state ==
+                                ACPI_CONTROL_PREDICATE_EXECUTING)) {
+                                /*
+                                 * A predicate was just completed, get the value of the
+                                 * predicate and branch based on that value
+                                 */
+                                walk_state->op = NULL;
+                                status =
+                                    acpi_ds_get_predicate_value(walk_state,
+                                                                ACPI_TO_POINTER
+                                                                (TRUE));
+                                if (ACPI_FAILURE(status)
+                                    && ((status & AE_CODE_MASK) !=
+                                        AE_CODE_CONTROL)) {
+                                        if (status == AE_AML_NO_RETURN_VALUE) {
+                                                ACPI_EXCEPTION((AE_INFO, status,
+                                                                "Invoked method did not return a value"));
+                                        }
+                                        ACPI_EXCEPTION((AE_INFO, status,
+                                                        "GetPredicate Failed"));
+                                        return_ACPI_STATUS(status);
+                                }
+                                status =
+                                    acpi_ps_next_parse_state(walk_state, op,
+                                                             status);
+                        }
+                        acpi_ps_pop_scope(parser_state, &op,
+                                          &walk_state->arg_types,
+                                          &walk_state->arg_count);
+                        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                          "Popped scope, Op=%p\n", op));
+                } else if (walk_state->prev_op) {
+                        /* We were in the middle of an op */
+                        op = walk_state->prev_op;
+                        walk_state->arg_types = walk_state->prev_arg_types;
+                }
+        }
+#endif
+        /* Iterative parsing loop, while there is more AML to process: */
+        while ((parser_state->aml < parser_state->aml_end) || (op)) {
+                aml_op_start = parser_state->aml;
+                if (!op) {
+                        status =
+                            acpi_ps_create_op(walk_state, aml_op_start, &op);
+                        if (ACPI_FAILURE(status)) {
+                                if (status == AE_CTRL_PARSE_CONTINUE) {
+                                        continue;
+                                }
+                                if (status == AE_CTRL_PARSE_PENDING) {
+                                        status = AE_OK;
+                                }
+                                status =
+                                    acpi_ps_complete_op(walk_state, &op,
+                                                        status);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                                continue;
+                        }
+                        op->common.aml_offset = walk_state->aml_offset;
+                        if (walk_state->op_info) {
+                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                                  "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
+                                                  (u32) op->common.aml_opcode,
+                                                  walk_state->op_info->name, op,
+                                                  parser_state->aml,
+                                                  op->common.aml_offset));
+                        }
+                }
+                /*
+                 * Start arg_count at zero because we don't know if there are
+                 * any args yet
+                 */
+                walk_state->arg_count = 0;
+                /* Are there any arguments that must be processed? */
+                if (walk_state->arg_types) {
+                        /* Get arguments */
+                        status =
+                            acpi_ps_get_arguments(walk_state, aml_op_start, op);
+                        if (ACPI_FAILURE(status)) {
+                                status =
+                                    acpi_ps_complete_op(walk_state, &op,
+                                                        status);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                                continue;
+                        }
+                }
+                /* Check for arguments that need to be processed */
+                if (walk_state->arg_count) {
+                        /*
+                         * There are arguments (complex ones), push Op and
+                         * prepare for argument
+                         */
+                        status = acpi_ps_push_scope(parser_state, op,
+                                                    walk_state->arg_types,
+                                                    walk_state->arg_count);
+                        if (ACPI_FAILURE(status)) {
+                                status =
+                                    acpi_ps_complete_op(walk_state, &op,
+                                                        status);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                                continue;
+                        }
+                        op = NULL;
+                        continue;
+                }
+                /*
+                 * All arguments have been processed -- Op is complete,
+                 * prepare for next
+                 */
+                walk_state->op_info =
+                    acpi_ps_get_opcode_info(op->common.aml_opcode);
+                if (walk_state->op_info->flags & AML_NAMED) {
+                        if (acpi_gbl_depth) {
+                                acpi_gbl_depth--;
+                        }
+                        if (op->common.aml_opcode == AML_REGION_OP) {
+                                /*
+                                 * Skip parsing of control method or opregion body,
+                                 * because we don't have enough info in the first pass
+                                 * to parse them correctly.
+                                 *
+                                 * Completed parsing an op_region declaration, we now
+                                 * know the length.
+                                 */
+                                op->named.length =
+                                    (u32) (parser_state->aml - op->named.data);
+                        }
+                }
+                if (walk_state->op_info->flags & AML_CREATE) {
+                        /*
+                         * Backup to beginning of create_xXXfield declaration (1 for
+                         * Opcode)
+                         *
+                         * body_length is unknown until we parse the body
+                         */
+                        op->named.length =
+                            (u32) (parser_state->aml - op->named.data);
+                }
+                /* This op complete, notify the dispatcher */
+                if (walk_state->ascending_callback != NULL) {
+                        walk_state->op = op;
+                        walk_state->opcode = op->common.aml_opcode;
+                        status = walk_state->ascending_callback(walk_state);
+                        status =
+                            acpi_ps_next_parse_state(walk_state, op, status);
+                        if (status == AE_CTRL_PENDING) {
+                                status = AE_OK;
+                        }
+                }
+                status = acpi_ps_complete_op(walk_state, &op, status);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }                       /* while parser_state->Aml */
+        status = acpi_ps_complete_final_op(walk_state, op, status);
+        return_ACPI_STATUS(status);
+}
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 4bd25e32769f..16d8b6cc3c22 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index a02aa62fe1e5..5d63f48e56b5 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -540,6 +540,11 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                        if ((status == AE_ALREADY_EXISTS) &&
                            (!walk_state->method_desc->method.mutex)) {
+                                ACPI_INFO((AE_INFO,
+                                           "Marking method %4.4s as Serialized",
+                                           walk_state->method_node->name.
+                                           ascii));
                                /*
                                 * Method tried to create an object twice. The probable cause is
                                 * that the method cannot handle reentrancy.
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index a3e0314de24d..77cfa4ed0cfe 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index 0015717ef096..966e7ea2a0c4 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index d405387b7414..8ca52002db55 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index a84a547a0f1b..49f9757434e4 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 5d996c1140af..94103bced75e 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,6 @@ static void acpi_ps_start_trace(struct acpi_evaluate_info *info);
 static void acpi_ps_stop_trace(struct acpi_evaluate_info *info);
-static acpi_status acpi_ps_execute_pass(struct acpi_evaluate_info *info);
 static void
 acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action);
@@ -215,6 +213,8 @@ static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)
 acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 {
        acpi_status status;
+        union acpi_parse_object *op;
+        struct acpi_walk_state *walk_state;
        ACPI_FUNCTION_TRACE(ps_execute_method);
@@ -234,8 +234,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
        }
        /*
-         * The caller "owns" the parameters, so give each one an extra
+         * The caller "owns" the parameters, so give each one an extra reference
-         * reference
         */
        acpi_ps_update_parameter_list(info, REF_INCREMENT);
@@ -244,30 +243,50 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
        acpi_ps_start_trace(info);
        /*
-         * 1) Perform the first pass parse of the method to enter any
+         * Execute the method. Performs parse simultaneously
-         *    named objects that it creates into the namespace
         */
        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                          "**** Begin Method Parse **** Entry=%p obj=%p\n",
+                          "**** Begin Method Parse/Execute [%4.4s] **** Node=%p Obj=%p\n",
-                          info->resolved_node, info->obj_desc));
+                          info->resolved_node->name.ascii, info->resolved_node,
+                          info->obj_desc));
+        /* Create and init a Root Node */
+        op = acpi_ps_create_scope_op();
+        if (!op) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
+        /* Create and initialize a new walk state */
+        info->pass_number = ACPI_IMODE_EXECUTE;
+        walk_state =
+            acpi_ds_create_walk_state(info->obj_desc->method.owner_id, NULL,
+                                      NULL, NULL);
+        if (!walk_state) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
-        info->pass_number = 1;
+        status = acpi_ds_init_aml_walk(walk_state, op, info->resolved_node,
-        status = acpi_ps_execute_pass(info);
+                                       info->obj_desc->method.aml_start,
+                                       info->obj_desc->method.aml_length, info,
+                                       info->pass_number);
        if (ACPI_FAILURE(status)) {
+                acpi_ds_delete_walk_state(walk_state);
                goto cleanup;
        }
-        /*
+        /* Parse the AML */
-         * 2) Execute the method. Performs second pass parse simultaneously
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                          "**** Begin Method Execution **** Entry=%p obj=%p\n",
-                          info->resolved_node, info->obj_desc));
-        info->pass_number = 3;
+        status = acpi_ps_parse_aml(walk_state);
-        status = acpi_ps_execute_pass(info);
+        /* walk_state was deleted by parse_aml */
      cleanup:
+        acpi_ps_delete_parse_tree(op);
        /* End optional tracing */
        acpi_ps_stop_trace(info);
@@ -330,62 +349,3 @@ acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action)
                }
        }
 }
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ps_execute_pass
- *
- * PARAMETERS:  Info            - See struct acpi_evaluate_info
- *                                (Used: pass_number, Node, and obj_desc)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Single AML pass: Parse or Execute a control method
- *
- ******************************************************************************/
-static acpi_status acpi_ps_execute_pass(struct acpi_evaluate_info *info)
-{
-        acpi_status status;
-        union acpi_parse_object *op;
-        struct acpi_walk_state *walk_state;
-        ACPI_FUNCTION_TRACE(ps_execute_pass);
-        /* Create and init a Root Node */
-        op = acpi_ps_create_scope_op();
-        if (!op) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-        /* Create and initialize a new walk state */
-        walk_state =
-            acpi_ds_create_walk_state(info->obj_desc->method.owner_id, NULL,
-                                      NULL, NULL);
-        if (!walk_state) {
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-        status = acpi_ds_init_aml_walk(walk_state, op, info->resolved_node,
-                                       info->obj_desc->method.aml_start,
-                                       info->obj_desc->method.aml_length,
-                                       info->pass_number == 1 ? NULL : info,
-                                       info->pass_number);
-        if (ACPI_FAILURE(status)) {
-                acpi_ds_delete_walk_state(walk_state);
-                goto cleanup;
-        }
-        /* Parse the AML */
-        status = acpi_ps_parse_aml(walk_state);
-        /* Walk state was deleted by parse_aml */
-      cleanup:
-        acpi_ps_delete_parse_tree(op);
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 1e2ae6e7a7e4..55f57a61c55e 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -122,19 +122,17 @@ int acpi_pci_bind(struct acpi_device *device)
        if (!device || !device->parent)
                return -EINVAL;
-        pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
                return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
-        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
        if (!data) {
                kfree(pathname);
                return -ENOMEM;
        }
-        memset(data, 0, sizeof(struct acpi_pci_data));
        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n",
@@ -281,10 +279,9 @@ int acpi_pci_unbind(struct acpi_device *device)
        if (!device || !device->parent)
                return -EINVAL;
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
                return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
@@ -331,11 +328,9 @@ acpi_pci_bind_root(struct acpi_device *device,
        char *pathname = NULL;
        struct acpi_buffer buffer = { 0, NULL };
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
                return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
@@ -345,12 +340,11 @@ acpi_pci_bind_root(struct acpi_device *device,
                return -EINVAL;
        }
-        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
        if (!data) {
                kfree(pathname);
                return -ENOMEM;
        }
-        memset(data, 0, sizeof(struct acpi_pci_data));
        data->id = *id;
        data->bus = bus;
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index feda0341f5a7..fe7d007833ad 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -89,10 +89,9 @@ acpi_pci_irq_add_entry(acpi_handle handle,
        if (!prt)
                return -EINVAL;
-        entry = kmalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
+        entry = kzalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
        if (!entry)
                return -ENOMEM;
-        memset(entry, 0, sizeof(struct acpi_prt_entry));
        entry->id.segment = segment;
        entry->id.bus = bus;
@@ -161,10 +160,9 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
        static int first_time = 1;
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
                return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
        if (first_time) {
                acpi_prt.count = 0;
@@ -198,11 +196,10 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
                return -ENODEV;
        }
-        prt = kmalloc(buffer.length, GFP_KERNEL);
+        prt = kzalloc(buffer.length, GFP_KERNEL);
        if (!prt) {
                return -ENOMEM;
        }
-        memset(prt, 0, buffer.length);
        buffer.pointer = prt;
        status = acpi_get_irq_routing_table(handle, &buffer);
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index d53bd9878ca2..0f683c8c6fbc 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -103,7 +103,7 @@ DEFINE_MUTEX(acpi_link_lock);
 static acpi_status
 acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 {
-        struct acpi_pci_link *link = (struct acpi_pci_link *)context;
+        struct acpi_pci_link *link = context;
        u32 i = 0;
@@ -307,11 +307,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
        if (!link || !irq)
                return -EINVAL;
-        resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
+        resource = kzalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
        if (!resource)
                return -ENOMEM;
-        memset(resource, 0, sizeof(*resource) + 1);
        buffer.length = sizeof(*resource) + 1;
        buffer.pointer = resource;
@@ -514,7 +513,7 @@ int __init acpi_irq_penalty_init(void)
                }
        }
        /* Add a penalty for the SCI */
-        acpi_irq_penalty[acpi_fadt.sci_int] += PIRQ_PENALTY_PCI_USING;
+        acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING;
        return 0;
 }
@@ -613,7 +612,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
                return -1;
        }
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
        if (!link) {
                printk(KERN_ERR PREFIX "Invalid link context\n");
                return -1;
@@ -668,7 +667,7 @@ int acpi_pci_link_free_irq(acpi_handle handle)
                return -1;
        }
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
        if (!link) {
                printk(KERN_ERR PREFIX "Invalid link context\n");
                return -1;
@@ -718,10 +717,9 @@ static int acpi_pci_link_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        link = kmalloc(sizeof(struct acpi_pci_link), GFP_KERNEL);
+        link = kzalloc(sizeof(struct acpi_pci_link), GFP_KERNEL);
        if (!link)
                return -ENOMEM;
-        memset(link, 0, sizeof(struct acpi_pci_link));
        link->device = device;
        strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME);
@@ -787,7 +785,7 @@ static int irqrouter_resume(struct sys_device *dev)
        /* Make sure SCI is enabled again (Apple firmware bug?) */
-        acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK);
+        acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
        list_for_each(node, &acpi_link.entries) {
                link = list_entry(node, struct acpi_pci_link, node);
@@ -808,7 +806,7 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
        mutex_lock(&acpi_link_lock);
        list_del(&link->node);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 2e1a74a967bb..4ecf701687e8 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -98,11 +98,12 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
        struct acpi_pci_driver **pptr = &sub_driver;
        while (*pptr) {
-                if (*pptr != driver)
+                if (*pptr == driver)
-                        continue;
+                        break;
-                *pptr = (*pptr)->next;
+                pptr = &(*pptr)->next;
-                break;
        }
+        BUG_ON(!*pptr);
+        *pptr = (*pptr)->next;
        if (!driver->remove)
                return;
@@ -116,10 +117,23 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
 EXPORT_SYMBOL(acpi_pci_unregister_driver);
+acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)
+{
+        struct acpi_pci_root *tmp;
+        
+        list_for_each_entry(tmp, &acpi_pci_roots, node) {
+                if ((tmp->id.segment == (u16) seg) && (tmp->id.bus == (u16) bus))
+                        return tmp->device->handle;
+        }
+        return NULL;            
+}
+EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle);
 static acpi_status
 get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 {
-        int *busnr = (int *)data;
+        int *busnr = data;
        struct acpi_resource_address64 address;
        if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
@@ -180,10 +194,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        root = kmalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
+        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
        if (!root)
                return -ENOMEM;
-        memset(root, 0, sizeof(struct acpi_pci_root));
        INIT_LIST_HEAD(&root->node);
        root->device = device;
@@ -350,7 +363,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        root = (struct acpi_pci_root *)acpi_driver_data(device);
+        root = acpi_driver_data(device);
        kfree(root);
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index fe67a8af520e..0ba7dfbbb2ee 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -108,7 +108,7 @@ acpi_power_get_context(acpi_handle handle,
                return result;
        }
-        *resource = (struct acpi_power_resource *)acpi_driver_data(device);
+        *resource = acpi_driver_data(device);
        if (!resource)
                return -ENODEV;
@@ -442,7 +442,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)
        struct acpi_power_resource *resource = NULL;
-        resource = (struct acpi_power_resource *)seq->private;
+        resource = seq->private;
        if (!resource)
                goto end;
@@ -532,10 +532,9 @@ static int acpi_power_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        resource = kmalloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
+        resource = kzalloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
        if (!resource)
                return -ENOMEM;
-        memset(resource, 0, sizeof(struct acpi_power_resource));
        resource->device = device;
        strcpy(resource->name, device->pnp.bus_id);
@@ -590,7 +589,7 @@ static int acpi_power_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        resource = (struct acpi_power_resource *)acpi_driver_data(device);
+        resource = acpi_driver_data(device);
        acpi_power_remove_fs(device);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 46e72c388711..0079bc51082c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -277,7 +277,7 @@ static struct proc_dir_entry *acpi_processor_dir = NULL;
 static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
        if (!pr)
@@ -375,30 +375,126 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
 }
 /* Use the acpiid in MADT to map cpus in case of SMP */
 #ifndef CONFIG_SMP
-#define convert_acpiid_to_cpu(acpi_id) (-1)
+static int get_cpu_id(acpi_handle handle, u32 acpi_id) {return -1;}
 #else
+static struct acpi_table_madt *madt;
+static int map_lapic_id(struct acpi_subtable_header *entry,
+                 u32 acpi_id, int *apic_id)
+{
+        struct acpi_madt_local_apic *lapic =
+                (struct acpi_madt_local_apic *)entry;
+        if ((lapic->lapic_flags & ACPI_MADT_ENABLED) &&
+            lapic->processor_id == acpi_id) {
+                *apic_id = lapic->id;
+                return 1;
+        }
+        return 0;
+}
+static int map_lsapic_id(struct acpi_subtable_header *entry,
+                  u32 acpi_id, int *apic_id)
+{
+        struct acpi_madt_local_sapic *lsapic =
+                (struct acpi_madt_local_sapic *)entry;
+        /* Only check enabled APICs*/
+        if (lsapic->lapic_flags & ACPI_MADT_ENABLED) {
+                /* First check against id */
+                if (lsapic->processor_id == acpi_id) {
+                        *apic_id = lsapic->id;
+                        return 1;
+                /* Check against optional uid */
+                } else if (entry->length >= 16 &&
+                        lsapic->uid == acpi_id) {
+                        *apic_id = lsapic->uid;
+                        return 1;
+                }
+        }
+        return 0;
+}
 #ifdef CONFIG_IA64
-#define arch_acpiid_to_apicid   ia64_acpiid_to_sapicid
 #define arch_cpu_to_apicid      ia64_cpu_to_sapicid
-#define ARCH_BAD_APICID         (0xffff)
 #else
-#define arch_acpiid_to_apicid   x86_acpiid_to_apicid
 #define arch_cpu_to_apicid      x86_cpu_to_apicid
-#define ARCH_BAD_APICID         (0xff)
 #endif
-static int convert_acpiid_to_cpu(u8 acpi_id)
+static int map_madt_entry(u32 acpi_id)
+{
+        unsigned long madt_end, entry;
+        int apic_id = -1;
+        if (!madt)
+                return apic_id;
+        entry = (unsigned long)madt;
+        madt_end = entry + madt->header.length;
+        /* Parse all entries looking for a match. */
+        entry += sizeof(struct acpi_table_madt);
+        while (entry + sizeof(struct acpi_subtable_header) < madt_end) {
+                struct acpi_subtable_header *header =
+                        (struct acpi_subtable_header *)entry;
+                if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+                        if (map_lapic_id(header, acpi_id, &apic_id))
+                                break;
+                } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+                        if (map_lsapic_id(header, acpi_id, &apic_id))
+                                break;
+                }
+                entry += header->length;
+        }
+        return apic_id;
+}
+static int map_mat_entry(acpi_handle handle, u32 acpi_id)
+{
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        struct acpi_subtable_header *header;
+        int apic_id = -1;
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
+                goto exit;
+        if (!buffer.length || !buffer.pointer)
+                goto exit;
+        obj = buffer.pointer;
+        if (obj->type != ACPI_TYPE_BUFFER ||
+            obj->buffer.length < sizeof(struct acpi_subtable_header)) {
+                goto exit;
+        }
+        header = (struct acpi_subtable_header *)obj->buffer.pointer;
+        if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+                map_lapic_id(header, acpi_id, &apic_id);
+        } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+                map_lsapic_id(header, acpi_id, &apic_id);
+        }
+exit:
+        if (buffer.pointer)
+                kfree(buffer.pointer);
+        return apic_id;
+}
+static int get_cpu_id(acpi_handle handle, u32 acpi_id)
 {
-        u16 apic_id;
        int i;
+        int apic_id = -1;
-        apic_id = arch_acpiid_to_apicid[acpi_id];
+        apic_id = map_mat_entry(handle, acpi_id);
-        if (apic_id == ARCH_BAD_APICID)
+        if (apic_id == -1)
-                return -1;
+                apic_id = map_madt_entry(acpi_id);
+        if (apic_id == -1)
+                return apic_id;
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < NR_CPUS; ++i) {
                if (arch_cpu_to_apicid[i] == apic_id)
                        return i;
        }
@@ -410,7 +506,7 @@ static int convert_acpiid_to_cpu(u8 acpi_id)
                                 Driver Interface
   -------------------------------------------------------------------------- */
-static int acpi_processor_get_info(struct acpi_processor *pr)
+static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
 {
        acpi_status status = 0;
        union acpi_object object = { 0 };
@@ -431,7 +527,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
         * Check to see if we have bus mastering arbitration control.  This
         * is required for proper C3 usage (to maintain cache coherency).
         */
-        if (acpi_fadt.V1_pm2_cnt_blk && acpi_fadt.pm2_cnt_len) {
+        if (acpi_gbl_FADT.pm2_control_block && acpi_gbl_FADT.pm2_control_length) {
                pr->flags.bm_control = 1;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Bus mastering arbitration control present\n"));
@@ -439,24 +535,35 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "No bus mastering arbitration control\n"));
-        /*
+        /* Check if it is a Device with HID and UID */
-         * Evalute the processor object.  Note that it is common on SMP to
+        if (has_uid) {
-         * have the first (boot) processor with a valid PBLK address while
+                unsigned long value;
-         * all others have a NULL address.
+                status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
-         */
+                                                NULL, &value);
-        status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
+                if (ACPI_FAILURE(status)) {
-        if (ACPI_FAILURE(status)) {
+                        printk(KERN_ERR PREFIX "Evaluating processor _UID\n");
-                printk(KERN_ERR PREFIX "Evaluating processor object\n");
+                        return -ENODEV;
-                return -ENODEV;
+                }
-        }
+                pr->acpi_id = value;
+        } else {
-        /*
+                /*
-         * TBD: Synch processor ID (via LAPIC/LSAPIC structures) on SMP.
+                * Evalute the processor object.  Note that it is common on SMP to
-         *      >>> 'acpi_get_processor_id(acpi_id, &id)' in arch/xxx/acpi.c
+                * have the first (boot) processor with a valid PBLK address while
-         */
+                * all others have a NULL address.
-        pr->acpi_id = object.processor.proc_id;
+                */
+                status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
+                if (ACPI_FAILURE(status)) {
+                        printk(KERN_ERR PREFIX "Evaluating processor object\n");
+                        return -ENODEV;
+                }
-        cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
+                /*
+                * TBD: Synch processor ID (via LAPIC/LSAPIC structures) on SMP.
+                *      >>> 'acpi_get_processor_id(acpi_id, &id)' in arch/xxx/acpi.c
+                */
+                pr->acpi_id = object.processor.proc_id;
+        }
+        cpu_index = get_cpu_id(pr->handle, pr->acpi_id);
        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
        if (!cpu0_initialized && (cpu_index == -1) &&
@@ -473,12 +580,9 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
         *  less than the max # of CPUs. They should be ignored _iff
         *  they are physically not present.
         */
-        if (cpu_index == -1) {
+        if (pr->id == -1) {
                if (ACPI_FAILURE
                    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
-                        printk(KERN_ERR PREFIX
-                                    "Getting cpuindex for acpiid 0x%x\n",
-                                    pr->acpi_id);
                        return -ENODEV;
                }
        }
@@ -493,8 +597,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
                            object.processor.pblk_length);
        else {
                pr->throttling.address = object.processor.pblk_address;
-                pr->throttling.duty_offset = acpi_fadt.duty_offset;
+                pr->throttling.duty_offset = acpi_gbl_FADT.duty_offset;
-                pr->throttling.duty_width = acpi_fadt.duty_width;
+                pr->throttling.duty_width = acpi_gbl_FADT.duty_width;
                pr->pblk = object.processor.pblk_address;
@@ -528,7 +632,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
        pr = acpi_driver_data(device);
-        result = acpi_processor_get_info(pr);
+        result = acpi_processor_get_info(pr, device->flags.unique_id);
        if (result) {
                /* Processor is physically not present */
                return 0;
@@ -542,12 +646,12 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
         * Don't trust it blindly
         */
        if (processor_device_array[pr->id] != NULL &&
-            processor_device_array[pr->id] != (void *)device) {
+            processor_device_array[pr->id] != device) {
                printk(KERN_WARNING "BIOS reported wrong ACPI id"
                        "for the processor\n");
                return -ENODEV;
        }
-        processor_device_array[pr->id] = (void *)device;
+        processor_device_array[pr->id] = device;
        processors[pr->id] = pr;
@@ -578,7 +682,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)data;
+        struct acpi_processor *pr = data;
        struct acpi_device *device = NULL;
@@ -615,10 +719,9 @@ static int acpi_processor_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        pr = kmalloc(sizeof(struct acpi_processor), GFP_KERNEL);
+        pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
        if (!pr)
                return -ENOMEM;
-        memset(pr, 0, sizeof(struct acpi_processor));
        pr->handle = device->handle;
        strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);
@@ -637,7 +740,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        pr = (struct acpi_processor *)acpi_driver_data(device);
+        pr = acpi_driver_data(device);
        if (pr->id >= NR_CPUS) {
                kfree(pr);
@@ -899,15 +1002,21 @@ static int __init acpi_processor_init(void)
        memset(&processors, 0, sizeof(processors));
        memset(&errata, 0, sizeof(errata));
+#ifdef CONFIG_SMP
+        if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
+                                (struct acpi_table_header **)&madt)))
+                madt = 0;
+#endif
        acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
        if (!acpi_processor_dir)
-                return 0;
+                return -ENOMEM;
        acpi_processor_dir->owner = THIS_MODULE;
        result = acpi_bus_register_driver(&acpi_processor_driver);
        if (result < 0) {
                remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-                return 0;
+                return result;
        }
        acpi_processor_install_hotplug_notify();
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 65b3f056ad89..6c6751b1405b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -160,7 +160,7 @@ static inline u32 ticks_elapsed(u32 t1, u32 t2)
 {
        if (t2 >= t1)
                return (t2 - t1);
-        else if (!acpi_fadt.tmr_val_ext)
+        else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
                return (((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
        else
                return ((0xFFFFFFFF - t1) + t2);
@@ -187,8 +187,7 @@ acpi_processor_power_activate(struct acpi_processor *pr,
                case ACPI_STATE_C3:
                        /* Disable bus master reload */
                        if (new->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
+                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                                                  ACPI_MTX_DO_NOT_LOCK);
                        break;
                }
        }
@@ -198,8 +197,7 @@ acpi_processor_power_activate(struct acpi_processor *pr,
        case ACPI_STATE_C3:
                /* Enable bus master reload */
                if (old->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1,
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                                          ACPI_MTX_DO_NOT_LOCK);
                break;
        }
@@ -211,7 +209,11 @@ acpi_processor_power_activate(struct acpi_processor *pr,
 static void acpi_safe_halt(void)
 {
        current_thread_info()->status &= ~TS_POLLING;
-        smp_mb__after_clear_bit();
+        /*
+         * TS_POLLING-cleared state must be visible before we
+         * test NEED_RESCHED:
+         */
+        smp_mb();
        if (!need_resched())
                safe_halt();
        current_thread_info()->status |= TS_POLLING;
@@ -232,7 +234,7 @@ static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
                /* Dummy wait op - must do something useless after P_LVL2 read
                   because chipsets cannot guarantee that STPCLK# signal
                   gets asserted in time to freeze execution properly. */
-                unused = inl(acpi_fadt.xpm_tmr_blk.address);
+                unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
        }
 }
@@ -287,12 +289,10 @@ static void acpi_processor_idle(void)
                pr->power.bm_activity <<= diff;
-                acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS,
+                acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-                                  &bm_status, ACPI_MTX_DO_NOT_LOCK);
                if (bm_status) {
                        pr->power.bm_activity |= 0x1;
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS,
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-                                          1, ACPI_MTX_DO_NOT_LOCK);
                }
                /*
                 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
@@ -334,7 +334,7 @@ static void acpi_processor_idle(void)
         * detection phase, to work cleanly with logical CPU hotplug.
         */
        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
-            !pr->flags.has_cst && !acpi_fadt.plvl2_up)
+            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
                cx = &pr->power.states[ACPI_STATE_C1];
 #endif
@@ -345,7 +345,11 @@ static void acpi_processor_idle(void)
         */
        if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
                current_thread_info()->status &= ~TS_POLLING;
-                smp_mb__after_clear_bit();
+                /*
+                 * TS_POLLING-cleared state must be visible before we
+                 * test NEED_RESCHED:
+                 */
+                smp_mb();
                if (need_resched()) {
                        current_thread_info()->status |= TS_POLLING;
                        local_irq_enable();
@@ -376,11 +380,11 @@ static void acpi_processor_idle(void)
        case ACPI_STATE_C2:
                /* Get start time (ticks) */
-                t1 = inl(acpi_fadt.xpm_tmr_blk.address);
+                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                /* Invoke C2 */
                acpi_cstate_enter(cx);
                /* Get end time (ticks) */
-                t2 = inl(acpi_fadt.xpm_tmr_blk.address);
+                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 #ifdef CONFIG_GENERIC_TIME
                /* TSC halts in C2, so notify users */
@@ -403,8 +407,7 @@ static void acpi_processor_idle(void)
                                 * All CPUs are trying to go to C3
                                 * Disable bus master arbitration
                                 */
-                                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
+                                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
-                                                  ACPI_MTX_DO_NOT_LOCK);
                        }
                } else {
                        /* SMP with no shared cache... Invalidate cache  */
@@ -412,16 +415,15 @@ static void acpi_processor_idle(void)
                }
                /* Get start time (ticks) */
-                t1 = inl(acpi_fadt.xpm_tmr_blk.address);
+                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                /* Invoke C3 */
                acpi_cstate_enter(cx);
                /* Get end time (ticks) */
-                t2 = inl(acpi_fadt.xpm_tmr_blk.address);
+                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                if (pr->flags.bm_check) {
                        /* Enable bus master arbitration */
                        atomic_dec(&c3_cpu_count);
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
+                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
-                                          ACPI_MTX_DO_NOT_LOCK);
                }
 #ifdef CONFIG_GENERIC_TIME
@@ -449,7 +451,7 @@ static void acpi_processor_idle(void)
 #ifdef CONFIG_HOTPLUG_CPU
        /* Don't do promotion/demotion */
        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !acpi_fadt.plvl2_up) {
+            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
                next_state = cx;
                goto end;
        }
@@ -619,7 +621,8 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         * Check for P_LVL2_UP flag before entering C2 and above on
         * an SMP system. 
         */
-        if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
+        if ((num_online_cpus() > 1) &&
+            !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
                return -ENODEV;
 #endif
@@ -628,8 +631,8 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
        pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5;
        /* determine latencies from FADT */
-        pr->power.states[ACPI_STATE_C2].latency = acpi_fadt.plvl2_lat;
+        pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.C2latency;
-        pr->power.states[ACPI_STATE_C3].latency = acpi_fadt.plvl3_lat;
+        pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.C3latency;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "lvl2[0x%08x] lvl3[0x%08x]\n",
@@ -673,7 +676,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                return -ENODEV;
        }
-        cst = (union acpi_object *)buffer.pointer;
+        cst = buffer.pointer;
        /* There must be at least 2 elements */
        if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
@@ -702,14 +705,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                memset(&cx, 0, sizeof(cx));
-                element = (union acpi_object *)&(cst->package.elements[i]);
+                element = &(cst->package.elements[i]);
                if (element->type != ACPI_TYPE_PACKAGE)
                        continue;
                if (element->package.count != 4)
                        continue;
-                obj = (union acpi_object *)&(element->package.elements[0]);
+                obj = &(element->package.elements[0]);
                if (obj->type != ACPI_TYPE_BUFFER)
                        continue;
@@ -721,7 +724,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                        continue;
                /* There should be an easy way to extract an integer... */
-                obj = (union acpi_object *)&(element->package.elements[1]);
+                obj = &(element->package.elements[1]);
                if (obj->type != ACPI_TYPE_INTEGER)
                        continue;
@@ -754,13 +757,13 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                        }
                }
-                obj = (union acpi_object *)&(element->package.elements[2]);
+                obj = &(element->package.elements[2]);
                if (obj->type != ACPI_TYPE_INTEGER)
                        continue;
                cx.latency = obj->integer.value;
-                obj = (union acpi_object *)&(element->package.elements[3]);
+                obj = &(element->package.elements[3]);
                if (obj->type != ACPI_TYPE_INTEGER)
                        continue;
@@ -875,14 +878,13 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                 * WBINVD should be set in fadt, for C3 state to be
                 * supported on when bm_check is not required.
                 */
-                if (acpi_fadt.wb_invd != 1) {
+                if (!(acpi_gbl_FADT.flags & ACPI_FADT_WBINVD)) {
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                          "Cache invalidation should work properly"
                                          " for C3 to be enabled on SMP systems\n"));
                        return;
                }
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD,
+                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                                  0, ACPI_MTX_DO_NOT_LOCK);
        }
        /*
@@ -1029,7 +1031,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
        unsigned int i;
@@ -1088,7 +1090,7 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
                           pr->power.states[i].latency,
                           pr->power.states[i].usage,
-                           pr->power.states[i].time);
+                           (unsigned long long)pr->power.states[i].time);
        }
      end:
@@ -1156,9 +1158,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
        if (!pr)
                return -EINVAL;
-        if (acpi_fadt.cst_cnt && !nocst) {
+        if (acpi_gbl_FADT.cst_control && !nocst) {
                status =
-                    acpi_os_write_port(acpi_fadt.smi_cmd, acpi_fadt.cst_cnt, 8);
+                    acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8);
                if (ACPI_FAILURE(status)) {
                        ACPI_EXCEPTION((AE_INFO, status,
                                        "Notifying BIOS of _CST ability failed"));
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 6fd174a37149..058f13cf3b79 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -236,7 +236,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                return -ENODEV;
        }
-        pss = (union acpi_object *)buffer.pointer;
+        pss = buffer.pointer;
        if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
                printk(KERN_ERR PREFIX "Invalid _PSS data\n");
                result = -EFAULT;
@@ -322,10 +322,6 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
        if (result)
                return result;
-        result = acpi_processor_get_platform_limit(pr);
-        if (result)
-                return result;
        return 0;
 }
@@ -356,31 +352,24 @@ int acpi_processor_notify_smm(struct module *calling_module)
        is_done = -EIO;
-        /* Can't write pstate_cnt to smi_cmd if either value is zero */
+        /* Can't write pstate_control to smi_command if either value is zero */
-        if ((!acpi_fadt.smi_cmd) || (!acpi_fadt.pstate_cnt)) {
+        if ((!acpi_gbl_FADT.smi_command) || (!acpi_gbl_FADT.pstate_control)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_cnt\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_control\n"));
                module_put(calling_module);
                return 0;
        }
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Writing pstate_cnt [0x%x] to smi_cmd [0x%x]\n",
+                          "Writing pstate_control [0x%x] to smi_command [0x%x]\n",
-                          acpi_fadt.pstate_cnt, acpi_fadt.smi_cmd));
+                          acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));
-        /* FADT v1 doesn't support pstate_cnt, many BIOS vendors use
-         * it anyway, so we need to support it... */
-        if (acpi_fadt_is_v1) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Using v1.0 FADT reserved value for pstate_cnt\n"));
-        }
-        status = acpi_os_write_port(acpi_fadt.smi_cmd,
+        status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
-                                    (u32) acpi_fadt.pstate_cnt, 8);
+                                    (u32) acpi_gbl_FADT.pstate_control, 8);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status,
-                                "Failed to write pstate_cnt [0x%x] to "
+                                "Failed to write pstate_control [0x%x] to "
-                                "smi_cmd [0x%x]", acpi_fadt.pstate_cnt,
+                                "smi_command [0x%x]", acpi_gbl_FADT.pstate_control,
-                                acpi_fadt.smi_cmd));
+                                acpi_gbl_FADT.smi_command));
                module_put(calling_module);
                return status;
        }
@@ -410,7 +399,7 @@ static struct file_operations acpi_processor_perf_fops = {
 static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
        int i;
@@ -451,8 +440,8 @@ acpi_processor_write_performance(struct file *file,
                                 size_t count, loff_t * data)
 {
        int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct acpi_processor *pr = m->private;
        struct acpi_processor_performance *perf;
        char state_string[12] = { '\0' };
        unsigned int new_state = 0;
@@ -551,7 +540,7 @@ static int acpi_processor_get_psd(struct acpi_processor	*pr)
                return -ENODEV;
        }
-        psd = (union acpi_object *) buffer.pointer;
+        psd = buffer.pointer;
        if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
                result = -EFAULT;
@@ -736,10 +725,6 @@ int acpi_processor_preregister_performance(
        }
 err_ret:
-        if (retval) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error while parsing _PSD domain information. Assuming no coordination\n"));
-        }
        for_each_possible_cpu(i) {
                pr = processors[i];
                if (!pr || !pr->performance)
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index ef5e0f6efdba..40fecd67ad83 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -208,7 +208,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
        if (result)
                return result;
-        pr = (struct acpi_processor *)acpi_driver_data(device);
+        pr = acpi_driver_data(device);
        if (!pr)
                return -ENODEV;
@@ -348,8 +348,8 @@ static ssize_t acpi_processor_write_limit(struct file * file,
                                          size_t count, loff_t * data)
 {
        int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct acpi_processor *pr = m->private;
        char limit_string[25] = { '\0' };
        int px = 0;
        int tx = 0;
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index d044ec519db0..89dff3639abe 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -125,7 +125,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
                /* Used to clear all duty_value bits */
                duty_mask = pr->throttling.state_count - 1;
-                duty_mask <<= acpi_fadt.duty_offset;
+                duty_mask <<= acpi_gbl_FADT.duty_offset;
                duty_mask = ~duty_mask;
        }
@@ -208,7 +208,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
                return 0;
        }
-        pr->throttling.state_count = 1 << acpi_fadt.duty_width;
+        pr->throttling.state_count = 1 << acpi_gbl_FADT.duty_width;
        /*
         * Compute state values. Note that throttling displays a linear power/
@@ -259,7 +259,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
 static int acpi_processor_throttling_seq_show(struct seq_file *seq,
                                              void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
        int i = 0;
        int result = 0;
@@ -307,8 +307,8 @@ static ssize_t acpi_processor_write_throttling(struct file * file,
                                               size_t count, loff_t * data)
 {
        int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct acpi_processor *pr = m->private;
        char state_string[12] = { '\0' };
diff --git a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c
index 8fa3213ce000..271e61509eeb 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/resources/rsaddr.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index cf87b0230026..8c6d3fdec38a 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 008058acdd39..1358c06a969c 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index 9c99a723a860..de20a5d6decf 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 9e7ae2f8a1d3..7e3c335ab320 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c
index ea567167c4f2..b297bc3e4419 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsirq.c b/drivers/acpi/resources/rsirq.c
index 1fa63bc2e36f..5657f7b95039 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/resources/rsirq.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 29423ce030ca..a92755c8877d 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c
index a5131936d690..521eab7dd8df 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/resources/rsmemory.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index faf6e106b785..3b63b561b94e 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index a9cbee8e8b44..2442a8f8df57 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 1999e2ab7daa..991f8901498c 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 8908a975e575..f58fc7447ab4 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -923,7 +923,7 @@ static struct proc_dir_entry *acpi_battery_dir = NULL;
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        int cscale;
        int result = 0;
@@ -1076,7 +1076,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        int result = 0;
        int cscale;
@@ -1125,8 +1125,8 @@ static ssize_t
 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
                         size_t count, loff_t * ppos)
 {
-        struct seq_file *seq = (struct seq_file *)file->private_data;
+        struct seq_file *seq = file->private_data;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
        char alarm_string[12] = { '\0' };
        int result, old_alarm, new_alarm;
@@ -1160,14 +1160,14 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
        if (result) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "acpi_battery_set_alarm() failed\n"));
-                (void)acpi_battery_set_alarm(battery, old_alarm);
+                acpi_battery_set_alarm(battery, old_alarm);
                goto end;
        }
        result = acpi_battery_get_alarm(battery);
        if (result) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "acpi_battery_get_alarm() failed\n"));
-                (void)acpi_battery_set_alarm(battery, old_alarm);
+                acpi_battery_set_alarm(battery, old_alarm);
                goto end;
        }
@@ -1217,7 +1217,7 @@ static struct proc_dir_entry *acpi_ac_dir = NULL;
 static int acpi_ac_read_state(struct seq_file *seq, void *offset)
 {
-        struct acpi_sbs *sbs = (struct acpi_sbs *)seq->private;
+        struct acpi_sbs *sbs = seq->private;
        int result;
        if (sbs->zombie) {
@@ -1302,7 +1302,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                battery->init_state = 1;
        }
-        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
        result = acpi_sbs_generic_add_fs(&battery->battery_entry,
                                         acpi_battery_dir,
@@ -1485,7 +1485,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
                }
                if (old_battery_present != new_battery_present) {
-                        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+                        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
                        result = acpi_sbs_generate_event(sbs->device,
                                                         ACPI_SBS_BATTERY_NOTIFY_STATUS,
                                                         new_battery_present,
@@ -1498,7 +1498,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
                        }
                }
                if (old_remaining_capacity != battery->state.remaining_capacity) {
-                        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+                        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
                        result = acpi_sbs_generate_event(sbs->device,
                                                         ACPI_SBS_BATTERY_NOTIFY_STATUS,
                                                         new_battery_present,
@@ -1576,12 +1576,11 @@ static int acpi_sbs_add(struct acpi_device *device)
        int id, cnt;
        acpi_status status = AE_OK;
-        sbs = kmalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
+        sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
        if (!sbs) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "kmalloc() failed\n"));
                return -ENOMEM;
        }
-        memset(sbs, 0, sizeof(struct acpi_sbs));
        cnt = 0;
        while (cnt < 10) {
@@ -1659,7 +1658,7 @@ static int acpi_sbs_add(struct acpi_device *device)
        init_timer(&sbs->update_timer);
        if (update_mode == QUEUE_UPDATE_MODE) {
                status = acpi_os_execute(OSL_GPE_HANDLER,
-                                         acpi_sbs_update_queue, (void *)sbs);
+                                         acpi_sbs_update_queue, sbs);
                if (status != AE_OK) {
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                          "acpi_os_execute() failed\n"));
@@ -1685,7 +1684,7 @@ static int acpi_sbs_add(struct acpi_device *device)
 int acpi_sbs_remove(struct acpi_device *device, int type)
 {
-        struct acpi_sbs *sbs = NULL;
+        struct acpi_sbs *sbs;
        int id;
        if (!device) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 4139e65d0ff5..5049230ccf49 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1027,12 +1027,11 @@ acpi_add_single_object(struct acpi_device **child,
        if (!child)
                return -EINVAL;
-        device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL);
+        device = kzalloc(sizeof(struct acpi_device), GFP_KERNEL);
        if (!device) {
                printk(KERN_ERR PREFIX "Memory allocation error\n");
                return -ENOMEM;
        }
-        memset(device, 0, sizeof(struct acpi_device));
        device->handle = handle;
        device->parent = parent;
@@ -1368,14 +1367,14 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
        /*
         * Enumerate all fixed-feature devices.
         */
-        if (acpi_fadt.pwr_button == 0) {
+        if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) {
                result = acpi_add_single_object(&device, acpi_root,
                                                NULL,
                                                ACPI_BUS_TYPE_POWER_BUTTON,
                                                &ops);
        }
-        if (acpi_fadt.sleep_button == 0) {
+        if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
                result = acpi_add_single_object(&device, acpi_root,
                                                NULL,
                                                ACPI_BUS_TYPE_SLEEP_BUTTON,
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 34962578039d..ccc11b33d89c 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -73,7 +73,7 @@ acpi_system_write_sleep(struct file *file,
 static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
 {
        u32 sec, min, hr;
-        u32 day, mo, yr;
+        u32 day, mo, yr, cent = 0;
        unsigned char rtc_control = 0;
        unsigned long flags;
@@ -87,20 +87,19 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
        rtc_control = CMOS_READ(RTC_CONTROL);
        /* If we ever get an FACP with proper values... */
-        if (acpi_gbl_FADT->day_alrm)
+        if (acpi_gbl_FADT.day_alarm)
                /* ACPI spec: only low 6 its should be cared */
-                day = CMOS_READ(acpi_gbl_FADT->day_alrm) & 0x3F;
+                day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F;
        else
                day = CMOS_READ(RTC_DAY_OF_MONTH);
-        if (acpi_gbl_FADT->mon_alrm)
+        if (acpi_gbl_FADT.month_alarm)
-                mo = CMOS_READ(acpi_gbl_FADT->mon_alrm);
+                mo = CMOS_READ(acpi_gbl_FADT.month_alarm);
        else
                mo = CMOS_READ(RTC_MONTH);
-        if (acpi_gbl_FADT->century)
+        if (acpi_gbl_FADT.century)
-                yr = CMOS_READ(acpi_gbl_FADT->century) * 100 +
+                cent = CMOS_READ(acpi_gbl_FADT.century);
-                    CMOS_READ(RTC_YEAR);
-        else
+        yr = CMOS_READ(RTC_YEAR);
-                yr = CMOS_READ(RTC_YEAR);
        spin_unlock_irqrestore(&rtc_lock, flags);
@@ -111,10 +110,11 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
                BCD_TO_BIN(day);
                BCD_TO_BIN(mo);
                BCD_TO_BIN(yr);
+                BCD_TO_BIN(cent);
        }
        /* we're trusting the FADT (see above) */
-        if (!acpi_gbl_FADT->century)
+        if (!acpi_gbl_FADT.century)
                /* If we're not trusting the FADT, we should at least make it
                 * right for _this_ century... ehm, what is _this_ century?
                 *
@@ -134,6 +134,8 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
                 *
                 */
                yr += 2000;
+        else
+                yr += cent * 100;
        seq_printf(seq, "%4.4u-", yr);
        (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo);
@@ -317,12 +319,12 @@ acpi_system_write_alarm(struct file *file,
         * offsets into the CMOS RAM here -- which for some reason are pointing
         * to the RTC area of memory.
         */
-        if (acpi_gbl_FADT->day_alrm)
+        if (acpi_gbl_FADT.day_alarm)
-                CMOS_WRITE(day, acpi_gbl_FADT->day_alrm);
+                CMOS_WRITE(day, acpi_gbl_FADT.day_alarm);
-        if (acpi_gbl_FADT->mon_alrm)
+        if (acpi_gbl_FADT.month_alarm)
-                CMOS_WRITE(mo, acpi_gbl_FADT->mon_alrm);
+                CMOS_WRITE(mo, acpi_gbl_FADT.month_alarm);
-        if (acpi_gbl_FADT->century)
+        if (acpi_gbl_FADT.century)
-                CMOS_WRITE(yr / 100, acpi_gbl_FADT->century);
+                CMOS_WRITE(yr / 100, acpi_gbl_FADT.century);
        /* enable the rtc alarm interrupt */
        rtc_control |= RTC_AIE;
        CMOS_WRITE(rtc_control, RTC_CONTROL);
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index af1dbabaf0b1..fab8f2694f03 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -183,11 +183,11 @@ late_initcall(acpi_wakeup_device_init);
 #endif
 /*
- * Disable all wakeup GPEs before power off.
+ * Disable all wakeup GPEs before entering requested sleep state.
- * 
+ *      @sleep_state:   ACPI state
 * Since acpi_enter_sleep_state() will disable all
 * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from S5 as RUNTIME.
+ * are not enabled for wakeup from requested state as RUNTIME.
 */
 void acpi_gpe_sleep_prepare(u32 sleep_state)
 {
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 407b0e0281db..7147b0bdab0a 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -44,7 +44,6 @@ ACPI_MODULE_NAME("acpi_system")
 #define ACPI_SYSTEM_FILE_EVENT          "event"
 #define ACPI_SYSTEM_FILE_DSDT           "dsdt"
 #define ACPI_SYSTEM_FILE_FADT           "fadt"
-extern struct fadt_descriptor acpi_fadt;
 /*
 * Make ACPICA version work as module param
@@ -96,17 +95,16 @@ acpi_system_read_dsdt(struct file *file,
                      char __user * buffer, size_t count, loff_t * ppos)
 {
        acpi_status status = AE_OK;
-        struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_table_header *dsdt = NULL;
        ssize_t res;
-        status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
+        status = acpi_get_table(ACPI_SIG_DSDT, 1, &dsdt);
        if (ACPI_FAILURE(status))
                return -ENODEV;
        res = simple_read_from_buffer(buffer, count, ppos,
-                                      dsdt.pointer, dsdt.length);
+                                      dsdt, dsdt->length);
-        kfree(dsdt.pointer);
        return res;
 }
@@ -123,17 +121,16 @@ acpi_system_read_fadt(struct file *file,
                      char __user * buffer, size_t count, loff_t * ppos)
 {
        acpi_status status = AE_OK;
-        struct acpi_buffer fadt = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_table_header *fadt = NULL;
        ssize_t res;
-        status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &fadt);
+        status = acpi_get_table(ACPI_SIG_FADT, 1, &fadt);
        if (ACPI_FAILURE(status))
                return -ENODEV;
        res = simple_read_from_buffer(buffer, count, ppos,
-                                      fadt.pointer, fadt.length);
+                                      fadt, fadt->length);
-        kfree(fadt.pointer);
        return res;
 }
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index bfb3bfcf9e91..ba4cb200314a 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -38,154 +38,97 @@
 #define ACPI_MAX_TABLES         128
-static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
-        [ACPI_TABLE_UNKNOWN] = "????",
-        [ACPI_APIC] = "APIC",
-        [ACPI_BOOT] = "BOOT",
-        [ACPI_DBGP] = "DBGP",
-        [ACPI_DSDT] = "DSDT",
-        [ACPI_ECDT] = "ECDT",
-        [ACPI_ETDT] = "ETDT",
-        [ACPI_FADT] = "FACP",
-        [ACPI_FACS] = "FACS",
-        [ACPI_OEMX] = "OEM",
-        [ACPI_PSDT] = "PSDT",
-        [ACPI_SBST] = "SBST",
-        [ACPI_SLIT] = "SLIT",
-        [ACPI_SPCR] = "SPCR",
-        [ACPI_SRAT] = "SRAT",
-        [ACPI_SSDT] = "SSDT",
-        [ACPI_SPMI] = "SPMI",
-        [ACPI_HPET] = "HPET",
-        [ACPI_MCFG] = "MCFG",
-};
 static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
 static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
-/* System Description Table (RSDT/XSDT) */
+static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
-struct acpi_table_sdt {
-        unsigned long pa;
-        enum acpi_table_id id;
-        unsigned long size;
-} __attribute__ ((packed));
-static unsigned long sdt_pa;    /* Physical Address */
-static unsigned long sdt_count; /* Table count */
-static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES] __initdata;
+void acpi_table_print_madt_entry(struct acpi_subtable_header * header)
-void acpi_table_print(struct acpi_table_header *header, unsigned long phys_addr)
-{
-        char *name = NULL;
-        if (!header)
-                return;
-        /* Some table signatures aren't good table names */
-        if (!strncmp((char *)&header->signature,
-                     acpi_table_signatures[ACPI_APIC],
-                     sizeof(header->signature))) {
-                name = "MADT";
-        } else if (!strncmp((char *)&header->signature,
-                            acpi_table_signatures[ACPI_FADT],
-                            sizeof(header->signature))) {
-                name = "FADT";
-        } else
-                name = header->signature;
-        printk(KERN_DEBUG PREFIX
-               "%.4s (v%3.3d %6.6s %8.8s 0x%08x %.4s 0x%08x) @ 0x%p\n", name,
-               header->revision, header->oem_id, header->oem_table_id,
-               header->oem_revision, header->asl_compiler_id,
-               header->asl_compiler_revision, (void *)phys_addr);
-}
-void acpi_table_print_madt_entry(acpi_table_entry_header * header)
 {
        if (!header)
                return;
        switch (header->type) {
-        case ACPI_MADT_LAPIC:
+        case ACPI_MADT_TYPE_LOCAL_APIC:
                {
-                        struct acpi_table_lapic *p =
+                        struct acpi_madt_local_apic *p =
-                            (struct acpi_table_lapic *)header;
+                            (struct acpi_madt_local_apic *)header;
                        printk(KERN_INFO PREFIX
                               "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n",
-                               p->acpi_id, p->id,
+                               p->processor_id, p->id,
-                               p->flags.enabled ? "enabled" : "disabled");
+                               (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
                }
                break;
-        case ACPI_MADT_IOAPIC:
+        case ACPI_MADT_TYPE_IO_APIC:
                {
-                        struct acpi_table_ioapic *p =
+                        struct acpi_madt_io_apic *p =
-                            (struct acpi_table_ioapic *)header;
+                            (struct acpi_madt_io_apic *)header;
                        printk(KERN_INFO PREFIX
                               "IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n",
                               p->id, p->address, p->global_irq_base);
                }
                break;
-        case ACPI_MADT_INT_SRC_OVR:
+        case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE:
                {
-                        struct acpi_table_int_src_ovr *p =
+                        struct acpi_madt_interrupt_override *p =
-                            (struct acpi_table_int_src_ovr *)header;
+                            (struct acpi_madt_interrupt_override *)header;
                        printk(KERN_INFO PREFIX
                               "INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n",
-                               p->bus, p->bus_irq, p->global_irq,
+                               p->bus, p->source_irq, p->global_irq,
-                               mps_inti_flags_polarity[p->flags.polarity],
+                               mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK],
-                               mps_inti_flags_trigger[p->flags.trigger]);
+                               mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2]);
-                        if (p->flags.reserved)
+                        if (p->inti_flags  &
+                            ~(ACPI_MADT_POLARITY_MASK | ACPI_MADT_TRIGGER_MASK))
                                printk(KERN_INFO PREFIX
                                       "INT_SRC_OVR unexpected reserved flags: 0x%x\n",
-                                       p->flags.reserved);
+                                       p->inti_flags  &
+                                        ~(ACPI_MADT_POLARITY_MASK | ACPI_MADT_TRIGGER_MASK));
                }
                break;
-        case ACPI_MADT_NMI_SRC:
+        case ACPI_MADT_TYPE_NMI_SOURCE:
                {
-                        struct acpi_table_nmi_src *p =
+                        struct acpi_madt_nmi_source *p =
-                            (struct acpi_table_nmi_src *)header;
+                            (struct acpi_madt_nmi_source *)header;
                        printk(KERN_INFO PREFIX
                               "NMI_SRC (%s %s global_irq %d)\n",
-                               mps_inti_flags_polarity[p->flags.polarity],
+                               mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK],
-                               mps_inti_flags_trigger[p->flags.trigger],
+                               mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2],
                               p->global_irq);
                }
                break;
-        case ACPI_MADT_LAPIC_NMI:
+        case ACPI_MADT_TYPE_LOCAL_APIC_NMI:
                {
-                        struct acpi_table_lapic_nmi *p =
+                        struct acpi_madt_local_apic_nmi *p =
-                            (struct acpi_table_lapic_nmi *)header;
+                            (struct acpi_madt_local_apic_nmi *)header;
                        printk(KERN_INFO PREFIX
                               "LAPIC_NMI (acpi_id[0x%02x] %s %s lint[0x%x])\n",
-                               p->acpi_id,
+                               p->processor_id,
-                               mps_inti_flags_polarity[p->flags.polarity],
+                               mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK  ],
-                               mps_inti_flags_trigger[p->flags.trigger],
+                               mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2],
                               p->lint);
                }
                break;
-        case ACPI_MADT_LAPIC_ADDR_OVR:
+        case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE:
                {
-                        struct acpi_table_lapic_addr_ovr *p =
+                        struct acpi_madt_local_apic_override *p =
-                            (struct acpi_table_lapic_addr_ovr *)header;
+                            (struct acpi_madt_local_apic_override *)header;
                        printk(KERN_INFO PREFIX
                               "LAPIC_ADDR_OVR (address[%p])\n",
                               (void *)(unsigned long)p->address);
                }
                break;
-        case ACPI_MADT_IOSAPIC:
+        case ACPI_MADT_TYPE_IO_SAPIC:
                {
-                        struct acpi_table_iosapic *p =
+                        struct acpi_madt_io_sapic *p =
-                            (struct acpi_table_iosapic *)header;
+                            (struct acpi_madt_io_sapic *)header;
                        printk(KERN_INFO PREFIX
                               "IOSAPIC (id[0x%x] address[%p] gsi_base[%d])\n",
                               p->id, (void *)(unsigned long)p->address,
@@ -193,26 +136,26 @@ void acpi_table_print_madt_entry(acpi_table_entry_header * header)
                }
                break;
-        case ACPI_MADT_LSAPIC:
+        case ACPI_MADT_TYPE_LOCAL_SAPIC:
                {
-                        struct acpi_table_lsapic *p =
+                        struct acpi_madt_local_sapic *p =
-                            (struct acpi_table_lsapic *)header;
+                            (struct acpi_madt_local_sapic *)header;
                        printk(KERN_INFO PREFIX
                               "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n",
-                               p->acpi_id, p->id, p->eid,
+                               p->processor_id, p->id, p->eid,
-                               p->flags.enabled ? "enabled" : "disabled");
+                               (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
                }
                break;
-        case ACPI_MADT_PLAT_INT_SRC:
+        case ACPI_MADT_TYPE_INTERRUPT_SOURCE:
                {
-                        struct acpi_table_plat_int_src *p =
+                        struct acpi_madt_interrupt_source *p =
-                            (struct acpi_table_plat_int_src *)header;
+                            (struct acpi_madt_interrupt_source *)header;
                        printk(KERN_INFO PREFIX
                               "PLAT_INT_SRC (%s %s type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n",
-                               mps_inti_flags_polarity[p->flags.polarity],
+                               mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK],
-                               mps_inti_flags_trigger[p->flags.trigger],
+                               mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2],
-                               p->type, p->id, p->eid, p->iosapic_vector,
+                               p->type, p->id, p->eid, p->io_sapic_vector,
                               p->global_irq);
                }
                break;
@@ -225,342 +168,76 @@ void acpi_table_print_madt_entry(acpi_table_entry_header * header)
        }
 }
-static int
-acpi_table_compute_checksum(void *table_pointer, unsigned long length)
-{
-        u8 *p = (u8 *) table_pointer;
-        unsigned long remains = length;
-        unsigned long sum = 0;
-        if (!p || !length)
-                return -EINVAL;
-        while (remains--)
-                sum += *p++;
-        return (sum & 0xFF);
-}
-/*
- * acpi_get_table_header_early()
- * for acpi_blacklisted(), acpi_table_get_sdt()
- */
 int __init
-acpi_get_table_header_early(enum acpi_table_id id,
+acpi_table_parse_madt_family(char *id,
-                            struct acpi_table_header **header)
-{
-        unsigned int i;
-        enum acpi_table_id temp_id;
-        /* DSDT is different from the rest */
-        if (id == ACPI_DSDT)
-                temp_id = ACPI_FADT;
-        else
-                temp_id = id;
-        /* Locate the table. */
-        for (i = 0; i < sdt_count; i++) {
-                if (sdt_entry[i].id != temp_id)
-                        continue;
-                *header = (void *)
-                    __acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size);
-                if (!*header) {
-                        printk(KERN_WARNING PREFIX "Unable to map %s\n",
-                               acpi_table_signatures[temp_id]);
-                        return -ENODEV;
-                }
-                break;
-        }
-        if (!*header) {
-                printk(KERN_WARNING PREFIX "%s not present\n",
-                       acpi_table_signatures[id]);
-                return -ENODEV;
-        }
-        /* Map the DSDT header via the pointer in the FADT */
-        if (id == ACPI_DSDT) {
-                struct fadt_descriptor *fadt =
-                    (struct fadt_descriptor *)*header;
-                if (fadt->revision == 3 && fadt->Xdsdt) {
-                        *header = (void *)__acpi_map_table(fadt->Xdsdt,
-                                                           sizeof(struct
-                                                                  acpi_table_header));
-                } else if (fadt->V1_dsdt) {
-                        *header = (void *)__acpi_map_table(fadt->V1_dsdt,
-                                                           sizeof(struct
-                                                                  acpi_table_header));
-                } else
-                        *header = NULL;
-                if (!*header) {
-                        printk(KERN_WARNING PREFIX "Unable to map DSDT\n");
-                        return -ENODEV;
-                }
-        }
-        return 0;
-}
-int __init
-acpi_table_parse_madt_family(enum acpi_table_id id,
                             unsigned long madt_size,
                             int entry_id,
                             acpi_madt_entry_handler handler,
                             unsigned int max_entries)
 {
-        void *madt = NULL;
+        struct acpi_table_header *madt = NULL;
-        acpi_table_entry_header *entry;
+        struct acpi_subtable_header *entry;
        unsigned int count = 0;
        unsigned long madt_end;
-        unsigned int i;
        if (!handler)
                return -EINVAL;
        /* Locate the MADT (if exists). There should only be one. */
+        acpi_get_table(id, 0, &madt);
-        for (i = 0; i < sdt_count; i++) {
-                if (sdt_entry[i].id != id)
-                        continue;
-                madt = (void *)
-                    __acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size);
-                if (!madt) {
-                        printk(KERN_WARNING PREFIX "Unable to map %s\n",
-                               acpi_table_signatures[id]);
-                        return -ENODEV;
-                }
-                break;
-        }
        if (!madt) {
-                printk(KERN_WARNING PREFIX "%s not present\n",
+                printk(KERN_WARNING PREFIX "%4.4s not present\n", id);
-                       acpi_table_signatures[id]);
                return -ENODEV;
        }
-        madt_end = (unsigned long)madt + sdt_entry[i].size;
+        madt_end = (unsigned long)madt + madt->length;
        /* Parse all entries looking for a match. */
-        entry = (acpi_table_entry_header *)
+        entry = (struct acpi_subtable_header *)
            ((unsigned long)madt + madt_size);
-        while (((unsigned long)entry) + sizeof(acpi_table_entry_header) <
+        while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) <
               madt_end) {
                if (entry->type == entry_id
                    && (!max_entries || count++ < max_entries))
                        if (handler(entry, madt_end))
                                return -EINVAL;
-                entry = (acpi_table_entry_header *)
+                entry = (struct acpi_subtable_header *)
                    ((unsigned long)entry + entry->length);
        }
        if (max_entries && count > max_entries) {
-                printk(KERN_WARNING PREFIX "[%s:0x%02x] ignored %i entries of "
+                printk(KERN_WARNING PREFIX "[%4.4s:0x%02x] ignored %i entries of "
-                       "%i found\n", acpi_table_signatures[id], entry_id,
+                       "%i found\n", id, entry_id, count - max_entries, count);
-                       count - max_entries, count);
        }
        return count;
 }
 int __init
-acpi_table_parse_madt(enum acpi_madt_entry_id id,
+acpi_table_parse_madt(enum acpi_madt_type id,
                      acpi_madt_entry_handler handler, unsigned int max_entries)
 {
-        return acpi_table_parse_madt_family(ACPI_APIC,
+        return acpi_table_parse_madt_family(ACPI_SIG_MADT,
                                            sizeof(struct acpi_table_madt), id,
                                            handler, max_entries);
 }
-int __init acpi_table_parse(enum acpi_table_id id, acpi_table_handler handler)
+int __init acpi_table_parse(char *id, acpi_table_handler handler)
 {
-        int count = 0;
+        struct acpi_table_header *table = NULL;
-        unsigned int i = 0;
        if (!handler)
                return -EINVAL;
-        for (i = 0; i < sdt_count; i++) {
+        acpi_get_table(id, 0, &table);
-                if (sdt_entry[i].id != id)
+        if (table) {
-                        continue;
+                handler(table);
-                count++;
+                return 1;
-                if (count == 1)
+        } else
-                        handler(sdt_entry[i].pa, sdt_entry[i].size);
+                return 0;
-                else
-                        printk(KERN_WARNING PREFIX
-                               "%d duplicate %s table ignored.\n", count,
-                               acpi_table_signatures[id]);
-        }
-        return count;
-}
-static int __init acpi_table_get_sdt(struct acpi_table_rsdp *rsdp)
-{
-        struct acpi_table_header *header = NULL;
-        unsigned int i, id = 0;
-        if (!rsdp)
-                return -EINVAL;
-        /* First check XSDT (but only on ACPI 2.0-compatible systems) */
-        if ((rsdp->revision >= 2) &&
-            (((struct acpi20_table_rsdp *)rsdp)->xsdt_address)) {
-                struct acpi_table_xsdt *mapped_xsdt = NULL;
-                sdt_pa = ((struct acpi20_table_rsdp *)rsdp)->xsdt_address;
-                /* map in just the header */
-                header = (struct acpi_table_header *)
-                    __acpi_map_table(sdt_pa, sizeof(struct acpi_table_header));
-                if (!header) {
-                        printk(KERN_WARNING PREFIX
-                               "Unable to map XSDT header\n");
-                        return -ENODEV;
-                }
-                /* remap in the entire table before processing */
-                mapped_xsdt = (struct acpi_table_xsdt *)
-                    __acpi_map_table(sdt_pa, header->length);
-                if (!mapped_xsdt) {
-                        printk(KERN_WARNING PREFIX "Unable to map XSDT\n");
-                        return -ENODEV;
-                }
-                header = &mapped_xsdt->header;
-                if (strncmp(header->signature, "XSDT", 4)) {
-                        printk(KERN_WARNING PREFIX
-                               "XSDT signature incorrect\n");
-                        return -ENODEV;
-                }
-                if (acpi_table_compute_checksum(header, header->length)) {
-                        printk(KERN_WARNING PREFIX "Invalid XSDT checksum\n");
-                        return -ENODEV;
-                }
-                sdt_count =
-                    (header->length - sizeof(struct acpi_table_header)) >> 3;
-                if (sdt_count > ACPI_MAX_TABLES) {
-                        printk(KERN_WARNING PREFIX
-                               "Truncated %lu XSDT entries\n",
-                               (sdt_count - ACPI_MAX_TABLES));
-                        sdt_count = ACPI_MAX_TABLES;
-                }
-                for (i = 0; i < sdt_count; i++)
-                        sdt_entry[i].pa = (unsigned long)mapped_xsdt->entry[i];
-        }
-        /* Then check RSDT */
-        else if (rsdp->rsdt_address) {
-                struct acpi_table_rsdt *mapped_rsdt = NULL;
-                sdt_pa = rsdp->rsdt_address;
-                /* map in just the header */
-                header = (struct acpi_table_header *)
-                    __acpi_map_table(sdt_pa, sizeof(struct acpi_table_header));
-                if (!header) {
-                        printk(KERN_WARNING PREFIX
-                               "Unable to map RSDT header\n");
-                        return -ENODEV;
-                }
-                /* remap in the entire table before processing */
-                mapped_rsdt = (struct acpi_table_rsdt *)
-                    __acpi_map_table(sdt_pa, header->length);
-                if (!mapped_rsdt) {
-                        printk(KERN_WARNING PREFIX "Unable to map RSDT\n");
-                        return -ENODEV;
-                }
-                header = &mapped_rsdt->header;
-                if (strncmp(header->signature, "RSDT", 4)) {
-                        printk(KERN_WARNING PREFIX
-                               "RSDT signature incorrect\n");
-                        return -ENODEV;
-                }
-                if (acpi_table_compute_checksum(header, header->length)) {
-                        printk(KERN_WARNING PREFIX "Invalid RSDT checksum\n");
-                        return -ENODEV;
-                }
-                sdt_count =
-                    (header->length - sizeof(struct acpi_table_header)) >> 2;
-                if (sdt_count > ACPI_MAX_TABLES) {
-                        printk(KERN_WARNING PREFIX
-                               "Truncated %lu RSDT entries\n",
-                               (sdt_count - ACPI_MAX_TABLES));
-                        sdt_count = ACPI_MAX_TABLES;
-                }
-                for (i = 0; i < sdt_count; i++)
-                        sdt_entry[i].pa = (unsigned long)mapped_rsdt->entry[i];
-        }
-        else {
-                printk(KERN_WARNING PREFIX
-                       "No System Description Table (RSDT/XSDT) specified in RSDP\n");
-                return -ENODEV;
-        }
-        acpi_table_print(header, sdt_pa);
-        for (i = 0; i < sdt_count; i++) {
-                /* map in just the header */
-                header = (struct acpi_table_header *)
-                    __acpi_map_table(sdt_entry[i].pa,
-                                     sizeof(struct acpi_table_header));
-                if (!header)
-                        continue;
-                /* remap in the entire table before processing */
-                header = (struct acpi_table_header *)
-                    __acpi_map_table(sdt_entry[i].pa, header->length);
-                if (!header)
-                        continue;
-                acpi_table_print(header, sdt_entry[i].pa);
-                if (acpi_table_compute_checksum(header, header->length)) {
-                        printk(KERN_WARNING "  >>> ERROR: Invalid checksum\n");
-                        continue;
-                }
-                sdt_entry[i].size = header->length;
-                for (id = 0; id < ACPI_TABLE_COUNT; id++) {
-                        if (!strncmp((char *)&header->signature,
-                                     acpi_table_signatures[id],
-                                     sizeof(header->signature))) {
-                                sdt_entry[i].id = id;
-                        }
-                }
-        }
-        /* 
-         * The DSDT is *not* in the RSDT (why not? no idea.) but we want
-         * to print its info, because this is what people usually blacklist
-         * against. Unfortunately, we don't know the phys_addr, so just
-         * print 0. Maybe no one will notice.
-         */
-        if (!acpi_get_table_header_early(ACPI_DSDT, &header))
-                acpi_table_print(header, 0);
-        return 0;
 }
 /*
@@ -568,54 +245,13 @@ static int __init acpi_table_get_sdt(struct acpi_table_rsdp *rsdp)
 *
 * find RSDP, find and checksum SDT/XSDT.
 * checksum all tables, print SDT/XSDT
- * 
+ *
 * result: sdt_entry[] is initialized
 */
 int __init acpi_table_init(void)
 {
-        struct acpi_table_rsdp *rsdp = NULL;
+        acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
-        unsigned long rsdp_phys = 0;
-        int result = 0;
-        /* Locate and map the Root System Description Table (RSDP) */
-        rsdp_phys = acpi_find_rsdp();
-        if (!rsdp_phys) {
-                printk(KERN_ERR PREFIX "Unable to locate RSDP\n");
-                return -ENODEV;
-        }
-        rsdp = (struct acpi_table_rsdp *)__acpi_map_table(rsdp_phys,
-                sizeof(struct acpi_table_rsdp));
-        if (!rsdp) {
-                printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
-                return -ENODEV;
-        }
-        printk(KERN_DEBUG PREFIX
-               "RSDP (v%3.3d %6.6s                                ) @ 0x%p\n",
-               rsdp->revision, rsdp->oem_id, (void *)rsdp_phys);
-        if (rsdp->revision < 2)
-                result =
-                    acpi_table_compute_checksum(rsdp,
-                                                sizeof(struct acpi_table_rsdp));
-        else
-                result =
-                    acpi_table_compute_checksum(rsdp,
-                                                ((struct acpi20_table_rsdp *)
-                                                 rsdp)->length);
-        if (result) {
-                printk(KERN_WARNING "  >>> ERROR: Invalid checksum\n");
-                return -ENODEV;
-        }
-        /* Locate and map the System Description table (RSDT/XSDT) */
-        if (acpi_table_get_sdt(rsdp))
-                return -ENODEV;
        return 0;
 }
diff --git a/drivers/acpi/tables/Makefile b/drivers/acpi/tables/Makefile
index aa4c69594d97..0a7d7afac255 100644
--- a/drivers/acpi/tables/Makefile
+++ b/drivers/acpi/tables/Makefile
@@ -2,7 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
-obj-y := tbconvrt.o  tbget.o     tbrsdt.o   tbxface.o  \
+obj-y := tbxface.o tbinstal.o  tbutils.o tbfind.o tbfadt.o
-         tbgetall.o  tbinstal.o  tbutils.o  tbxfroot.o
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
deleted file mode 100644
index d697fcb35d52..000000000000
--- a/drivers/acpi/tables/tbconvrt.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbconvrt - ACPI Table conversion utilities
- *
- *****************************************************************************/
-/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
- * 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 <acpi/actables.h>
-#define _COMPONENT          ACPI_TABLES
-ACPI_MODULE_NAME("tbconvrt")
-/* Local prototypes */
-static void
-acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,
-                             u8 register_bit_width,
-                             acpi_physical_address address);
-static void
-acpi_tb_convert_fadt1(struct fadt_descriptor *local_fadt,
-                      struct fadt_descriptor_rev1 *original_fadt);
-static void
-acpi_tb_convert_fadt2(struct fadt_descriptor *local_fadt,
-                      struct fadt_descriptor *original_fadt);
-u8 acpi_fadt_is_v1;
-ACPI_EXPORT_SYMBOL(acpi_fadt_is_v1)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table_count
- *
- * PARAMETERS:  RSDP            - Pointer to the RSDP
- *              RSDT            - Pointer to the RSDT/XSDT
- *
- * RETURN:      The number of tables pointed to by the RSDT or XSDT.
- *
- * DESCRIPTION: Calculate the number of tables.  Automatically handles either
- *              an RSDT or XSDT.
- *
- ******************************************************************************/
-u32
-acpi_tb_get_table_count(struct rsdp_descriptor *RSDP,
-                        struct acpi_table_header *RSDT)
-{
-        u32 pointer_size;
-        ACPI_FUNCTION_ENTRY();
-        /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
-        if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-                pointer_size = sizeof(u32);
-        } else {
-                pointer_size = sizeof(u64);
-        }
-        /*
-         * Determine the number of tables pointed to by the RSDT/XSDT.
-         * This is defined by the ACPI Specification to be the number of
-         * pointers contained within the RSDT/XSDT.  The size of the pointers
-         * is architecture-dependent.
-         */
-        return ((RSDT->length -
-                 sizeof(struct acpi_table_header)) / pointer_size);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_convert_to_xsdt
- *
- * PARAMETERS:  table_info      - Info about the RSDT
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Convert an RSDT to an XSDT (internal common format)
- *
- ******************************************************************************/
-acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)
-{
-        acpi_size table_size;
-        u32 i;
-        struct xsdt_descriptor *new_table;
-        ACPI_FUNCTION_ENTRY();
-        /* Compute size of the converted XSDT */
-        table_size = ((acpi_size) acpi_gbl_rsdt_table_count * sizeof(u64)) +
-            sizeof(struct acpi_table_header);
-        /* Allocate an XSDT */
-        new_table = ACPI_ALLOCATE_ZEROED(table_size);
-        if (!new_table) {
-                return (AE_NO_MEMORY);
-        }
-        /* Copy the header and set the length */
-        ACPI_MEMCPY(new_table, table_info->pointer,
-                    sizeof(struct acpi_table_header));
-        new_table->length = (u32) table_size;
-        /* Copy the table pointers */
-        for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
-                /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
-                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-                        ACPI_STORE_ADDRESS(new_table->table_offset_entry[i],
-                                           (ACPI_CAST_PTR
-                                            (struct rsdt_descriptor,
-                                             table_info->pointer))->
-                                           table_offset_entry[i]);
-                } else {
-                        new_table->table_offset_entry[i] =
-                            (ACPI_CAST_PTR(struct xsdt_descriptor,
-                                           table_info->pointer))->
-                            table_offset_entry[i];
-                }
-        }
-        /* Delete the original table (either mapped or in a buffer) */
-        acpi_tb_delete_single_table(table_info);
-        /* Point the table descriptor to the new table */
-        table_info->pointer =
-            ACPI_CAST_PTR(struct acpi_table_header, new_table);
-        table_info->length = table_size;
-        table_info->allocation = ACPI_MEM_ALLOCATED;
-        return (AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_init_generic_address
- *
- * PARAMETERS:  new_gas_struct      - GAS struct to be initialized
- *              register_bit_width  - Width of this register
- *              Address             - Address of the register
- *
- * RETURN:      None
- *
- * DESCRIPTION: Initialize a GAS structure.
- *
- ******************************************************************************/
-static void
-acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,
-                             u8 register_bit_width,
-                             acpi_physical_address address)
-{
-        ACPI_STORE_ADDRESS(new_gas_struct->address, address);
-        new_gas_struct->address_space_id = ACPI_ADR_SPACE_SYSTEM_IO;
-        new_gas_struct->register_bit_width = register_bit_width;
-        new_gas_struct->register_bit_offset = 0;
-        new_gas_struct->access_width = 0;
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_convert_fadt1
- *
- * PARAMETERS:  local_fadt      - Pointer to new FADT
- *              original_fadt   - Pointer to old FADT
- *
- * RETURN:      None, populates local_fadt
- *
- * DESCRIPTION: Convert an ACPI 1.0 FADT to common internal format
- *
- ******************************************************************************/
-static void
-acpi_tb_convert_fadt1(struct fadt_descriptor *local_fadt,
-                      struct fadt_descriptor_rev1 *original_fadt)
-{
-        /* ACPI 1.0 FACS */
-        /* The BIOS stored FADT should agree with Revision 1.0 */
-        acpi_fadt_is_v1 = 1;
-        /*
-         * Copy the table header and the common part of the tables.
-         *
-         * The 2.0 table is an extension of the 1.0 table, so the entire 1.0
-         * table can be copied first, then expand some fields to 64 bits.
-         */
-        ACPI_MEMCPY(local_fadt, original_fadt,
-                    sizeof(struct fadt_descriptor_rev1));
-        /* Convert table pointers to 64-bit fields */
-        ACPI_STORE_ADDRESS(local_fadt->xfirmware_ctrl,
-                           local_fadt->V1_firmware_ctrl);
-        ACPI_STORE_ADDRESS(local_fadt->Xdsdt, local_fadt->V1_dsdt);
-        /*
-         * System Interrupt Model isn't used in ACPI 2.0
-         * (local_fadt->Reserved1 = 0;)
-         */
-        /*
-         * This field is set by the OEM to convey the preferred power management
-         * profile to OSPM. It doesn't have any 1.0 equivalence.  Since we don't
-         * know what kind of 32-bit system this is, we will use "unspecified".
-         */
-        local_fadt->prefer_PM_profile = PM_UNSPECIFIED;
-        /*
-         * Processor Performance State Control. This is the value OSPM writes to
-         * the SMI_CMD register to assume processor performance state control
-         * responsibility. There isn't any equivalence in 1.0, but as many 1.x
-         * ACPI tables contain _PCT and _PSS we also keep this value, unless
-         * acpi_strict is set.
-         */
-        if (acpi_strict)
-                local_fadt->pstate_cnt = 0;
-        /*
-         * Support for the _CST object and C States change notification.
-         * This data item hasn't any 1.0 equivalence so leave it zero.
-         */
-        local_fadt->cst_cnt = 0;
-        /*
-         * FADT Rev 2 was an interim FADT released between ACPI 1.0 and ACPI 2.0.
-         * It primarily adds the FADT reset mechanism.
-         */
-        if ((original_fadt->revision == 2) &&
-            (original_fadt->length ==
-             sizeof(struct fadt_descriptor_rev2_minus))) {
-                /*
-                 * Grab the entire generic address struct, plus the 1-byte reset value
-                 * that immediately follows.
-                 */
-                ACPI_MEMCPY(&local_fadt->reset_register,
-                            &(ACPI_CAST_PTR(struct fadt_descriptor_rev2_minus,
-                                            original_fadt))->reset_register,
-                            sizeof(struct acpi_generic_address) + 1);
-        } else {
-                /*
-                 * Since there isn't any equivalence in 1.0 and since it is highly
-                 * likely that a 1.0 system has legacy support.
-                 */
-                local_fadt->iapc_boot_arch = BAF_LEGACY_DEVICES;
-        }
-        /*
-         * Convert the V1.0 block addresses to V2.0 GAS structures
-         */
-        acpi_tb_init_generic_address(&local_fadt->xpm1a_evt_blk,
-                                     local_fadt->pm1_evt_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm1a_evt_blk);
-        acpi_tb_init_generic_address(&local_fadt->xpm1b_evt_blk,
-                                     local_fadt->pm1_evt_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm1b_evt_blk);
-        acpi_tb_init_generic_address(&local_fadt->xpm1a_cnt_blk,
-                                     local_fadt->pm1_cnt_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm1a_cnt_blk);
-        acpi_tb_init_generic_address(&local_fadt->xpm1b_cnt_blk,
-                                     local_fadt->pm1_cnt_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm1b_cnt_blk);
-        acpi_tb_init_generic_address(&local_fadt->xpm2_cnt_blk,
-                                     local_fadt->pm2_cnt_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm2_cnt_blk);
-        acpi_tb_init_generic_address(&local_fadt->xpm_tmr_blk,
-                                     local_fadt->pm_tm_len,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_pm_tmr_blk);
-        acpi_tb_init_generic_address(&local_fadt->xgpe0_blk, 0,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_gpe0_blk);
-        acpi_tb_init_generic_address(&local_fadt->xgpe1_blk, 0,
-                                     (acpi_physical_address) local_fadt->
-                                     V1_gpe1_blk);
-        /* Create separate GAS structs for the PM1 Enable registers */
-        acpi_tb_init_generic_address(&acpi_gbl_xpm1a_enable,
-                                     (u8) ACPI_DIV_2(acpi_gbl_FADT->
-                                                     pm1_evt_len),
-                                     (acpi_physical_address)
-                                     (local_fadt->xpm1a_evt_blk.address +
-                                      ACPI_DIV_2(acpi_gbl_FADT->pm1_evt_len)));
-        /* PM1B is optional; leave null if not present */
-        if (local_fadt->xpm1b_evt_blk.address) {
-                acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
-                                             (u8) ACPI_DIV_2(acpi_gbl_FADT->
-                                                             pm1_evt_len),
-                                             (acpi_physical_address)
-                                             (local_fadt->xpm1b_evt_blk.
-                                              address +
-                                              ACPI_DIV_2(acpi_gbl_FADT->
-                                                         pm1_evt_len)));
-        }
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_convert_fadt2
- *
- * PARAMETERS:  local_fadt      - Pointer to new FADT
- *              original_fadt   - Pointer to old FADT
- *
- * RETURN:      None, populates local_fadt
- *
- * DESCRIPTION: Convert an ACPI 2.0 FADT to common internal format.
- *              Handles optional "X" fields.
- *
- ******************************************************************************/
-static void
-acpi_tb_convert_fadt2(struct fadt_descriptor *local_fadt,
-                      struct fadt_descriptor *original_fadt)
-{
-        /* We have an ACPI 2.0 FADT but we must copy it to our local buffer */
-        ACPI_MEMCPY(local_fadt, original_fadt, sizeof(struct fadt_descriptor));
-        /*
-         * "X" fields are optional extensions to the original V1.0 fields, so
-         * we must selectively expand V1.0 fields if the corresponding X field
-         * is zero.
-         */
-        if (!(local_fadt->xfirmware_ctrl)) {
-                ACPI_STORE_ADDRESS(local_fadt->xfirmware_ctrl,
-                                   local_fadt->V1_firmware_ctrl);
-        }
-        if (!(local_fadt->Xdsdt)) {
-                ACPI_STORE_ADDRESS(local_fadt->Xdsdt, local_fadt->V1_dsdt);
-        }
-        if (!(local_fadt->xpm1a_evt_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm1a_evt_blk,
-                                             local_fadt->pm1_evt_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm1a_evt_blk);
-        }
-        if (!(local_fadt->xpm1b_evt_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm1b_evt_blk,
-                                             local_fadt->pm1_evt_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm1b_evt_blk);
-        }
-        if (!(local_fadt->xpm1a_cnt_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm1a_cnt_blk,
-                                             local_fadt->pm1_cnt_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm1a_cnt_blk);
-        }
-        if (!(local_fadt->xpm1b_cnt_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm1b_cnt_blk,
-                                             local_fadt->pm1_cnt_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm1b_cnt_blk);
-        }
-        if (!(local_fadt->xpm2_cnt_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm2_cnt_blk,
-                                             local_fadt->pm2_cnt_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm2_cnt_blk);
-        }
-        if (!(local_fadt->xpm_tmr_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xpm_tmr_blk,
-                                             local_fadt->pm_tm_len,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_pm_tmr_blk);
-        }
-        if (!(local_fadt->xgpe0_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xgpe0_blk,
-                                             0,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_gpe0_blk);
-        }
-        if (!(local_fadt->xgpe1_blk.address)) {
-                acpi_tb_init_generic_address(&local_fadt->xgpe1_blk,
-                                             0,
-                                             (acpi_physical_address)
-                                             local_fadt->V1_gpe1_blk);
-        }
-        /* Create separate GAS structs for the PM1 Enable registers */
-        acpi_tb_init_generic_address(&acpi_gbl_xpm1a_enable,
-                                     (u8) ACPI_DIV_2(acpi_gbl_FADT->
-                                                     pm1_evt_len),
-                                     (acpi_physical_address)
-                                     (local_fadt->xpm1a_evt_blk.address +
-                                      ACPI_DIV_2(acpi_gbl_FADT->pm1_evt_len)));
-        acpi_gbl_xpm1a_enable.address_space_id =
-            local_fadt->xpm1a_evt_blk.address_space_id;
-        /* PM1B is optional; leave null if not present */
-        if (local_fadt->xpm1b_evt_blk.address) {
-                acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
-                                             (u8) ACPI_DIV_2(acpi_gbl_FADT->
-                                                             pm1_evt_len),
-                                             (acpi_physical_address)
-                                             (local_fadt->xpm1b_evt_blk.
-                                              address +
-                                              ACPI_DIV_2(acpi_gbl_FADT->
-                                                         pm1_evt_len)));
-                acpi_gbl_xpm1b_enable.address_space_id =
-                    local_fadt->xpm1b_evt_blk.address_space_id;
-        }
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_convert_table_fadt
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Converts a BIOS supplied ACPI 1.0 FADT to a local
- *              ACPI 2.0 FADT. If the BIOS supplied a 2.0 FADT then it is simply
- *              copied to the local FADT.  The ACPI CA software uses this
- *              local FADT. Thus a significant amount of special #ifdef
- *              type codeing is saved.
- *
- ******************************************************************************/
-acpi_status acpi_tb_convert_table_fadt(void)
-{
-        struct fadt_descriptor *local_fadt;
-        struct acpi_table_desc *table_desc;
-        ACPI_FUNCTION_TRACE(tb_convert_table_fadt);
-        /*
-         * acpi_gbl_FADT is valid. Validate the FADT length. The table must be
-         * at least as long as the version 1.0 FADT
-         */
-        if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev1)) {
-                ACPI_ERROR((AE_INFO, "FADT is invalid, too short: 0x%X",
-                            acpi_gbl_FADT->length));
-                return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
-        }
-        /* Allocate buffer for the ACPI 2.0(+) FADT */
-        local_fadt = ACPI_ALLOCATE_ZEROED(sizeof(struct fadt_descriptor));
-        if (!local_fadt) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-        if (acpi_gbl_FADT->revision >= FADT2_REVISION_ID) {
-                if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor)) {
-                        /* Length is too short to be a V2.0 table */
-                        ACPI_WARNING((AE_INFO,
-                                      "Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table",
-                                      acpi_gbl_FADT->length,
-                                      acpi_gbl_FADT->revision));
-                        acpi_tb_convert_fadt1(local_fadt,
-                                              (void *)acpi_gbl_FADT);
-                } else {
-                        /* Valid V2.0 table */
-                        acpi_tb_convert_fadt2(local_fadt, acpi_gbl_FADT);
-                }
-        } else {
-                /* Valid V1.0 table */
-                acpi_tb_convert_fadt1(local_fadt, (void *)acpi_gbl_FADT);
-        }
-        /* Global FADT pointer will point to the new common V2.0 FADT */
-        acpi_gbl_FADT = local_fadt;
-        acpi_gbl_FADT->length = sizeof(struct fadt_descriptor);
-        /* Free the original table */
-        table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_FADT].next;
-        acpi_tb_delete_single_table(table_desc);
-        /* Install the new table */
-        table_desc->pointer =
-            ACPI_CAST_PTR(struct acpi_table_header, acpi_gbl_FADT);
-        table_desc->allocation = ACPI_MEM_ALLOCATED;
-        table_desc->length = sizeof(struct fadt_descriptor);
-        /* Dump the entire FADT */
-        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
-                          "Hex dump of common internal FADT, size %d (%X)\n",
-                          acpi_gbl_FADT->length, acpi_gbl_FADT->length));
-        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_FADT),
-                         acpi_gbl_FADT->length);
-        return_ACPI_STATUS(AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_build_common_facs
- *
- * PARAMETERS:  table_info      - Info for currently installed FACS
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Convert ACPI 1.0 and ACPI 2.0 FACS to a common internal
- *              table format.
- *
- ******************************************************************************/
-acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)
-{
-        ACPI_FUNCTION_TRACE(tb_build_common_facs);
-        /* Absolute minimum length is 24, but the ACPI spec says 64 */
-        if (acpi_gbl_FACS->length < 24) {
-                ACPI_ERROR((AE_INFO, "Invalid FACS table length: 0x%X",
-                            acpi_gbl_FACS->length));
-                return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
-        }
-        if (acpi_gbl_FACS->length < 64) {
-                ACPI_WARNING((AE_INFO,
-                              "FACS is shorter than the ACPI specification allows: 0x%X, using anyway",
-                              acpi_gbl_FACS->length));
-        }
-        /* Copy fields to the new FACS */
-        acpi_gbl_common_fACS.global_lock = &(acpi_gbl_FACS->global_lock);
-        if ((acpi_gbl_RSDP->revision < 2) ||
-            (acpi_gbl_FACS->length < 32) ||
-            (!(acpi_gbl_FACS->xfirmware_waking_vector))) {
-                /* ACPI 1.0 FACS or short table or optional X_ field is zero */
-                acpi_gbl_common_fACS.firmware_waking_vector = ACPI_CAST_PTR(u64,
-                                                                            &
-                                                                            (acpi_gbl_FACS->
-                                                                             firmware_waking_vector));
-                acpi_gbl_common_fACS.vector_width = 32;
-        } else {
-                /* ACPI 2.0 FACS with valid X_ field */
-                acpi_gbl_common_fACS.firmware_waking_vector =
-                    &acpi_gbl_FACS->xfirmware_waking_vector;
-                acpi_gbl_common_fACS.vector_width = 64;
-        }
-        return_ACPI_STATUS(AE_OK);
-}
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
new file mode 100644
index 000000000000..807c7116e94b
--- /dev/null
+++ b/drivers/acpi/tables/tbfadt.c
@@ -0,0 +1,434 @@
+/******************************************************************************
+ *
+ * Module Name: tbfadt   - FADT table utilities
+ *
+ *****************************************************************************/
+/*
+ * Copyright (C) 2000 - 2007, R. Byron Moore
+ * 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 <acpi/actables.h>
+#define _COMPONENT          ACPI_TABLES
+ACPI_MODULE_NAME("tbfadt")
+/* Local prototypes */
+static void inline
+acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
+                             u8 bit_width, u64 address);
+static void acpi_tb_convert_fadt(void);
+static void acpi_tb_validate_fadt(void);
+/* Table for conversion of FADT to common internal format and FADT validation */
+typedef struct acpi_fadt_info {
+        char *name;
+        u8 target;
+        u8 source;
+        u8 length;
+        u8 type;
+} acpi_fadt_info;
+#define ACPI_FADT_REQUIRED          1
+#define ACPI_FADT_SEPARATE_LENGTH   2
+static struct acpi_fadt_info fadt_info_table[] = {
+        {"Pm1aEventBlock", ACPI_FADT_OFFSET(xpm1a_event_block),
+         ACPI_FADT_OFFSET(pm1a_event_block),
+         ACPI_FADT_OFFSET(pm1_event_length), ACPI_FADT_REQUIRED},
+        {"Pm1bEventBlock", ACPI_FADT_OFFSET(xpm1b_event_block),
+         ACPI_FADT_OFFSET(pm1b_event_block),
+         ACPI_FADT_OFFSET(pm1_event_length), 0},
+        {"Pm1aControlBlock", ACPI_FADT_OFFSET(xpm1a_control_block),
+         ACPI_FADT_OFFSET(pm1a_control_block),
+         ACPI_FADT_OFFSET(pm1_control_length), ACPI_FADT_REQUIRED},
+        {"Pm1bControlBlock", ACPI_FADT_OFFSET(xpm1b_control_block),
+         ACPI_FADT_OFFSET(pm1b_control_block),
+         ACPI_FADT_OFFSET(pm1_control_length), 0},
+        {"Pm2ControlBlock", ACPI_FADT_OFFSET(xpm2_control_block),
+         ACPI_FADT_OFFSET(pm2_control_block),
+         ACPI_FADT_OFFSET(pm2_control_length), ACPI_FADT_SEPARATE_LENGTH},
+        {"PmTimerBlock", ACPI_FADT_OFFSET(xpm_timer_block),
+         ACPI_FADT_OFFSET(pm_timer_block),
+         ACPI_FADT_OFFSET(pm_timer_length), ACPI_FADT_REQUIRED},
+        {"Gpe0Block", ACPI_FADT_OFFSET(xgpe0_block),
+         ACPI_FADT_OFFSET(gpe0_block),
+         ACPI_FADT_OFFSET(gpe0_block_length), ACPI_FADT_SEPARATE_LENGTH},
+        {"Gpe1Block", ACPI_FADT_OFFSET(xgpe1_block),
+         ACPI_FADT_OFFSET(gpe1_block),
+         ACPI_FADT_OFFSET(gpe1_block_length), ACPI_FADT_SEPARATE_LENGTH}
+};
+#define ACPI_FADT_INFO_ENTRIES        (sizeof (fadt_info_table) / sizeof (struct acpi_fadt_info))
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_init_generic_address
+ *
+ * PARAMETERS:  generic_address     - GAS struct to be initialized
+ *              bit_width           - Width of this register
+ *              Address             - Address of the register
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Initialize a Generic Address Structure (GAS)
+ *              See the ACPI specification for a full description and
+ *              definition of this structure.
+ *
+ ******************************************************************************/
+static void inline
+acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
+                             u8 bit_width, u64 address)
+{
+        /*
+         * The 64-bit Address field is non-aligned in the byte packed
+         * GAS struct.
+         */
+        ACPI_MOVE_64_TO_64(&generic_address->address, &address);
+        /* All other fields are byte-wide */
+        generic_address->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
+        generic_address->bit_width = bit_width;
+        generic_address->bit_offset = 0;
+        generic_address->access_width = 0;
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_parse_fadt
+ *
+ * PARAMETERS:  table_index         - Index for the FADT
+ *              Flags               - Flags
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Initialize the FADT, DSDT and FACS tables
+ *              (FADT contains the addresses of the DSDT and FACS)
+ *
+ ******************************************************************************/
+void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
+{
+        u32 length;
+        struct acpi_table_header *table;
+        /*
+         * The FADT has multiple versions with different lengths,
+         * and it contains pointers to both the DSDT and FACS tables.
+         *
+         * Get a local copy of the FADT and convert it to a common format
+         * Map entire FADT, assumed to be smaller than one page.
+         */
+        length = acpi_gbl_root_table_list.tables[table_index].length;
+        table =
+            acpi_os_map_memory(acpi_gbl_root_table_list.tables[table_index].
+                               address, length);
+        if (!table) {
+                return;
+        }
+        /*
+         * Validate the FADT checksum before we copy the table. Ignore
+         * checksum error as we want to try to get the DSDT and FACS.
+         */
+        (void)acpi_tb_verify_checksum(table, length);
+        /* Obtain a local copy of the FADT in common ACPI 2.0+ format */
+        acpi_tb_create_local_fadt(table, length);
+        /* All done with the real FADT, unmap it */
+        acpi_os_unmap_memory(table, length);
+        /* Obtain the DSDT and FACS tables via their addresses within the FADT */
+        acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
+                              flags, ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
+        acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,
+                              flags, ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_create_local_fadt
+ *
+ * PARAMETERS:  Table               - Pointer to BIOS FADT
+ *              Length              - Length of the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Get a local copy of the FADT and convert it to a common format.
+ *              Performs validation on some important FADT fields.
+ *
+ ******************************************************************************/
+void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
+{
+        /*
+         * Check if the FADT is larger than what we know about (ACPI 2.0 version).
+         * Truncate the table, but make some noise.
+         */
+        if (length > sizeof(struct acpi_table_fadt)) {
+                ACPI_WARNING((AE_INFO,
+                              "FADT (revision %u) is longer than ACPI 2.0 version, truncating length 0x%X to 0x%zX",
+                              table->revision, (unsigned)length,
+                              sizeof(struct acpi_table_fadt)));
+        }
+        /* Copy the entire FADT locally. Zero first for tb_convert_fadt */
+        ACPI_MEMSET(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
+        ACPI_MEMCPY(&acpi_gbl_FADT, table,
+                    ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
+        /*
+         * 1) Convert the local copy of the FADT to the common internal format
+         * 2) Validate some of the important values within the FADT
+         */
+        acpi_tb_convert_fadt();
+        acpi_tb_validate_fadt();
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_convert_fadt
+ *
+ * PARAMETERS:  None, uses acpi_gbl_FADT
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Converts all versions of the FADT to a common internal format.
+ *              -> Expand all 32-bit addresses to 64-bit.
+ *
+ * NOTE:        acpi_gbl_FADT must be of size (struct acpi_table_fadt),
+ *              and must contain a copy of the actual FADT.
+ *
+ * ACPICA will use the "X" fields of the FADT for all addresses.
+ *
+ * "X" fields are optional extensions to the original V1.0 fields. Even if
+ * they are present in the structure, they can be optionally not used by
+ * setting them to zero. Therefore, we must selectively expand V1.0 fields
+ * if the corresponding X field is zero.
+ *
+ * For ACPI 1.0 FADTs, all address fields are expanded to the corresponding
+ * "X" fields.
+ *
+ * For ACPI 2.0 FADTs, any "X" fields that are NULL are filled in by
+ * expanding the corresponding ACPI 1.0 field.
+ *
+ ******************************************************************************/
+static void acpi_tb_convert_fadt(void)
+{
+        u8 pm1_register_length;
+        struct acpi_generic_address *target;
+        acpi_native_uint i;
+        /* Update the local FADT table header length */
+        acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
+        /* Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary */
+        if (!acpi_gbl_FADT.Xfacs) {
+                acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
+        }
+        if (!acpi_gbl_FADT.Xdsdt) {
+                acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
+        }
+        /*
+         * Expand the 32-bit V1.0 addresses to the 64-bit "X" generic address
+         * structures as necessary.
+         */
+        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+                target =
+                    ACPI_ADD_PTR(struct acpi_generic_address, &acpi_gbl_FADT,
+                                 fadt_info_table[i].target);
+                /* Expand only if the X target is null */
+                if (!target->address) {
+                        acpi_tb_init_generic_address(target,
+                                                     *ACPI_ADD_PTR(u8,
+                                                                   &acpi_gbl_FADT,
+                                                                   fadt_info_table
+                                                                   [i].length),
+                                                     (u64) * ACPI_ADD_PTR(u32,
+                                                                          &acpi_gbl_FADT,
+                                                                          fadt_info_table
+                                                                          [i].
+                                                                          source));
+                }
+        }
+        /*
+         * Calculate separate GAS structs for the PM1 Enable registers.
+         * These addresses do not appear (directly) in the FADT, so it is
+         * useful to calculate them once, here.
+         *
+         * The PM event blocks are split into two register blocks, first is the
+         * PM Status Register block, followed immediately by the PM Enable Register
+         * block. Each is of length (pm1_event_length/2)
+         */
+        pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
+        /* The PM1A register block is required */
+        acpi_tb_init_generic_address(&acpi_gbl_xpm1a_enable,
+                                     pm1_register_length,
+                                     (acpi_gbl_FADT.xpm1a_event_block.address +
+                                      pm1_register_length));
+        /* Don't forget to copy space_id of the GAS */
+        acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+        /* The PM1B register block is optional, ignore if not present */
+        if (acpi_gbl_FADT.xpm1b_event_block.address) {
+                acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
+                                             pm1_register_length,
+                                             (acpi_gbl_FADT.xpm1b_event_block.
+                                              address + pm1_register_length));
+                /* Don't forget to copy space_id of the GAS */
+                acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+        }
+}
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_validate_fadt
+ *
+ * PARAMETERS:  Table           - Pointer to the FADT to be validated
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Validate various important fields within the FADT. If a problem
+ *              is found, issue a message, but no status is returned.
+ *              Used by both the table manager and the disassembler.
+ *
+ * Possible additional checks:
+ * (acpi_gbl_FADT.pm1_event_length >= 4)
+ * (acpi_gbl_FADT.pm1_control_length >= 2)
+ * (acpi_gbl_FADT.pm_timer_length >= 4)
+ * Gpe block lengths must be multiple of 2
+ *
+ ******************************************************************************/
+static void acpi_tb_validate_fadt(void)
+{
+        u32 *address32;
+        struct acpi_generic_address *address64;
+        u8 length;
+        acpi_native_uint i;
+        /* Examine all of the 64-bit extended address fields (X fields) */
+        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+                /* Generate pointers to the 32-bit and 64-bit addresses and get the length */
+                address64 =
+                    ACPI_ADD_PTR(struct acpi_generic_address, &acpi_gbl_FADT,
+                                 fadt_info_table[i].target);
+                address32 =
+                    ACPI_ADD_PTR(u32, &acpi_gbl_FADT,
+                                 fadt_info_table[i].source);
+                length =
+                    *ACPI_ADD_PTR(u8, &acpi_gbl_FADT,
+                                  fadt_info_table[i].length);
+                if (fadt_info_table[i].type & ACPI_FADT_REQUIRED) {
+                        /*
+                         * Field is required (Pm1a_event, Pm1a_control, pm_timer).
+                         * Both the address and length must be non-zero.
+                         */
+                        if (!address64->address || !length) {
+                                ACPI_ERROR((AE_INFO,
+                                            "Required field \"%s\" has zero address and/or length: %8.8X%8.8X/%X",
+                                            fadt_info_table[i].name,
+                                            ACPI_FORMAT_UINT64(address64->
+                                                               address),
+                                            length));
+                        }
+                } else if (fadt_info_table[i].type & ACPI_FADT_SEPARATE_LENGTH) {
+                        /*
+                         * Field is optional (PM2Control, GPE0, GPE1) AND has its own
+                         * length field. If present, both the address and length must be valid.
+                         */
+                        if ((address64->address && !length)
+                            || (!address64->address && length)) {
+                                ACPI_WARNING((AE_INFO,
+                                              "Optional field \"%s\" has zero address or length: %8.8X%8.8X/%X",
+                                              fadt_info_table[i].name,
+                                              ACPI_FORMAT_UINT64(address64->
+                                                                 address),
+                                              length));
+                        }
+                }
+                /* If both 32- and 64-bit addresses are valid (non-zero), they must match */
+                if (address64->address && *address32 &&
+                    (address64->address != (u64) * address32)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "32/64X address mismatch in \"%s\": [%8.8X] [%8.8X%8.8X], using 64X",
+                                    fadt_info_table[i].name, *address32,
+                                    ACPI_FORMAT_UINT64(address64->address)));
+                }
+        }
+}
diff --git a/drivers/acpi/tables/tbfind.c b/drivers/acpi/tables/tbfind.c
new file mode 100644
index 000000000000..058c064948e1
--- /dev/null
+++ b/drivers/acpi/tables/tbfind.c
@@ -0,0 +1,126 @@
+/******************************************************************************
+ *
+ * Module Name: tbfind   - find table
+ *
+ *****************************************************************************/
+/*
+ * Copyright (C) 2000 - 2007, R. Byron Moore
+ * 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 <acpi/actables.h>
+#define _COMPONENT          ACPI_TABLES
+ACPI_MODULE_NAME("tbfind")
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_find_table
+ *
+ * PARAMETERS:  Signature           - String with ACPI table signature
+ *              oem_id              - String with the table OEM ID
+ *              oem_table_id        - String with the OEM Table ID
+ *              table_index         - Where the table index is returned
+ *
+ * RETURN:      Status and table index
+ *
+ * DESCRIPTION: Find an ACPI table (in the RSDT/XSDT) that matches the
+ *              Signature, OEM ID and OEM Table ID. Returns an index that can
+ *              be used to get the table header or entire table.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_tb_find_table(char *signature,
+                   char *oem_id,
+                   char *oem_table_id, acpi_native_uint * table_index)
+{
+        acpi_native_uint i;
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(tb_find_table);
+        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+                if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature),
+                                signature, ACPI_NAME_SIZE)) {
+                        /* Not the requested table */
+                        continue;
+                }
+                /* Table with matching signature has been found */
+                if (!acpi_gbl_root_table_list.tables[i].pointer) {
+                        /* Table is not currently mapped, map it */
+                        status =
+                            acpi_tb_verify_table(&acpi_gbl_root_table_list.
+                                                 tables[i]);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
+                        if (!acpi_gbl_root_table_list.tables[i].pointer) {
+                                continue;
+                        }
+                }
+                /* Check for table match on all IDs */
+                if (!ACPI_MEMCMP
+                    (acpi_gbl_root_table_list.tables[i].pointer->signature,
+                     signature, ACPI_NAME_SIZE) && (!oem_id[0]
+                                                    ||
+                                                    !ACPI_MEMCMP
+                                                    (acpi_gbl_root_table_list.
+                                                     tables[i].pointer->oem_id,
+                                                     oem_id, ACPI_OEM_ID_SIZE))
+                    && (!oem_table_id[0]
+                        || !ACPI_MEMCMP(acpi_gbl_root_table_list.tables[i].
+                                        pointer->oem_table_id, oem_table_id,
+                                        ACPI_OEM_TABLE_ID_SIZE))) {
+                        *table_index = i;
+                        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
+                                          "Found table [%4.4s]\n", signature));
+                        return_ACPI_STATUS(AE_OK);
+                }
+        }
+        return_ACPI_STATUS(AE_NOT_FOUND);
+}
diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c
deleted file mode 100644
index 11e2d4454e05..000000000000
--- a/drivers/acpi/tables/tbget.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbget - ACPI Table get* routines
- *
- *****************************************************************************/
-/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
- * 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 <acpi/actables.h>
-#define _COMPONENT          ACPI_TABLES
-ACPI_MODULE_NAME("tbget")
-/* Local prototypes */
-static acpi_status
-acpi_tb_get_this_table(struct acpi_pointer *address,
-                       struct acpi_table_header *header,
-                       struct acpi_table_desc *table_info);
-static acpi_status
-acpi_tb_table_override(struct acpi_table_header *header,
-                       struct acpi_table_desc *table_info);
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              table_info          - Where table info is returned
- *
- * RETURN:      None
- *
- * DESCRIPTION: Get entire table of unknown size.
- *
- ******************************************************************************/
-acpi_status
-acpi_tb_get_table(struct acpi_pointer *address,
-                  struct acpi_table_desc *table_info)
-{
-        acpi_status status;
-        struct acpi_table_header header;
-        ACPI_FUNCTION_TRACE(tb_get_table);
-        /* Get the header in order to get signature and table size */
-        status = acpi_tb_get_table_header(address, &header);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Get the entire table */
-        status = acpi_tb_get_table_body(address, &header, table_info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Could not get ACPI table (size %X)",
-                                header.length));
-                return_ACPI_STATUS(status);
-        }
-        return_ACPI_STATUS(AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table_header
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              return_header       - Where the table header is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an ACPI table header.  Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-acpi_status
-acpi_tb_get_table_header(struct acpi_pointer *address,
-                         struct acpi_table_header *return_header)
-{
-        acpi_status status = AE_OK;
-        struct acpi_table_header *header = NULL;
-        ACPI_FUNCTION_TRACE(tb_get_table_header);
-        /*
-         * Flags contains the current processor mode (Virtual or Physical
-         * addressing) The pointer_type is either Logical or Physical
-         */
-        switch (address->pointer_type) {
-        case ACPI_PHYSMODE_PHYSPTR:
-        case ACPI_LOGMODE_LOGPTR:
-                /* Pointer matches processor mode, copy the header */
-                ACPI_MEMCPY(return_header, address->pointer.logical,
-                            sizeof(struct acpi_table_header));
-                break;
-        case ACPI_LOGMODE_PHYSPTR:
-                /* Create a logical address for the physical pointer */
-                status = acpi_os_map_memory(address->pointer.physical,
-                                            sizeof(struct acpi_table_header),
-                                            (void *)&header);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not map memory at %8.8X%8.8X for table header",
-                                    ACPI_FORMAT_UINT64(address->pointer.
-                                                       physical)));
-                        return_ACPI_STATUS(status);
-                }
-                /* Copy header and delete mapping */
-                ACPI_MEMCPY(return_header, header,
-                            sizeof(struct acpi_table_header));
-                acpi_os_unmap_memory(header, sizeof(struct acpi_table_header));
-                break;
-        default:
-                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
-                            address->pointer_type));
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_TABLES, "Table Signature: [%4.4s]\n",
-                          return_header->signature));
-        return_ACPI_STATUS(AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table_body
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              Header              - Header of the table to retrieve
- *              table_info          - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an entire ACPI table with support to allow the host OS to
- *              replace the table with a newer version (table override.)
- *              Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-acpi_status
-acpi_tb_get_table_body(struct acpi_pointer *address,
-                       struct acpi_table_header *header,
-                       struct acpi_table_desc *table_info)
-{
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(tb_get_table_body);
-        if (!table_info || !address) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Attempt table override. */
-        status = acpi_tb_table_override(header, table_info);
-        if (ACPI_SUCCESS(status)) {
-                /* Table was overridden by the host OS */
-                return_ACPI_STATUS(status);
-        }
-        /* No override, get the original table */
-        status = acpi_tb_get_this_table(address, header, table_info);
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_table_override
- *
- * PARAMETERS:  Header              - Pointer to table header
- *              table_info          - Return info if table is overridden
- *
- * RETURN:      None
- *
- * DESCRIPTION: Attempts override of current table with a new one if provided
- *              by the host OS.
- *
- ******************************************************************************/
-static acpi_status
-acpi_tb_table_override(struct acpi_table_header *header,
-                       struct acpi_table_desc *table_info)
-{
-        struct acpi_table_header *new_table;
-        acpi_status status;
-        struct acpi_pointer address;
-        ACPI_FUNCTION_TRACE(tb_table_override);
-        /*
-         * The OSL will examine the header and decide whether to override this
-         * table.  If it decides to override, a table will be returned in new_table,
-         * which we will then copy.
-         */
-        status = acpi_os_table_override(header, &new_table);
-        if (ACPI_FAILURE(status)) {
-                /* Some severe error from the OSL, but we basically ignore it */
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Could not override ACPI table"));
-                return_ACPI_STATUS(status);
-        }
-        if (!new_table) {
-                /* No table override */
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
-        /*
-         * We have a new table to override the old one.  Get a copy of
-         * the new one.  We know that the new table has a logical pointer.
-         */
-        address.pointer_type = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING;
-        address.pointer.logical = new_table;
-        status = acpi_tb_get_this_table(&address, new_table, table_info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Could not copy ACPI table"));
-                return_ACPI_STATUS(status);
-        }
-        /* Copy the table info */
-        ACPI_INFO((AE_INFO, "Table [%4.4s] replaced by host OS",
-                   table_info->pointer->signature));
-        return_ACPI_STATUS(AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_this_table
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              Header              - Header of the table to retrieve
- *              table_info          - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an entire ACPI table.  Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-static acpi_status
-acpi_tb_get_this_table(struct acpi_pointer *address,
-                       struct acpi_table_header *header,
-                       struct acpi_table_desc *table_info)
-{
-        struct acpi_table_header *full_table = NULL;
-        u8 allocation;
-        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE(tb_get_this_table);
-        /* Validate minimum length */
-        if (header->length < sizeof(struct acpi_table_header)) {
-                ACPI_ERROR((AE_INFO,
-                            "Table length (%X) is smaller than minimum (%zX)",
-                            header->length, sizeof(struct acpi_table_header)));
-                return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
-        }
-        /*
-         * Flags contains the current processor mode (Virtual or Physical
-         * addressing) The pointer_type is either Logical or Physical
-         */
-        switch (address->pointer_type) {
-        case ACPI_PHYSMODE_PHYSPTR:
-        case ACPI_LOGMODE_LOGPTR:
-                /* Pointer matches processor mode, copy the table to a new buffer */
-                full_table = ACPI_ALLOCATE(header->length);
-                if (!full_table) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not allocate table memory for [%4.4s] length %X",
-                                    header->signature, header->length));
-                        return_ACPI_STATUS(AE_NO_MEMORY);
-                }
-                /* Copy the entire table (including header) to the local buffer */
-                ACPI_MEMCPY(full_table, address->pointer.logical,
-                            header->length);
-                /* Save allocation type */
-                allocation = ACPI_MEM_ALLOCATED;
-                break;
-        case ACPI_LOGMODE_PHYSPTR:
-                /*
-                 * Just map the table's physical memory
-                 * into our address space.
-                 */
-                status = acpi_os_map_memory(address->pointer.physical,
-                                            (acpi_size) header->length,
-                                            ACPI_CAST_PTR(void, &full_table));
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X",
-                                    header->signature,
-                                    ACPI_FORMAT_UINT64(address->pointer.
-                                                       physical),
-                                    header->length));
-                        return (status);
-                }
-                /* Save allocation type */
-                allocation = ACPI_MEM_MAPPED;
-                break;
-        default:
-                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
-                            address->pointer_type));
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /*
-         * Validate checksum for _most_ tables,
-         * even the ones whose signature we don't recognize
-         */
-        if (table_info->type != ACPI_TABLE_ID_FACS) {
-                status = acpi_tb_verify_table_checksum(full_table);
-#if (!ACPI_CHECKSUM_ABORT)
-                if (ACPI_FAILURE(status)) {
-                        /* Ignore the error if configuration says so */
-                        status = AE_OK;
-                }
-#endif
-        }
-        /* Return values */
-        table_info->pointer = full_table;
-        table_info->length = (acpi_size) header->length;
-        table_info->allocation = allocation;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n",
-                          full_table->signature,
-                          ACPI_FORMAT_UINT64(address->pointer.physical),
-                          full_table));
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table_ptr
- *
- * PARAMETERS:  table_type      - one of the defined table types
- *              Instance        - Which table of this type
- *              return_table    - pointer to location to place the pointer for
- *                                return
- *
- * RETURN:      Status
- *
- * DESCRIPTION: This function is called to get the pointer to an ACPI table.
- *
- ******************************************************************************/
-acpi_status
-acpi_tb_get_table_ptr(acpi_table_type table_type,
-                      u32 instance, struct acpi_table_header **return_table)
-{
-        struct acpi_table_desc *table_desc;
-        u32 i;
-        ACPI_FUNCTION_TRACE(tb_get_table_ptr);
-        if (table_type > ACPI_TABLE_ID_MAX) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Check for instance out of range of the current table count */
-        if (instance > acpi_gbl_table_lists[table_type].count) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-        /*
-         * Walk the list to get the desired table
-         * Note: Instance is one-based
-         */
-        table_desc = acpi_gbl_table_lists[table_type].next;
-        for (i = 1; i < instance; i++) {
-                table_desc = table_desc->next;
-        }
-        /* We are now pointing to the requested table's descriptor */
-        *return_table = table_desc->pointer;
-        return_ACPI_STATUS(AE_OK);
-}
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
deleted file mode 100644
index ad982112e4c6..000000000000
--- a/drivers/acpi/tables/tbgetall.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbgetall - Get all required ACPI tables
- *
- *****************************************************************************/
-/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
- * 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 <acpi/actables.h>
-#define _COMPONENT          ACPI_TABLES
-ACPI_MODULE_NAME("tbgetall")
-/* Local prototypes */
-static acpi_status
-acpi_tb_get_primary_table(struct acpi_pointer *address,
-                          struct acpi_table_desc *table_info);
-static acpi_status
-acpi_tb_get_secondary_table(struct acpi_pointer *address,
-                            acpi_string signature,
-                            struct acpi_table_desc *table_info);
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_primary_table
- *
- * PARAMETERS:  Address             - Physical address of table to retrieve
- *              *table_info         - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Maps the physical address of table into a logical address
- *
- ******************************************************************************/
-static acpi_status
-acpi_tb_get_primary_table(struct acpi_pointer *address,
-                          struct acpi_table_desc *table_info)
-{
-        acpi_status status;
-        struct acpi_table_header header;
-        ACPI_FUNCTION_TRACE(tb_get_primary_table);
-        /* Ignore a NULL address in the RSDT */
-        if (!address->pointer.value) {
-                return_ACPI_STATUS(AE_OK);
-        }
-        /* Get the header in order to get signature and table size */
-        status = acpi_tb_get_table_header(address, &header);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Clear the table_info */
-        ACPI_MEMSET(table_info, 0, sizeof(struct acpi_table_desc));
-        /*
-         * Check the table signature and make sure it is recognized.
-         * Also checks the header checksum
-         */
-        table_info->pointer = &header;
-        status = acpi_tb_recognize_table(table_info, ACPI_TABLE_PRIMARY);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Get the entire table */
-        status = acpi_tb_get_table_body(address, &header, table_info);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Install the table */
-        status = acpi_tb_install_table(table_info);
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_secondary_table
- *
- * PARAMETERS:  Address             - Physical address of table to retrieve
- *              *table_info         - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Maps the physical address of table into a logical address
- *
- ******************************************************************************/
-static acpi_status
-acpi_tb_get_secondary_table(struct acpi_pointer *address,
-                            acpi_string signature,
-                            struct acpi_table_desc *table_info)
-{
-        acpi_status status;
-        struct acpi_table_header header;
-        ACPI_FUNCTION_TRACE_STR(tb_get_secondary_table, signature);
-        /* Get the header in order to match the signature */
-        status = acpi_tb_get_table_header(address, &header);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Signature must match request */
-        if (!ACPI_COMPARE_NAME(header.signature, signature)) {
-                ACPI_ERROR((AE_INFO,
-                            "Incorrect table signature - wanted [%s] found [%4.4s]",
-                            signature, header.signature));
-                return_ACPI_STATUS(AE_BAD_SIGNATURE);
-        }
-        /*
-         * Check the table signature and make sure it is recognized.
-         * Also checks the header checksum
-         */
-        table_info->pointer = &header;
-        status = acpi_tb_recognize_table(table_info, ACPI_TABLE_SECONDARY);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Get the entire table */
-        status = acpi_tb_get_table_body(address, &header, table_info);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Install the table */
-        status = acpi_tb_install_table(table_info);
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_required_tables
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load and validate tables other than the RSDT.  The RSDT must
- *              already be loaded and validated.
- *
- *              Get the minimum set of ACPI tables, namely:
- *
- *              1) FADT (via RSDT in loop below)
- *              2) FACS (via FADT)
- *              3) DSDT (via FADT)
- *
- ******************************************************************************/
-acpi_status acpi_tb_get_required_tables(void)
-{
-        acpi_status status = AE_OK;
-        u32 i;
-        struct acpi_table_desc table_info;
-        struct acpi_pointer address;
-        ACPI_FUNCTION_TRACE(tb_get_required_tables);
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%d ACPI tables in RSDT\n",
-                          acpi_gbl_rsdt_table_count));
-        address.pointer_type = acpi_gbl_table_flags | ACPI_LOGICAL_ADDRESSING;
-        /*
-         * Loop through all table pointers found in RSDT.
-         * This will NOT include the FACS and DSDT - we must get
-         * them after the loop.
-         *
-         * The only tables we are interested in getting here is the FADT and
-         * any SSDTs.
-         */
-        for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
-                /* Get the table address from the common internal XSDT */
-                address.pointer.value = acpi_gbl_XSDT->table_offset_entry[i];
-                /*
-                 * Get the tables needed by this subsystem (FADT and any SSDTs).
-                 * NOTE: All other tables are completely ignored at this time.
-                 */
-                status = acpi_tb_get_primary_table(&address, &table_info);
-                if ((status != AE_OK) && (status != AE_TABLE_NOT_SUPPORTED)) {
-                        ACPI_WARNING((AE_INFO,
-                                      "%s, while getting table at %8.8X%8.8X",
-                                      acpi_format_exception(status),
-                                      ACPI_FORMAT_UINT64(address.pointer.
-                                                         value)));
-                }
-        }
-        /* We must have a FADT to continue */
-        if (!acpi_gbl_FADT) {
-                ACPI_ERROR((AE_INFO, "No FADT present in RSDT/XSDT"));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
-        /*
-         * Convert the FADT to a common format.  This allows earlier revisions of
-         * the table to coexist with newer versions, using common access code.
-         */
-        status = acpi_tb_convert_table_fadt();
-        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO,
-                            "Could not convert FADT to internal common format"));
-                return_ACPI_STATUS(status);
-        }
-        /* Get the FACS (Pointed to by the FADT) */
-        address.pointer.value = acpi_gbl_FADT->xfirmware_ctrl;
-        status = acpi_tb_get_secondary_table(&address, FACS_SIG, &table_info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Could not get/install the FACS"));
-                return_ACPI_STATUS(status);
-        }
-        /*
-         * Create the common FACS pointer table
-         * (Contains pointers to the original table)
-         */
-        status = acpi_tb_build_common_facs(&table_info);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Get/install the DSDT (Pointed to by the FADT) */
-        address.pointer.value = acpi_gbl_FADT->Xdsdt;
-        status = acpi_tb_get_secondary_table(&address, DSDT_SIG, &table_info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not get/install the DSDT"));
-                return_ACPI_STATUS(status);
-        }
-        /* Set Integer Width (32/64) based upon DSDT revision */
-        acpi_ut_set_integer_width(acpi_gbl_DSDT->revision);
-        /* Dump the entire DSDT */
-        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
-                          "Hex dump of entire DSDT, size %d (0x%X), Integer width = %d\n",
-                          acpi_gbl_DSDT->length, acpi_gbl_DSDT->length,
-                          acpi_gbl_integer_bit_width));
-        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_DSDT),
-                         acpi_gbl_DSDT->length);
-        /* Always delete the RSDP mapping, we are done with it */
-        acpi_tb_delete_tables_by_type(ACPI_TABLE_ID_RSDP);
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 1668a232fb67..0e7b121a99ce 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,510 +42,498 @@
 */
 #include <acpi/acpi.h>
+#include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbinstal")
-/* Local prototypes */
+/******************************************************************************
-static acpi_status
-acpi_tb_match_signature(char *signature,
-                        struct acpi_table_desc *table_info, u8 search_type);
-/*******************************************************************************
 *
- * FUNCTION:    acpi_tb_match_signature
+ * FUNCTION:    acpi_tb_verify_table
 *
- * PARAMETERS:  Signature           - Table signature to match
+ * PARAMETERS:  table_desc          - table
- *              table_info          - Return data
- *              search_type         - Table type to match (primary/secondary)
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Compare signature against the list of "ACPI-subsystem-owned"
+ * DESCRIPTION: this function is called to verify and map table
- *              tables (DSDT/FADT/SSDT, etc.) Returns the table_type_iD on match.
 *
- ******************************************************************************/
+ *****************************************************************************/
+acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc)
-static acpi_status
-acpi_tb_match_signature(char *signature,
-                        struct acpi_table_desc *table_info, u8 search_type)
 {
-        acpi_native_uint i;
+        acpi_status status = AE_OK;
-        ACPI_FUNCTION_TRACE(tb_match_signature);
+        ACPI_FUNCTION_TRACE(tb_verify_table);
-        /* Search for a signature match among the known table types */
+        /* Map the table if necessary */
-        for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
+        if (!table_desc->pointer) {
-                if (!(acpi_gbl_table_data[i].flags & search_type)) {
+                if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==
-                        continue;
+                    ACPI_TABLE_ORIGIN_MAPPED) {
+                        table_desc->pointer =
+                            acpi_os_map_memory(table_desc->address,
+                                               table_desc->length);
                }
+                if (!table_desc->pointer) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
+        }
-                if (!ACPI_STRNCMP(signature, acpi_gbl_table_data[i].signature,
+        /* FACS is the odd table, has no standard ACPI header and no checksum */
-                                  acpi_gbl_table_data[i].sig_length)) {
-                        /* Found a signature match, return index if requested */
-                        if (table_info) {
+        if (!ACPI_COMPARE_NAME(&table_desc->signature, ACPI_SIG_FACS)) {
-                                table_info->type = (u8) i;
-                        }
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                /* Always calculate checksum, ignore bad checksum if requested */
-                                          "Table [%4.4s] is an ACPI table consumed by the core subsystem\n",
-                                          (char *)acpi_gbl_table_data[i].
-                                          signature));
-                        return_ACPI_STATUS(AE_OK);
+                status =
-                }
+                    acpi_tb_verify_checksum(table_desc->pointer,
+                                            table_desc->length);
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+        return_ACPI_STATUS(status);
-                          "Table [%4.4s] is not an ACPI table consumed by the core subsystem - ignored\n",
-                          (char *)signature));
-        return_ACPI_STATUS(AE_TABLE_NOT_SUPPORTED);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_install_table
+ * FUNCTION:    acpi_tb_add_table
 *
- * PARAMETERS:  table_info          - Return value from acpi_tb_get_table_body
+ * PARAMETERS:  table_desc          - Table descriptor
+ *              table_index         - Where the table index is returned
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Install the table into the global data structures.
+ * DESCRIPTION: This function is called to add the ACPI table
 *
 ******************************************************************************/
-acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
+acpi_status
+acpi_tb_add_table(struct acpi_table_desc *table_desc,
+                  acpi_native_uint * table_index)
 {
-        acpi_status status;
+        acpi_native_uint i;
+        acpi_native_uint length;
-        ACPI_FUNCTION_TRACE(tb_install_table);
+        acpi_status status = AE_OK;
-        /* Lock tables while installing */
+        ACPI_FUNCTION_TRACE(tb_add_table);
-        status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (!table_desc->pointer) {
-        if (ACPI_FAILURE(status)) {
+                status = acpi_tb_verify_table(table_desc);
-                ACPI_EXCEPTION((AE_INFO, status,
+                if (ACPI_FAILURE(status) || !table_desc->pointer) {
-                                "Could not acquire table mutex"));
+                        return_ACPI_STATUS(status);
-                return_ACPI_STATUS(status);
+                }
        }
-        /*
+        /* The table must be either an SSDT or a PSDT */
-         * Ignore a table that is already installed. For example, some BIOS
-         * ASL code will repeatedly attempt to load the same SSDT.
+        if ((!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT))
-         */
+            &&
-        status = acpi_tb_is_table_installed(table_info);
+            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)))
-        if (ACPI_FAILURE(status)) {
+        {
-                goto unlock_and_exit;
+                ACPI_ERROR((AE_INFO,
+                            "Table has invalid signature [%4.4s], must be SSDT or PSDT",
+                            table_desc->pointer->signature));
+                return_ACPI_STATUS(AE_BAD_SIGNATURE);
        }
-        /* Install the table into the global data structure */
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        /* Check if table is already registered */
+        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+                if (!acpi_gbl_root_table_list.tables[i].pointer) {
+                        status =
+                            acpi_tb_verify_table(&acpi_gbl_root_table_list.
+                                                 tables[i]);
+                        if (ACPI_FAILURE(status)
+                            || !acpi_gbl_root_table_list.tables[i].pointer) {
+                                continue;
+                        }
+                }
+                length = ACPI_MIN(table_desc->length,
+                                  acpi_gbl_root_table_list.tables[i].length);
+                if (ACPI_MEMCMP(table_desc->pointer,
+                                acpi_gbl_root_table_list.tables[i].pointer,
+                                length)) {
+                        continue;
+                }
+                /* Table is already registered */
+                acpi_tb_delete_table(table_desc);
+                *table_index = i;
+                goto release;
+        }
-        status = acpi_tb_init_table_descriptor(table_info->type, table_info);
+        /*
+         * Add the table to the global table list
+         */
+        status = acpi_tb_store_table(table_desc->address, table_desc->pointer,
+                                     table_desc->length, table_desc->flags,
+                                     table_index);
        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
+                goto release;
-                                "Could not install table [%4.4s]",
-                                table_info->pointer->signature));
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s located at %p\n",
+        acpi_tb_print_table_header(table_desc->address, table_desc->pointer);
-                          acpi_gbl_table_data[table_info->type].name,
-                          table_info->pointer));
-      unlock_and_exit:
+      release:
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
        return_ACPI_STATUS(status);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_recognize_table
+ * FUNCTION:    acpi_tb_resize_root_table_list
 *
- * PARAMETERS:  table_info          - Return value from acpi_tb_get_table_body
+ * PARAMETERS:  None
- *              search_type         - Table type to match (primary/secondary)
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Check a table signature for a match against known table types
+ * DESCRIPTION: Expand the size of global table array
- *
- * NOTE:  All table pointers are validated as follows:
- *          1) Table pointer must point to valid physical memory
- *          2) Signature must be 4 ASCII chars, even if we don't recognize the
- *             name
- *          3) Table must be readable for length specified in the header
- *          4) Table checksum must be valid (with the exception of the FACS
- *             which has no checksum for some odd reason)
 *
 ******************************************************************************/
-acpi_status
+acpi_status acpi_tb_resize_root_table_list(void)
-acpi_tb_recognize_table(struct acpi_table_desc *table_info, u8 search_type)
 {
-        struct acpi_table_header *table_header;
+        struct acpi_table_desc *tables;
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(tb_recognize_table);
+        ACPI_FUNCTION_TRACE(tb_resize_root_table_list);
-        /* Ensure that we have a valid table pointer */
+        /* allow_resize flag is a parameter to acpi_initialize_tables */
-        table_header = (struct acpi_table_header *)table_info->pointer;
+        if (!(acpi_gbl_root_table_list.flags & ACPI_ROOT_ALLOW_RESIZE)) {
-        if (!table_header) {
+                ACPI_ERROR((AE_INFO,
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                            "Resize of Root Table Array is not allowed"));
+                return_ACPI_STATUS(AE_SUPPORT);
        }
-        /*
+        /* Increase the Table Array size */
-         * We only "recognize" a limited number of ACPI tables -- namely, the
-         * ones that are used by the subsystem (DSDT, FADT, etc.)
+        tables = ACPI_ALLOCATE_ZEROED((acpi_gbl_root_table_list.size +
-         *
+                                       ACPI_ROOT_TABLE_SIZE_INCREMENT)
-         * An AE_TABLE_NOT_SUPPORTED means that the table was not recognized.
+                                      * sizeof(struct acpi_table_desc));
-         * This can be any one of many valid ACPI tables, it just isn't one of
+        if (!tables) {
-         * the tables that is consumed by the core subsystem
+                ACPI_ERROR((AE_INFO,
-         */
+                            "Could not allocate new root table array"));
-        status = acpi_tb_match_signature(table_header->signature,
+                return_ACPI_STATUS(AE_NO_MEMORY);
-                                         table_info, search_type);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
        }
-        status = acpi_tb_validate_table_header(table_header);
+        /* Copy and free the previous table array */
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+        if (acpi_gbl_root_table_list.tables) {
+                ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
+                            acpi_gbl_root_table_list.size *
+                            sizeof(struct acpi_table_desc));
+                if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
+                        ACPI_FREE(acpi_gbl_root_table_list.tables);
+                }
        }
-        /* Return the table type and length via the info struct */
+        acpi_gbl_root_table_list.tables = tables;
+        acpi_gbl_root_table_list.size += ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.flags |= (u8) ACPI_ROOT_ORIGIN_ALLOCATED;
-        table_info->length = (acpi_size) table_header->length;
+        return_ACPI_STATUS(AE_OK);
-        return_ACPI_STATUS(status);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_init_table_descriptor
+ * FUNCTION:    acpi_tb_store_table
 *
- * PARAMETERS:  table_type          - The type of the table
+ * PARAMETERS:  Address             - Table address
- *              table_info          - A table info struct
+ *              Table               - Table header
+ *              Length              - Table length
+ *              Flags               - flags
 *
- * RETURN:      None.
+ * RETURN:      Status and table index.
 *
- * DESCRIPTION: Install a table into the global data structs.
+ * DESCRIPTION: Add an ACPI table to the global table list
 *
 ******************************************************************************/
 acpi_status
-acpi_tb_init_table_descriptor(acpi_table_type table_type,
+acpi_tb_store_table(acpi_physical_address address,
-                              struct acpi_table_desc *table_info)
+                    struct acpi_table_header *table,
+                    u32 length, u8 flags, acpi_native_uint * table_index)
 {
-        struct acpi_table_list *list_head;
+        acpi_status status = AE_OK;
-        struct acpi_table_desc *table_desc;
-        acpi_status status;
-        ACPI_FUNCTION_TRACE_U32(tb_init_table_descriptor, table_type);
-        /* Allocate a descriptor for this table */
+        /* Ensure that there is room for the table in the Root Table List */
-        table_desc = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));
+        if (acpi_gbl_root_table_list.count >= acpi_gbl_root_table_list.size) {
-        if (!table_desc) {
+                status = acpi_tb_resize_root_table_list();
-                return_ACPI_STATUS(AE_NO_MEMORY);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
        }
-        /* Get a new owner ID for the table */
+        /* Initialize added table */
+        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
+            address = address;
+        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
+            pointer = table;
+        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].length =
+            length;
+        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
+            owner_id = 0;
+        acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].flags =
+            flags;
+        ACPI_MOVE_32_TO_32(&
+                           (acpi_gbl_root_table_list.
+                            tables[acpi_gbl_root_table_list.count].signature),
+                           table->signature);
+        *table_index = acpi_gbl_root_table_list.count;
+        acpi_gbl_root_table_list.count++;
+        return (status);
+}
-        status = acpi_ut_allocate_owner_id(&table_desc->owner_id);
+/*******************************************************************************
-        if (ACPI_FAILURE(status)) {
+ *
-                goto error_exit1;
+ * FUNCTION:    acpi_tb_delete_table
-        }
+ *
+ * PARAMETERS:  table_index         - Table index
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Delete one internal ACPI table
+ *
+ ******************************************************************************/
-        /* Install the table into the global data structure */
+void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
+{
+        /* Table must be mapped or allocated */
+        if (!table_desc->pointer) {
+                return;
+        }
+        switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
+        case ACPI_TABLE_ORIGIN_MAPPED:
+                acpi_os_unmap_memory(table_desc->pointer, table_desc->length);
+                break;
+        case ACPI_TABLE_ORIGIN_ALLOCATED:
+                ACPI_FREE(table_desc->pointer);
+                break;
+        default:;
+        }
-        list_head = &acpi_gbl_table_lists[table_type];
+        table_desc->pointer = NULL;
+}
-        /*
+/*******************************************************************************
-         * Two major types of tables:  1) Only one instance is allowed.  This
+ *
-         * includes most ACPI tables such as the DSDT.  2) Multiple instances of
+ * FUNCTION:    acpi_tb_terminate
-         * the table are allowed.  This includes SSDT and PSDTs.
+ *
-         */
+ * PARAMETERS:  None
-        if (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags)) {
+ *
-                /*
+ * RETURN:      None
-                 * Only one table allowed, and a table has alread been installed
+ *
-                 * at this location, so return an error.
+ * DESCRIPTION: Delete all internal ACPI tables
-                 */
+ *
-                if (list_head->next) {
+ ******************************************************************************/
-                        status = AE_ALREADY_EXISTS;
-                        goto error_exit2;
-                }
-                table_desc->next = list_head->next;
+void acpi_tb_terminate(void)
-                list_head->next = table_desc;
+{
+        acpi_native_uint i;
-                if (table_desc->next) {
+        ACPI_FUNCTION_TRACE(tb_terminate);
-                        table_desc->next->prev = table_desc;
-                }
-                list_head->count++;
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        } else {
-                /*
-                 * Link the new table in to the list of tables of this type.
-                 * Insert at the end of the list, order IS IMPORTANT.
-                 *
-                 * table_desc->Prev & Next are already NULL from calloc()
-                 */
-                list_head->count++;
-                if (!list_head->next) {
-                        list_head->next = table_desc;
-                } else {
-                        table_desc->next = list_head->next;
-                        while (table_desc->next->next) {
+        /* Delete the individual tables */
-                                table_desc->next = table_desc->next->next;
-                        }
-                        table_desc->next->next = table_desc;
+        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
-                        table_desc->prev = table_desc->next;
+                acpi_tb_delete_table(&acpi_gbl_root_table_list.tables[i]);
-                        table_desc->next = NULL;
-                }
        }
-        /* Finish initialization of the table descriptor */
-        table_desc->loaded_into_namespace = FALSE;
-        table_desc->type = (u8) table_type;
-        table_desc->pointer = table_info->pointer;
-        table_desc->length = table_info->length;
-        table_desc->allocation = table_info->allocation;
-        table_desc->aml_start = (u8 *) (table_desc->pointer + 1),
-            table_desc->aml_length = (u32)
-            (table_desc->length - (u32) sizeof(struct acpi_table_header));
        /*
-         * Set the appropriate global pointer (if there is one) to point to the
+         * Delete the root table array if allocated locally. Array cannot be
-         * newly installed table
+         * mapped, so we don't need to check for that flag.
         */
-        if (acpi_gbl_table_data[table_type].global_ptr) {
+        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
-                *(acpi_gbl_table_data[table_type].global_ptr) =
+                ACPI_FREE(acpi_gbl_root_table_list.tables);
-                    table_info->pointer;
        }
-        /* Return Data */
+        acpi_gbl_root_table_list.tables = NULL;
+        acpi_gbl_root_table_list.flags = 0;
-        table_info->owner_id = table_desc->owner_id;
+        acpi_gbl_root_table_list.count = 0;
-        table_info->installed_desc = table_desc;
-        return_ACPI_STATUS(AE_OK);
-        /* Error exit with cleanup */
-      error_exit2:
-        acpi_ut_release_owner_id(&table_desc->owner_id);
-      error_exit1:
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        ACPI_FREE(table_desc);
-        return_ACPI_STATUS(status);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_delete_all_tables
+ * FUNCTION:    acpi_tb_delete_namespace_by_owner
 *
- * PARAMETERS:  None.
+ * PARAMETERS:  table_index         - Table index
 *
- * RETURN:      None.
+ * RETURN:      None
 *
- * DESCRIPTION: Delete all internal ACPI tables
+ * DESCRIPTION: Delete all namespace objects created when this table was loaded.
 *
 ******************************************************************************/
-void acpi_tb_delete_all_tables(void)
+void acpi_tb_delete_namespace_by_owner(acpi_native_uint table_index)
 {
-        acpi_table_type type;
+        acpi_owner_id owner_id;
-        /*
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-         * Free memory allocated for ACPI tables
+        if (table_index < acpi_gbl_root_table_list.count) {
-         * Memory can either be mapped or allocated
+                owner_id =
-         */
+                    acpi_gbl_root_table_list.tables[table_index].owner_id;
-        for (type = 0; type < (ACPI_TABLE_ID_MAX + 1); type++) {
+        } else {
-                acpi_tb_delete_tables_by_type(type);
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                return;
        }
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        acpi_ns_delete_namespace_by_owner(owner_id);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_delete_tables_by_type
+ * FUNCTION:    acpi_tb_allocate_owner_id
 *
- * PARAMETERS:  Type                - The table type to be deleted
+ * PARAMETERS:  table_index         - Table index
 *
- * RETURN:      None.
+ * RETURN:      Status
 *
- * DESCRIPTION: Delete an internal ACPI table
+ * DESCRIPTION: Allocates owner_id in table_desc
- *              Locks the ACPI table mutex
 *
 ******************************************************************************/
-void acpi_tb_delete_tables_by_type(acpi_table_type type)
+acpi_status acpi_tb_allocate_owner_id(acpi_native_uint table_index)
 {
-        struct acpi_table_desc *table_desc;
+        acpi_status status = AE_BAD_PARAMETER;
-        u32 count;
-        u32 i;
-        ACPI_FUNCTION_TRACE_U32(tb_delete_tables_by_type, type);
+        ACPI_FUNCTION_TRACE(tb_allocate_owner_id);
-        if (type > ACPI_TABLE_ID_MAX) {
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-                return_VOID;
+        if (table_index < acpi_gbl_root_table_list.count) {
-        }
+                status = acpi_ut_allocate_owner_id
+                    (&(acpi_gbl_root_table_list.tables[table_index].owner_id));
-        if (ACPI_FAILURE(acpi_ut_acquire_mutex(ACPI_MTX_TABLES))) {
-                return;
-        }
-        /* Clear the appropriate "typed" global table pointer */
-        switch (type) {
-        case ACPI_TABLE_ID_RSDP:
-                acpi_gbl_RSDP = NULL;
-                break;
-        case ACPI_TABLE_ID_DSDT:
-                acpi_gbl_DSDT = NULL;
-                break;
-        case ACPI_TABLE_ID_FADT:
-                acpi_gbl_FADT = NULL;
-                break;
-        case ACPI_TABLE_ID_FACS:
-                acpi_gbl_FACS = NULL;
-                break;
-        case ACPI_TABLE_ID_XSDT:
-                acpi_gbl_XSDT = NULL;
-                break;
-        case ACPI_TABLE_ID_SSDT:
-        case ACPI_TABLE_ID_PSDT:
-        default:
-                break;
-        }
-        /*
-         * Free the table
-         * 1) Get the head of the list
-         */
-        table_desc = acpi_gbl_table_lists[type].next;
-        count = acpi_gbl_table_lists[type].count;
-        /*
-         * 2) Walk the entire list, deleting both the allocated tables
-         *    and the table descriptors
-         */
-        for (i = 0; i < count; i++) {
-                table_desc = acpi_tb_uninstall_table(table_desc);
        }
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_VOID;
+        return_ACPI_STATUS(status);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_delete_single_table
+ * FUNCTION:    acpi_tb_release_owner_id
 *
- * PARAMETERS:  table_info          - A table info struct
+ * PARAMETERS:  table_index         - Table index
 *
- * RETURN:      None.
+ * RETURN:      Status
 *
- * DESCRIPTION: Low-level free for a single ACPI table.  Handles cases where
+ * DESCRIPTION: Releases owner_id in table_desc
- *              the table was allocated a buffer or was mapped.
 *
 ******************************************************************************/
-void acpi_tb_delete_single_table(struct acpi_table_desc *table_desc)
+acpi_status acpi_tb_release_owner_id(acpi_native_uint table_index)
 {
+        acpi_status status = AE_BAD_PARAMETER;
-        /* Must have a valid table descriptor and pointer */
+        ACPI_FUNCTION_TRACE(tb_release_owner_id);
-        if ((!table_desc) || (!table_desc->pointer)) {
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-                return;
+        if (table_index < acpi_gbl_root_table_list.count) {
+                acpi_ut_release_owner_id(&
+                                         (acpi_gbl_root_table_list.
+                                          tables[table_index].owner_id));
+                status = AE_OK;
        }
-        /* Valid table, determine type of memory allocation */
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
-        switch (table_desc->allocation) {
-        case ACPI_MEM_NOT_ALLOCATED:
-                break;
-        case ACPI_MEM_ALLOCATED:
-                ACPI_FREE(table_desc->pointer);
-                break;
-        case ACPI_MEM_MAPPED:
-                acpi_os_unmap_memory(table_desc->pointer, table_desc->length);
-                break;
-        default:
-                break;
-        }
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_uninstall_table
+ * FUNCTION:    acpi_tb_get_owner_id
 *
- * PARAMETERS:  table_info          - A table info struct
+ * PARAMETERS:  table_index         - Table index
+ *              owner_id            - Where the table owner_id is returned
 *
- * RETURN:      Pointer to the next table in the list (of same type)
+ * RETURN:      Status
 *
- * DESCRIPTION: Free the memory associated with an internal ACPI table that
+ * DESCRIPTION: returns owner_id for the ACPI table
- *              is either installed or has never been installed.
- *              Table mutex should be locked.
 *
 ******************************************************************************/
-struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc
+acpi_status
-                                                *table_desc)
+acpi_tb_get_owner_id(acpi_native_uint table_index, acpi_owner_id * owner_id)
 {
-        struct acpi_table_desc *next_desc;
+        acpi_status status = AE_BAD_PARAMETER;
-        ACPI_FUNCTION_TRACE_PTR(tb_uninstall_table, table_desc);
+        ACPI_FUNCTION_TRACE(tb_get_owner_id);
-        if (!table_desc) {
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-                return_PTR(NULL);
+        if (table_index < acpi_gbl_root_table_list.count) {
+                *owner_id =
+                    acpi_gbl_root_table_list.tables[table_index].owner_id;
+                status = AE_OK;
        }
-        /* Unlink the descriptor from the doubly linked list */
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
-        if (table_desc->prev) {
+/*******************************************************************************
-                table_desc->prev->next = table_desc->next;
+ *
-        } else {
+ * FUNCTION:    acpi_tb_is_table_loaded
-                /* Is first on list, update list head */
+ *
+ * PARAMETERS:  table_index         - Table index
+ *
+ * RETURN:      Table Loaded Flag
+ *
+ ******************************************************************************/
-                acpi_gbl_table_lists[table_desc->type].next = table_desc->next;
+u8 acpi_tb_is_table_loaded(acpi_native_uint table_index)
-        }
+{
+        u8 is_loaded = FALSE;
-        if (table_desc->next) {
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-                table_desc->next->prev = table_desc->prev;
+        if (table_index < acpi_gbl_root_table_list.count) {
+                is_loaded = (u8)
+                    (acpi_gbl_root_table_list.tables[table_index].
+                     flags & ACPI_TABLE_IS_LOADED);
        }
-        /* Free the memory allocated for the table itself */
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return (is_loaded);
-        acpi_tb_delete_single_table(table_desc);
+}
-        /* Free the owner ID associated with this table */
-        acpi_ut_release_owner_id(&table_desc->owner_id);
-        /* Free the table descriptor */
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_set_table_loaded_flag
+ *
+ * PARAMETERS:  table_index         - Table index
+ *              is_loaded           - TRUE if table is loaded, FALSE otherwise
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Sets the table loaded flag to either TRUE or FALSE.
+ *
+ ******************************************************************************/
-        next_desc = table_desc->next;
+void acpi_tb_set_table_loaded_flag(acpi_native_uint table_index, u8 is_loaded)
-        ACPI_FREE(table_desc);
+{
-        /* Return pointer to the next descriptor */
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.count) {
+                if (is_loaded) {
+                        acpi_gbl_root_table_list.tables[table_index].flags |=
+                            ACPI_TABLE_IS_LOADED;
+                } else {
+                        acpi_gbl_root_table_list.tables[table_index].flags &=
+                            ~ACPI_TABLE_IS_LOADED;
+                }
+        }
-        return_PTR(next_desc);
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
 }
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
deleted file mode 100644
index 86a5fca9b739..000000000000
--- a/drivers/acpi/tables/tbrsdt.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbrsdt - ACPI RSDT table utilities
- *
- *****************************************************************************/
-/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
- * 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 <acpi/actables.h>
-#define _COMPONENT          ACPI_TABLES
-ACPI_MODULE_NAME("tbrsdt")
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_verify_rsdp
- *
- * PARAMETERS:  Address         - RSDP (Pointer to RSDT)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load and validate the RSDP (ptr) and RSDT (table)
- *
- ******************************************************************************/
-acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)
-{
-        struct acpi_table_desc table_info;
-        acpi_status status;
-        struct rsdp_descriptor *rsdp;
-        ACPI_FUNCTION_TRACE(tb_verify_rsdp);
-        switch (address->pointer_type) {
-        case ACPI_LOGICAL_POINTER:
-                rsdp = address->pointer.logical;
-                break;
-        case ACPI_PHYSICAL_POINTER:
-                /*
-                 * Obtain access to the RSDP structure
-                 */
-                status = acpi_os_map_memory(address->pointer.physical,
-                                            sizeof(struct rsdp_descriptor),
-                                            ACPI_CAST_PTR(void, &rsdp));
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-                break;
-        default:
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Verify RSDP signature and checksum */
-        status = acpi_tb_validate_rsdp(rsdp);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-        /* RSDP is ok. Init the table info */
-        table_info.pointer = ACPI_CAST_PTR(struct acpi_table_header, rsdp);
-        table_info.length = sizeof(struct rsdp_descriptor);
-        if (address->pointer_type == ACPI_PHYSICAL_POINTER) {
-                table_info.allocation = ACPI_MEM_MAPPED;
-        } else {
-                table_info.allocation = ACPI_MEM_NOT_ALLOCATED;
-        }
-        /* Save the table pointers and allocation info */
-        status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_RSDP, &table_info);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-        /* Save the RSDP in a global for easy access */
-        acpi_gbl_RSDP =
-            ACPI_CAST_PTR(struct rsdp_descriptor, table_info.pointer);
-        return_ACPI_STATUS(status);
-        /* Error exit */
-      cleanup:
-        if (acpi_gbl_table_flags & ACPI_PHYSICAL_POINTER) {
-                acpi_os_unmap_memory(rsdp, sizeof(struct rsdp_descriptor));
-        }
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_rsdt_address
- *
- * PARAMETERS:  out_address         - Where the address is returned
- *
- * RETURN:      None, Address
- *
- * DESCRIPTION: Extract the address of either the RSDT or XSDT, depending on the
- *              version of the RSDP and whether the XSDT pointer is valid
- *
- ******************************************************************************/
-void acpi_tb_get_rsdt_address(struct acpi_pointer *out_address)
-{
-        ACPI_FUNCTION_ENTRY();
-        out_address->pointer_type =
-            acpi_gbl_table_flags | ACPI_LOGICAL_ADDRESSING;
-        /* Use XSDT if it is present */
-        if ((acpi_gbl_RSDP->revision >= 2) &&
-            acpi_gbl_RSDP->xsdt_physical_address) {
-                out_address->pointer.value =
-                    acpi_gbl_RSDP->xsdt_physical_address;
-                acpi_gbl_root_table_type = ACPI_TABLE_TYPE_XSDT;
-        } else {
-                /* No XSDT, use the RSDT */
-                out_address->pointer.value =
-                    acpi_gbl_RSDP->rsdt_physical_address;
-                acpi_gbl_root_table_type = ACPI_TABLE_TYPE_RSDT;
-        }
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_validate_rsdt
- *
- * PARAMETERS:  table_ptr       - Addressable pointer to the RSDT.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Validate signature for the RSDT or XSDT
- *
- ******************************************************************************/
-acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
-{
-        char *signature;
-        ACPI_FUNCTION_ENTRY();
-        /* Validate minimum length */
-        if (table_ptr->length < sizeof(struct acpi_table_header)) {
-                ACPI_ERROR((AE_INFO,
-                            "RSDT/XSDT length (%X) is smaller than minimum (%zX)",
-                            table_ptr->length,
-                            sizeof(struct acpi_table_header)));
-                return (AE_INVALID_TABLE_LENGTH);
-        }
-        /* Search for appropriate signature, RSDT or XSDT */
-        if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-                signature = RSDT_SIG;
-        } else {
-                signature = XSDT_SIG;
-        }
-        if (!ACPI_COMPARE_NAME(table_ptr->signature, signature)) {
-                /* Invalid RSDT or XSDT signature */
-                ACPI_ERROR((AE_INFO,
-                            "Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:"));
-                ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
-                ACPI_ERROR((AE_INFO,
-                            "RSDT/XSDT signature at %X is invalid",
-                            acpi_gbl_RSDP->rsdt_physical_address));
-                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-                        ACPI_ERROR((AE_INFO, "Looking for RSDT"));
-                } else {
-                        ACPI_ERROR((AE_INFO, "Looking for XSDT"));
-                }
-                ACPI_DUMP_BUFFER(ACPI_CAST_PTR(char, table_ptr), 48);
-                return (AE_BAD_SIGNATURE);
-        }
-        return (AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_get_table_rsdt
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load and validate the RSDP (ptr) and RSDT (table)
- *
- ******************************************************************************/
-acpi_status acpi_tb_get_table_rsdt(void)
-{
-        struct acpi_table_desc table_info;
-        acpi_status status;
-        struct acpi_pointer address;
-        ACPI_FUNCTION_TRACE(tb_get_table_rsdt);
-        /* Get the RSDT/XSDT via the RSDP */
-        acpi_tb_get_rsdt_address(&address);
-        table_info.type = ACPI_TABLE_ID_XSDT;
-        status = acpi_tb_get_table(&address, &table_info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Could not get the RSDT/XSDT"));
-                return_ACPI_STATUS(status);
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, points to RSDT physical=%8.8X%8.8X\n",
-                          acpi_gbl_RSDP,
-                          ACPI_FORMAT_UINT64(address.pointer.value)));
-        /* Check the RSDT or XSDT signature */
-        status = acpi_tb_validate_rsdt(table_info.pointer);
-        if (ACPI_FAILURE(status)) {
-                goto error_cleanup;
-        }
-        /* Get the number of tables defined in the RSDT or XSDT */
-        acpi_gbl_rsdt_table_count = acpi_tb_get_table_count(acpi_gbl_RSDP,
-                                                            table_info.pointer);
-        /* Convert and/or copy to an XSDT structure */
-        status = acpi_tb_convert_to_xsdt(&table_info);
-        if (ACPI_FAILURE(status)) {
-                goto error_cleanup;
-        }
-        /* Save the table pointers and allocation info */
-        status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_XSDT, &table_info);
-        if (ACPI_FAILURE(status)) {
-                goto error_cleanup;
-        }
-        acpi_gbl_XSDT =
-            ACPI_CAST_PTR(struct xsdt_descriptor, table_info.pointer);
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "XSDT located at %p\n", acpi_gbl_XSDT));
-        return_ACPI_STATUS(status);
-      error_cleanup:
-        /* Free table allocated by acpi_tb_get_table */
-        acpi_tb_delete_single_table(&table_info);
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 209a401801e3..4a2f99e2fc44 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -1,11 +1,11 @@
 /******************************************************************************
 *
- * Module Name: tbutils - Table manipulation utilities
+ * Module Name: tbutils   - table utilities
 *
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -48,137 +48,119 @@
 ACPI_MODULE_NAME("tbutils")
 /* Local prototypes */
-#ifdef ACPI_OBSOLETE_FUNCTIONS
+static acpi_physical_address
-acpi_status
+acpi_tb_get_root_table_entry(u8 * table_entry,
-acpi_tb_handle_to_object(u16 table_id, struct acpi_table_desc **table_desc);
+                             acpi_native_uint table_entry_size);
-#endif
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_is_table_installed
+ * FUNCTION:    acpi_tb_tables_loaded
- *
- * PARAMETERS:  new_table_desc      - Descriptor for new table being installed
 *
- * RETURN:      Status - AE_ALREADY_EXISTS if the table is already installed
+ * PARAMETERS:  None
 *
- * DESCRIPTION: Determine if an ACPI table is already installed
+ * RETURN:      TRUE if required ACPI tables are loaded
 *
- * MUTEX:       Table data structures should be locked
+ * DESCRIPTION: Determine if the minimum required ACPI tables are present
+ *              (FADT, FACS, DSDT)
 *
 ******************************************************************************/
-acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)
+u8 acpi_tb_tables_loaded(void)
 {
-        struct acpi_table_desc *table_desc;
-        ACPI_FUNCTION_TRACE(tb_is_table_installed);
-        /* Get the list descriptor and first table descriptor */
+        if (acpi_gbl_root_table_list.count >= 3) {
+                return (TRUE);
-        table_desc = acpi_gbl_table_lists[new_table_desc->type].next;
+        }
-        /* Examine all installed tables of this type */
+        return (FALSE);
+}
-        while (table_desc) {
+/*******************************************************************************
-                /*
+ *
-                 * If the table lengths match, perform a full bytewise compare. This
+ * FUNCTION:    acpi_tb_print_table_header
-                 * means that we will allow tables with duplicate oem_table_id(s), as
+ *
-                 * long as the tables are different in some way.
+ * PARAMETERS:  Address             - Table physical address
-                 *
+ *              Header              - Table header
-                 * Checking if the table has been loaded into the namespace means that
+ *
-                 * we don't check for duplicate tables during the initial installation
+ * RETURN:      None
-                 * of tables within the RSDT/XSDT.
+ *
-                 */
+ * DESCRIPTION: Print an ACPI table header. Special cases for FACS and RSDP.
-                if ((table_desc->loaded_into_namespace) &&
+ *
-                    (table_desc->pointer->length ==
+ ******************************************************************************/
-                     new_table_desc->pointer->length)
-                    &&
-                    (!ACPI_MEMCMP
-                     (table_desc->pointer, new_table_desc->pointer,
-                      new_table_desc->pointer->length))) {
-                        /* Match: this table is already installed */
-                        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
-                                          "Table [%4.4s] already installed: Rev %X OemTableId [%8.8s]\n",
-                                          new_table_desc->pointer->signature,
-                                          new_table_desc->pointer->revision,
-                                          new_table_desc->pointer->
-                                          oem_table_id));
-                        new_table_desc->owner_id = table_desc->owner_id;
-                        new_table_desc->installed_desc = table_desc;
-                        return_ACPI_STATUS(AE_ALREADY_EXISTS);
-                }
-                /* Get next table on the list */
+void
+acpi_tb_print_table_header(acpi_physical_address address,
+                           struct acpi_table_header *header)
+{
-                table_desc = table_desc->next;
+        if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
+                /* FACS only has signature and length fields of common table header */
+                ACPI_INFO((AE_INFO, "%4.4s @ 0x%p/0x%04X",
+                           header->signature, ACPI_CAST_PTR(void, address),
+                           header->length));
+        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
+                /* RSDP has no common fields */
+                ACPI_INFO((AE_INFO, "RSDP @ 0x%p/0x%04X (v%3.3d %6.6s)",
+                           ACPI_CAST_PTR(void, address),
+                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
+                            revision >
+                            0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                               header)->length : 20,
+                           ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                         header)->revision,
+                           ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                         header)->oem_id));
+        } else {
+                /* Standard ACPI table with full common header */
+                ACPI_INFO((AE_INFO,
+                           "%4.4s @ 0x%p/0x%04X (v%3.3d %6.6s %8.8s 0x%08X %4.4s 0x%08X)",
+                           header->signature, ACPI_CAST_PTR(void, address),
+                           header->length, header->revision, header->oem_id,
+                           header->oem_table_id, header->oem_revision,
+                           header->asl_compiler_id,
+                           header->asl_compiler_revision));
        }
-        return_ACPI_STATUS(AE_OK);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_validate_table_header
+ * FUNCTION:    acpi_tb_validate_checksum
 *
- * PARAMETERS:  table_header        - Logical pointer to the table
+ * PARAMETERS:  Table               - ACPI table to verify
+ *              Length              - Length of entire table
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Check an ACPI table header for validity
+ * DESCRIPTION: Verifies that the table checksums to zero. Optionally returns
- *
+ *              exception on bad checksum.
- * NOTE:  Table pointers are validated as follows:
- *          1) Table pointer must point to valid physical memory
- *          2) Signature must be 4 ASCII chars, even if we don't recognize the
- *             name
- *          3) Table must be readable for length specified in the header
- *          4) Table checksum must be valid (with the exception of the FACS
- *              which has no checksum because it contains variable fields)
 *
 ******************************************************************************/
-acpi_status
+acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
-acpi_tb_validate_table_header(struct acpi_table_header *table_header)
 {
-        acpi_name signature;
+        u8 checksum;
-        ACPI_FUNCTION_ENTRY();
-        /* Verify that this is a valid address */
-        if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) {
-                ACPI_ERROR((AE_INFO,
-                            "Cannot read table header at %p", table_header));
-                return (AE_BAD_ADDRESS);
-        }
-        /* Ensure that the signature is 4 ASCII characters */
+        /* Compute the checksum on the table */
-        ACPI_MOVE_32_TO_32(&signature, table_header->signature);
+        checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length);
-        if (!acpi_ut_valid_acpi_name(signature)) {
-                ACPI_ERROR((AE_INFO, "Invalid table signature 0x%8.8X",
-                            signature));
-                ACPI_DUMP_BUFFER(table_header,
+        /* Checksum ok? (should be zero) */
-                                 sizeof(struct acpi_table_header));
-                return (AE_BAD_SIGNATURE);
-        }
-        /* Validate the table length */
+        if (checksum) {
+                ACPI_WARNING((AE_INFO,
+                              "Incorrect checksum in table [%4.4s] -  %2.2X, should be %2.2X",
+                              table->signature, table->checksum,
+                              (u8) (table->checksum - checksum)));
-        if (table_header->length < sizeof(struct acpi_table_header)) {
+#if (ACPI_CHECKSUM_ABORT)
-                ACPI_ERROR((AE_INFO,
-                            "Invalid length 0x%X in table with signature %4.4s",
-                            (u32) table_header->length,
-                            ACPI_CAST_PTR(char, &signature)));
-                ACPI_DUMP_BUFFER(table_header,
+                return (AE_BAD_CHECKSUM);
-                                 sizeof(struct acpi_table_header));
+#endif
-                return (AE_BAD_HEADER);
        }
        return (AE_OK);
@@ -186,157 +168,320 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_sum_table
+ * FUNCTION:    acpi_tb_checksum
 *
- * PARAMETERS:  Buffer              - Buffer to sum
+ * PARAMETERS:  Buffer          - Pointer to memory region to be checked
- *              Length              - Size of the buffer
+ *              Length          - Length of this memory region
 *
- * RETURN:      8 bit sum of buffer
+ * RETURN:      Checksum (u8)
 *
- * DESCRIPTION: Computes an 8 bit sum of the buffer(length) and returns it.
+ * DESCRIPTION: Calculates circular checksum of memory region.
 *
 ******************************************************************************/
-u8 acpi_tb_sum_table(void *buffer, u32 length)
+u8 acpi_tb_checksum(u8 * buffer, acpi_native_uint length)
 {
-        acpi_native_uint i;
        u8 sum = 0;
+        u8 *end = buffer + length;
-        if (!buffer || !length) {
+        while (buffer < end) {
-                return (0);
+                sum = (u8) (sum + *(buffer++));
        }
-        for (i = 0; i < length; i++) {
+        return sum;
-                sum = (u8) (sum + ((u8 *) buffer)[i]);
-        }
-        return (sum);
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_generate_checksum
+ * FUNCTION:    acpi_tb_install_table
 *
- * PARAMETERS:  Table               - Pointer to a valid ACPI table (with a
+ * PARAMETERS:  Address                 - Physical address of DSDT or FACS
- *                                    standard ACPI header)
+ *              Flags                   - Flags
+ *              Signature               - Table signature, NULL if no need to
+ *                                        match
+ *              table_index             - Index into root table array
 *
- * RETURN:      8 bit checksum of buffer
+ * RETURN:      None
 *
- * DESCRIPTION: Computes an 8 bit checksum of the table.
+ * DESCRIPTION: Install an ACPI table into the global data structure.
 *
 ******************************************************************************/
-u8 acpi_tb_generate_checksum(struct acpi_table_header * table)
+void
+acpi_tb_install_table(acpi_physical_address address,
+                      u8 flags, char *signature, acpi_native_uint table_index)
 {
-        u8 checksum;
+        struct acpi_table_header *table;
+        if (!address) {
+                ACPI_ERROR((AE_INFO,
+                            "Null physical address for ACPI table [%s]",
+                            signature));
+                return;
+        }
+        /* Map just the table header */
+        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!table) {
+                return;
+        }
+        /* If a particular signature is expected, signature must match */
+        if (signature && !ACPI_COMPARE_NAME(table->signature, signature)) {
+                ACPI_ERROR((AE_INFO,
+                            "Invalid signature 0x%X for ACPI table [%s]",
+                            *ACPI_CAST_PTR(u32, table->signature), signature));
+                goto unmap_and_exit;
+        }
-        /* Sum the entire table as-is */
+        /* Initialize the table entry */
-        checksum = acpi_tb_sum_table(table, table->length);
+        acpi_gbl_root_table_list.tables[table_index].address = address;
+        acpi_gbl_root_table_list.tables[table_index].length = table->length;
+        acpi_gbl_root_table_list.tables[table_index].flags = flags;
-        /* Subtract off the existing checksum value in the table */
+        ACPI_MOVE_32_TO_32(&
+                           (acpi_gbl_root_table_list.tables[table_index].
+                            signature), table->signature);
-        checksum = (u8) (checksum - table->checksum);
+        acpi_tb_print_table_header(address, table);
-        /* Compute the final checksum */
+        if (table_index == ACPI_TABLE_INDEX_DSDT) {
-        checksum = (u8) (0 - checksum);
+                /* Global integer width is based upon revision of the DSDT */
-        return (checksum);
+                acpi_ut_set_integer_width(table->revision);
+        }
+      unmap_and_exit:
+        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_set_checksum
+ * FUNCTION:    acpi_tb_get_root_table_entry
 *
- * PARAMETERS:  Table               - Pointer to a valid ACPI table (with a
+ * PARAMETERS:  table_entry         - Pointer to the RSDT/XSDT table entry
- *                                    standard ACPI header)
+ *              table_entry_size    - sizeof 32 or 64 (RSDT or XSDT)
 *
- * RETURN:      None. Sets the table checksum field
+ * RETURN:      Physical address extracted from the root table
 *
- * DESCRIPTION: Computes an 8 bit checksum of the table and inserts the
+ * DESCRIPTION: Get one root table entry. Handles 32-bit and 64-bit cases on
- *              checksum into the table header.
+ *              both 32-bit and 64-bit platforms
+ *
+ * NOTE:        acpi_physical_address is 32-bit on 32-bit platforms, 64-bit on
+ *              64-bit platforms.
 *
 ******************************************************************************/
-void acpi_tb_set_checksum(struct acpi_table_header *table)
+static acpi_physical_address
+acpi_tb_get_root_table_entry(u8 * table_entry,
+                             acpi_native_uint table_entry_size)
 {
+        u64 address64;
+        /*
+         * Get the table physical address (32-bit for RSDT, 64-bit for XSDT):
+         * Note: Addresses are 32-bit aligned (not 64) in both RSDT and XSDT
+         */
+        if (table_entry_size == sizeof(u32)) {
+                /*
+                 * 32-bit platform, RSDT: Return 32-bit table entry
+                 * 64-bit platform, RSDT: Expand 32-bit to 64-bit and return
+                 */
+                return ((acpi_physical_address)
+                        (*ACPI_CAST_PTR(u32, table_entry)));
+        } else {
+                /*
+                 * 32-bit platform, XSDT: Truncate 64-bit to 32-bit and return
+                 * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, return 64-bit
+                 */
+                ACPI_MOVE_64_TO_64(&address64, table_entry);
-        table->checksum = acpi_tb_generate_checksum(table);
+#if ACPI_MACHINE_WIDTH == 32
+                if (address64 > ACPI_UINT32_MAX) {
+                        /* Will truncate 64-bit address to 32 bits, issue warning */
+                        ACPI_WARNING((AE_INFO,
+                                      "64-bit Physical Address in XSDT is too large (%8.8X%8.8X), truncating",
+                                      ACPI_FORMAT_UINT64(address64)));
+                }
+#endif
+                return ((acpi_physical_address) (address64));
+        }
 }
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_verify_table_checksum
+ * FUNCTION:    acpi_tb_parse_root_table
+ *
+ * PARAMETERS:  Rsdp                    - Pointer to the RSDP
+ *              Flags                   - Flags
 *
- * PARAMETERS:  *table_header           - ACPI table to verify
+ * RETURN:      Status
 *
- * RETURN:      8 bit checksum of table
+ * DESCRIPTION: This function is called to parse the Root System Description
+ *              Table (RSDT or XSDT)
 *
- * DESCRIPTION: Generates an 8 bit checksum of table and returns and compares
+ * NOTE:        Tables are mapped (not copied) for efficiency. The FACS must
- *              it to the existing checksum value.
+ *              be mapped and cannot be copied because it contains the actual
+ *              memory location of the ACPI Global Lock.
 *
 ******************************************************************************/
-acpi_status
+acpi_status __init
-acpi_tb_verify_table_checksum(struct acpi_table_header *table_header)
+acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 {
-        u8 checksum;
+        struct acpi_table_rsdp *rsdp;
+        acpi_native_uint table_entry_size;
+        acpi_native_uint i;
+        u32 table_count;
+        struct acpi_table_header *table;
+        acpi_physical_address address;
+        u32 length;
+        u8 *table_entry;
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(tb_parse_root_table);
+        /*
+         * Map the entire RSDP and extract the address of the RSDT or XSDT
+         */
+        rsdp = acpi_os_map_memory(rsdp_address, sizeof(struct acpi_table_rsdp));
+        if (!rsdp) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
-        ACPI_FUNCTION_TRACE(tb_verify_table_checksum);
+        acpi_tb_print_table_header(rsdp_address,
+                                   ACPI_CAST_PTR(struct acpi_table_header,
+                                                 rsdp));
-        /* Compute the checksum on the table */
+        /* Differentiate between RSDT and XSDT root tables */
-        checksum = acpi_tb_generate_checksum(table_header);
+        if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
+                /*
+                 * Root table is an XSDT (64-bit physical addresses). We must use the
+                 * XSDT if the revision is > 1 and the XSDT pointer is present, as per
+                 * the ACPI specification.
+                 */
+                address = (acpi_physical_address) rsdp->xsdt_physical_address;
+                table_entry_size = sizeof(u64);
+        } else {
+                /* Root table is an RSDT (32-bit physical addresses) */
-        /* Checksum ok? */
+                address = (acpi_physical_address) rsdp->rsdt_physical_address;
+                table_entry_size = sizeof(u32);
+        }
-        if (checksum == table_header->checksum) {
+        /*
-                return_ACPI_STATUS(AE_OK);
+         * It is not possible to map more than one entry in some environments,
+         * so unmap the RSDP here before mapping other tables
+         */
+        acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));
+        /* Map the RSDT/XSDT table header to get the full table length */
+        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!table) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
        }
-        ACPI_WARNING((AE_INFO,
+        acpi_tb_print_table_header(address, table);
-                      "Incorrect checksum in table [%4.4s] - is %2.2X, should be %2.2X",
-                      table_header->signature, table_header->checksum,
-                      checksum));
-        return_ACPI_STATUS(AE_BAD_CHECKSUM);
+        /* Get the length of the full table, verify length and map entire table */
-}
-#ifdef ACPI_OBSOLETE_FUNCTIONS
+        length = table->length;
-/*******************************************************************************
+        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
- *
- * FUNCTION:    acpi_tb_handle_to_object
- *
- * PARAMETERS:  table_id            - Id for which the function is searching
- *              table_desc          - Pointer to return the matching table
- *                                      descriptor.
- *
- * RETURN:      Search the tables to find one with a matching table_id and
- *              return a pointer to that table descriptor.
- *
- ******************************************************************************/
-acpi_status
+        if (length < sizeof(struct acpi_table_header)) {
-acpi_tb_handle_to_object(u16 table_id,
+                ACPI_ERROR((AE_INFO, "Invalid length 0x%X in RSDT/XSDT",
-                         struct acpi_table_desc **return_table_desc)
+                            length));
-{
+                return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
-        u32 i;
+        }
-        struct acpi_table_desc *table_desc;
-        ACPI_FUNCTION_NAME(tb_handle_to_object);
+        table = acpi_os_map_memory(address, length);
+        if (!table) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+        /* Validate the root table checksum */
+        status = acpi_tb_verify_checksum(table, length);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_unmap_memory(table, length);
+                return_ACPI_STATUS(status);
+        }
-        for (i = 0; i < ACPI_TABLE_MAX; i++) {
+        /* Calculate the number of tables described in the root table */
-                table_desc = acpi_gbl_table_lists[i].next;
-                while (table_desc) {
+        table_count =
-                        if (table_desc->table_id == table_id) {
+            (u32) ((table->length -
-                                *return_table_desc = table_desc;
+                    sizeof(struct acpi_table_header)) / table_entry_size);
-                                return (AE_OK);
+        /*
+         * First two entries in the table array are reserved for the DSDT and FACS,
+         * which are not actually present in the RSDT/XSDT - they come from the FADT
+         */
+        table_entry =
+            ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
+        acpi_gbl_root_table_list.count = 2;
+        /*
+         * Initialize the root table array from the RSDT/XSDT
+         */
+        for (i = 0; i < table_count; i++) {
+                if (acpi_gbl_root_table_list.count >=
+                    acpi_gbl_root_table_list.size) {
+                        /* There is no more room in the root table array, attempt resize */
+                        status = acpi_tb_resize_root_table_list();
+                        if (ACPI_FAILURE(status)) {
+                                ACPI_WARNING((AE_INFO,
+                                              "Truncating %u table entries!",
+                                              (unsigned)
+                                              (acpi_gbl_root_table_list.size -
+                                               acpi_gbl_root_table_list.
+                                               count)));
+                                break;
                        }
+                }
+                /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
-                        table_desc = table_desc->next;
+                acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
+                    address =
+                    acpi_tb_get_root_table_entry(table_entry, table_entry_size);
+                table_entry += table_entry_size;
+                acpi_gbl_root_table_list.count++;
+        }
+        /*
+         * It is not possible to map more than one entry in some environments,
+         * so unmap the root table here before mapping other tables
+         */
+        acpi_os_unmap_memory(table, length);
+        /*
+         * Complete the initialization of the root table array by examining
+         * the header of each table
+         */
+        for (i = 2; i < acpi_gbl_root_table_list.count; i++) {
+                acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].
+                                      address, flags, NULL, i);
+                /* Special case for FADT - get the DSDT and FACS */
+                if (ACPI_COMPARE_NAME
+                    (&acpi_gbl_root_table_list.tables[i].signature,
+                     ACPI_SIG_FADT)) {
+                        acpi_tb_parse_fadt(i, flags);
                }
        }
-        ACPI_ERROR((AE_INFO, "TableId=%X does not exist", table_id));
+        return_ACPI_STATUS(AE_OK);
-        return (AE_BAD_PARAMETER);
 }
-#endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 7767987be15a..807978d5381a 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -49,81 +49,158 @@
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxface")
+/* Local prototypes */
+static acpi_status acpi_tb_load_namespace(void);
 /*******************************************************************************
 *
- * FUNCTION:    acpi_load_tables
+ * FUNCTION:    acpi_allocate_root_table
 *
- * PARAMETERS:  None
+ * PARAMETERS:  initial_table_count - Size of initial_table_array, in number of
+ *                                    struct acpi_table_desc structures
 *
 * RETURN:      Status
 *
- * DESCRIPTION: This function is called to load the ACPI tables from the
+ * DESCRIPTION: Allocate a root table array. Used by i_aSL compiler and
- *              provided RSDT
+ *              acpi_initialize_tables.
 *
 ******************************************************************************/
-acpi_status acpi_load_tables(void)
+acpi_status acpi_allocate_root_table(u32 initial_table_count)
 {
-        struct acpi_pointer rsdp_address;
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(acpi_load_tables);
+        acpi_gbl_root_table_list.size = initial_table_count;
+        acpi_gbl_root_table_list.flags = ACPI_ROOT_ALLOW_RESIZE;
-        /* Get the RSDP */
+        return (acpi_tb_resize_root_table_list());
+}
-        status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING,
+/*******************************************************************************
-                                          &rsdp_address);
+ *
-        if (ACPI_FAILURE(status)) {
+ * FUNCTION:    acpi_initialize_tables
-                ACPI_EXCEPTION((AE_INFO, status, "Could not get the RSDP"));
+ *
-                goto error_exit;
+ * PARAMETERS:  initial_table_array - Pointer to an array of pre-allocated
-        }
+ *                                    struct acpi_table_desc structures. If NULL, the
+ *                                    array is dynamically allocated.
+ *              initial_table_count - Size of initial_table_array, in number of
+ *                                    struct acpi_table_desc structures
+ *              allow_realloc       - Flag to tell Table Manager if resize of
+ *                                    pre-allocated array is allowed. Ignored
+ *                                    if initial_table_array is NULL.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initialize the table manager, get the RSDP and RSDT/XSDT.
+ *
+ * NOTE:        Allows static allocation of the initial table array in order
+ *              to avoid the use of dynamic memory in confined environments
+ *              such as the kernel boot sequence where it may not be available.
+ *
+ *              If the host OS memory managers are initialized, use NULL for
+ *              initial_table_array, and the table will be dynamically allocated.
+ *
+ ******************************************************************************/
-        /* Map and validate the RSDP */
+acpi_status __init
+acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
+                       u32 initial_table_count, u8 allow_resize)
+{
+        acpi_physical_address rsdp_address;
+        acpi_status status;
-        acpi_gbl_table_flags = rsdp_address.pointer_type;
+        ACPI_FUNCTION_TRACE(acpi_initialize_tables);
-        status = acpi_tb_verify_rsdp(&rsdp_address);
+        /*
-        if (ACPI_FAILURE(status)) {
+         * Set up the Root Table Array
-                ACPI_EXCEPTION((AE_INFO, status, "During RSDP validation"));
+         * Allocate the table array if requested
-                goto error_exit;
+         */
+        if (!initial_table_array) {
+                status = acpi_allocate_root_table(initial_table_count);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        } else {
+                /* Root Table Array has been statically allocated by the host */
+                ACPI_MEMSET(initial_table_array, 0,
+                            initial_table_count *
+                            sizeof(struct acpi_table_desc));
+                acpi_gbl_root_table_list.tables = initial_table_array;
+                acpi_gbl_root_table_list.size = initial_table_count;
+                acpi_gbl_root_table_list.flags = ACPI_ROOT_ORIGIN_UNKNOWN;
+                if (allow_resize) {
+                        acpi_gbl_root_table_list.flags |=
+                            ACPI_ROOT_ALLOW_RESIZE;
+                }
        }
-        /* Get the RSDT via the RSDP */
+        /* Get the address of the RSDP */
-        status = acpi_tb_get_table_rsdt();
+        rsdp_address = acpi_os_get_root_pointer();
-        if (ACPI_FAILURE(status)) {
+        if (!rsdp_address) {
-                ACPI_EXCEPTION((AE_INFO, status, "Could not load RSDT"));
+                return_ACPI_STATUS(AE_NOT_FOUND);
-                goto error_exit;
        }
-        /* Now get the tables needed by this subsystem (FADT, DSDT, etc.) */
+        /*
+         * Get the root table (RSDT or XSDT) and extract all entries to the local
+         * Root Table Array. This array contains the information of the RSDT/XSDT
+         * in a common, more useable format.
+         */
+        status =
+            acpi_tb_parse_root_table(rsdp_address, ACPI_TABLE_ORIGIN_MAPPED);
+        return_ACPI_STATUS(status);
+}
-        status = acpi_tb_get_required_tables();
+/*******************************************************************************
-        if (ACPI_FAILURE(status)) {
+ *
-                ACPI_EXCEPTION((AE_INFO, status,
+ * FUNCTION:    acpi_reallocate_root_table
-                                "Could not get all required tables (DSDT/FADT/FACS)"));
+ *
-                goto error_exit;
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Reallocate Root Table List into dynamic memory. Copies the
+ *              root list from the previously provided scratch area. Should
+ *              be called once dynamic memory allocation is available in the
+ *              kernel
+ *
+ ******************************************************************************/
+acpi_status acpi_reallocate_root_table(void)
+{
+        struct acpi_table_desc *tables;
+        acpi_size new_size;
+        ACPI_FUNCTION_TRACE(acpi_reallocate_root_table);
+        /*
+         * Only reallocate the root table if the host provided a static buffer
+         * for the table array in the call to acpi_initialize_tables.
+         */
+        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
+                return_ACPI_STATUS(AE_SUPPORT);
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
+        new_size =
+            (acpi_gbl_root_table_list.count +
+             ACPI_ROOT_TABLE_SIZE_INCREMENT) * sizeof(struct acpi_table_desc);
-        /* Load the namespace from the tables */
+        /* Create new array and copy the old array */
-        status = acpi_ns_load_namespace();
+        tables = ACPI_ALLOCATE_ZEROED(new_size);
-        if (ACPI_FAILURE(status)) {
+        if (!tables) {
-                ACPI_EXCEPTION((AE_INFO, status, "Could not load namespace"));
+                return_ACPI_STATUS(AE_NO_MEMORY);
-                goto error_exit;
        }
-        return_ACPI_STATUS(AE_OK);
+        ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables, new_size);
-      error_exit:
+        acpi_gbl_root_table_list.size = acpi_gbl_root_table_list.count;
-        ACPI_EXCEPTION((AE_INFO, status, "Could not load tables"));
+        acpi_gbl_root_table_list.tables = tables;
-        return_ACPI_STATUS(status);
+        acpi_gbl_root_table_list.flags =
-}
+            ACPI_ROOT_ORIGIN_ALLOCATED | ACPI_ROOT_ALLOW_RESIZE;
-ACPI_EXPORT_SYMBOL(acpi_load_tables)
+        return_ACPI_STATUS(AE_OK);
+}
-#ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
 * FUNCTION:    acpi_load_table
@@ -142,289 +219,405 @@ ACPI_EXPORT_SYMBOL(acpi_load_tables)
 acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
 {
        acpi_status status;
-        struct acpi_table_desc table_info;
+        acpi_native_uint table_index;
-        struct acpi_pointer address;
+        struct acpi_table_desc table_desc;
-        ACPI_FUNCTION_TRACE(acpi_load_table);
+        if (!table_ptr)
+                return AE_BAD_PARAMETER;
-        if (!table_ptr) {
+        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        table_desc.pointer = table_ptr;
-        }
+        table_desc.length = table_ptr->length;
+        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
-        /* Copy the table to a local buffer */
-        address.pointer_type = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING;
+        /*
-        address.pointer.logical = table_ptr;
+         * Install the new table into the local data structures
+         */
-        status = acpi_tb_get_table_body(&address, table_ptr, &table_info);
+        status = acpi_tb_add_table(&table_desc, &table_index);
        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                return status;
        }
+        status = acpi_ns_load_table(table_index, acpi_gbl_root_node);
+        return status;
+}
-        /* Check signature for a valid table type */
+ACPI_EXPORT_SYMBOL(acpi_load_table)
-        status = acpi_tb_recognize_table(&table_info, ACPI_TABLE_ALL);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Install the new table into the local data structures */
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_get_table_header
+ *
+ * PARAMETERS:  Signature           - ACPI signature of needed table
+ *              Instance            - Which instance (for SSDTs)
+ *              out_table_header    - The pointer to the table header to fill
+ *
+ * RETURN:      Status and pointer to mapped table header
+ *
+ * DESCRIPTION: Finds an ACPI table header.
+ *
+ * NOTE:        Caller is responsible in unmapping the header with
+ *              acpi_os_unmap_memory
+ *
+ *****************************************************************************/
+acpi_status
+acpi_get_table_header(char *signature,
+                      acpi_native_uint instance,
+                      struct acpi_table_header *out_table_header)
+{
+        acpi_native_uint i;
+        acpi_native_uint j;
+        struct acpi_table_header *header;
-        status = acpi_tb_install_table(&table_info);
+        /* Parameter validation */
-        if (ACPI_FAILURE(status)) {
-                if (status == AE_ALREADY_EXISTS) {
-                        /* Table already exists, no error */
+        if (!signature || !out_table_header) {
+                return (AE_BAD_PARAMETER);
+        }
-                        status = AE_OK;
+        /*
+         * Walk the root table list
+         */
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+                if (!ACPI_COMPARE_NAME
+                    (&(acpi_gbl_root_table_list.tables[i].signature),
+                     signature)) {
+                        continue;
                }
-                /* Free table allocated by acpi_tb_get_table_body */
+                if (++j < instance) {
+                        continue;
+                }
-                acpi_tb_delete_single_table(&table_info);
+                if (!acpi_gbl_root_table_list.tables[i].pointer) {
-                return_ACPI_STATUS(status);
+                        if ((acpi_gbl_root_table_list.tables[i].
+                             flags & ACPI_TABLE_ORIGIN_MASK) ==
+                            ACPI_TABLE_ORIGIN_MAPPED) {
+                                header =
+                                    acpi_os_map_memory(acpi_gbl_root_table_list.
+                                                       tables[i].address,
+                                                       sizeof(struct
+                                                              acpi_table_header));
+                                if (!header) {
+                                        return AE_NO_MEMORY;
+                                }
+                                ACPI_MEMCPY(out_table_header, header,
+                                            sizeof(struct acpi_table_header));
+                                acpi_os_unmap_memory(header,
+                                                     sizeof(struct
+                                                            acpi_table_header));
+                        } else {
+                                return AE_NOT_FOUND;
+                        }
+                } else {
+                        ACPI_MEMCPY(out_table_header,
+                                    acpi_gbl_root_table_list.tables[i].pointer,
+                                    sizeof(struct acpi_table_header));
+                }
+                return (AE_OK);
        }
-        /* Convert the table to common format if necessary */
+        return (AE_NOT_FOUND);
+}
-        switch (table_info.type) {
-        case ACPI_TABLE_ID_FADT:
-                status = acpi_tb_convert_table_fadt();
-                break;
-        case ACPI_TABLE_ID_FACS:
-                status = acpi_tb_build_common_facs(&table_info);
-                break;
-        default:
+ACPI_EXPORT_SYMBOL(acpi_get_table_header)
-                /* Load table into namespace if it contains executable AML */
-                status =
-                    acpi_ns_load_table(table_info.installed_desc,
-                                       acpi_gbl_root_node);
-                break;
-        }
-        if (ACPI_FAILURE(status)) {
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_unload_table_id
+ *
+ * PARAMETERS:  id            - Owner ID of the table to be removed.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This routine is used to force the unload of a table (by id)
+ *
+ ******************************************************************************/
+acpi_status acpi_unload_table_id(acpi_owner_id id)
+{
+        int i;
+        acpi_status status = AE_NOT_EXIST;
-                /* Uninstall table and free the buffer */
+        ACPI_FUNCTION_TRACE(acpi_unload_table);
-                (void)acpi_tb_uninstall_table(table_info.installed_desc);
+        /* Find table from the requested type list */
+        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+                if (id != acpi_gbl_root_table_list.tables[i].owner_id) {
+                        continue;
+                }
+                /*
+                * Delete all namespace objects owned by this table. Note that these
+                * objects can appear anywhere in the namespace by virtue of the AML
+                * "Scope" operator. Thus, we need to track ownership by an ID, not
+                * simply a position within the hierarchy
+                */
+                acpi_tb_delete_namespace_by_owner(i);
+                acpi_tb_release_owner_id(i);
+                acpi_tb_set_table_loaded_flag(i, FALSE);
        }
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_load_table)
+ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_unload_table
+ * FUNCTION:    acpi_get_table
 *
- * PARAMETERS:  table_type    - Type of table to be unloaded
+ * PARAMETERS:  Signature           - ACPI signature of needed table
+ *              Instance            - Which instance (for SSDTs)
+ *              out_table           - Where the pointer to the table is returned
 *
- * RETURN:      Status
+ * RETURN:      Status and pointer to table
 *
- * DESCRIPTION: This routine is used to force the unload of a table
+ * DESCRIPTION: Finds and verifies an ACPI table.
 *
- ******************************************************************************/
+ *****************************************************************************/
-acpi_status acpi_unload_table(acpi_table_type table_type)
+acpi_status
+acpi_get_table(char *signature,
+               acpi_native_uint instance, struct acpi_table_header ** out_table)
 {
-        struct acpi_table_desc *table_desc;
+        acpi_native_uint i;
+        acpi_native_uint j;
-        ACPI_FUNCTION_TRACE(acpi_unload_table);
+        acpi_status status;
        /* Parameter validation */
-        if (table_type > ACPI_TABLE_ID_MAX) {
+        if (!signature || !out_table) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                return (AE_BAD_PARAMETER);
        }
-        /* Find all tables of the requested type */
+        /*
+         * Walk the root table list
+         */
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+                if (!ACPI_COMPARE_NAME
+                    (&(acpi_gbl_root_table_list.tables[i].signature),
+                     signature)) {
+                        continue;
+                }
-        table_desc = acpi_gbl_table_lists[table_type].next;
+                if (++j < instance) {
-        if (!table_desc) {
+                        continue;
-                return_ACPI_STATUS(AE_NOT_EXIST);
+                }
-        }
-        while (table_desc) {
+                status =
-                /*
+                    acpi_tb_verify_table(&acpi_gbl_root_table_list.tables[i]);
-                 * Delete all namespace objects owned by this table. Note that these
+                if (ACPI_SUCCESS(status)) {
-                 * objects can appear anywhere in the namespace by virtue of the AML
+                        *out_table = acpi_gbl_root_table_list.tables[i].pointer;
-                 * "Scope" operator. Thus, we need to track ownership by an ID, not
+                }
-                 * simply a position within the hierarchy
-                 */
-                acpi_ns_delete_namespace_by_owner(table_desc->owner_id);
-                table_desc = table_desc->next;
-        }
-        /* Delete (or unmap) all tables of this type */
+                if (!acpi_gbl_permanent_mmap) {
+                        acpi_gbl_root_table_list.tables[i].pointer = 0;
+                }
-        acpi_tb_delete_tables_by_type(table_type);
+                return (status);
-        return_ACPI_STATUS(AE_OK);
+        }
+        return (AE_NOT_FOUND);
 }
-ACPI_EXPORT_SYMBOL(acpi_unload_table)
+ACPI_EXPORT_SYMBOL(acpi_get_table)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_get_table_header
+ * FUNCTION:    acpi_get_table_by_index
 *
- * PARAMETERS:  table_type      - one of the defined table types
+ * PARAMETERS:  table_index         - Table index
- *              Instance        - the non zero instance of the table, allows
+ *              Table               - Where the pointer to the table is returned
- *                                support for multiple tables of the same type
- *                                see acpi_gbl_acpi_table_flag
- *              out_table_header - pointer to the struct acpi_table_header if successful
 *
- * DESCRIPTION: This function is called to get an ACPI table header. The caller
+ * RETURN:      Status and pointer to the table
- *              supplies an pointer to a data area sufficient to contain an ACPI
- *              struct acpi_table_header structure.
 *
- *              The header contains a length field that can be used to determine
+ * DESCRIPTION: Obtain a table by an index into the global table list.
- *              the size of the buffer needed to contain the entire table. This
- *              function is not valid for the RSD PTR table since it does not
- *              have a standard header and is fixed length.
 *
 ******************************************************************************/
 acpi_status
-acpi_get_table_header(acpi_table_type table_type,
+acpi_get_table_by_index(acpi_native_uint table_index,
-                      u32 instance, struct acpi_table_header *out_table_header)
+                        struct acpi_table_header ** table)
 {
-        struct acpi_table_header *tbl_ptr;
        acpi_status status;
-        ACPI_FUNCTION_TRACE(acpi_get_table_header);
+        ACPI_FUNCTION_TRACE(acpi_get_table_by_index);
+        /* Parameter validation */
-        if ((instance == 0) ||
+        if (!table) {
-            (table_type == ACPI_TABLE_ID_RSDP) || (!out_table_header)) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        /* Check the table type and instance */
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if ((table_type > ACPI_TABLE_ID_MAX) ||
+        /* Validate index */
-            (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &&
-             instance > 1)) {
+        if (table_index >= acpi_gbl_root_table_list.count) {
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        /* Get a pointer to the entire table */
+        if (!acpi_gbl_root_table_list.tables[table_index].pointer) {
-        status = acpi_tb_get_table_ptr(table_type, instance, &tbl_ptr);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* The function will return a NULL pointer if the table is not loaded */
+                /* Table is not mapped, map it */
-        if (tbl_ptr == NULL) {
+                status =
-                return_ACPI_STATUS(AE_NOT_EXIST);
+                    acpi_tb_verify_table(&acpi_gbl_root_table_list.
+                                         tables[table_index]);
+                if (ACPI_FAILURE(status)) {
+                        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                        return_ACPI_STATUS(status);
+                }
        }
-        /* Copy the header to the caller's buffer */
+        *table = acpi_gbl_root_table_list.tables[table_index].pointer;
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        ACPI_MEMCPY(ACPI_CAST_PTR(void, out_table_header),
+        return_ACPI_STATUS(AE_OK);
-                    ACPI_CAST_PTR(void, tbl_ptr),
-                    sizeof(struct acpi_table_header));
-        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_get_table_header)
+ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
-#endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
- * FUNCTION:    acpi_get_table
+ * FUNCTION:    acpi_tb_load_namespace
 *
- * PARAMETERS:  table_type      - one of the defined table types
+ * PARAMETERS:  None
- *              Instance        - the non zero instance of the table, allows
- *                                support for multiple tables of the same type
- *                                see acpi_gbl_acpi_table_flag
- *              ret_buffer      - pointer to a structure containing a buffer to
- *                                receive the table
 *
 * RETURN:      Status
 *
- * DESCRIPTION: This function is called to get an ACPI table. The caller
+ * DESCRIPTION: Load the namespace from the DSDT and all SSDTs/PSDTs found in
- *              supplies an out_buffer large enough to contain the entire ACPI
+ *              the RSDT/XSDT.
- *              table. The caller should call the acpi_get_table_header function
- *              first to determine the buffer size needed. Upon completion
- *              the out_buffer->Length field will indicate the number of bytes
- *              copied into the out_buffer->buf_ptr buffer. This table will be
- *              a complete table including the header.
 *
 ******************************************************************************/
-acpi_status
+static acpi_status acpi_tb_load_namespace(void)
-acpi_get_table(acpi_table_type table_type,
-               u32 instance, struct acpi_buffer *ret_buffer)
 {
-        struct acpi_table_header *tbl_ptr;
        acpi_status status;
-        acpi_size table_length;
+        struct acpi_table_header *table;
+        acpi_native_uint i;
-        ACPI_FUNCTION_TRACE(acpi_get_table);
+        ACPI_FUNCTION_TRACE(tb_load_namespace);
-        /* Parameter validation */
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (instance == 0) {
+        /*
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+         * Load the namespace. The DSDT is required, but any SSDT and PSDT tables
+         * are optional.
+         */
+        if (!acpi_gbl_root_table_list.count ||
+            !ACPI_COMPARE_NAME(&
+                               (acpi_gbl_root_table_list.
+                                tables[ACPI_TABLE_INDEX_DSDT].signature),
+                               ACPI_SIG_DSDT)
+            ||
+            ACPI_FAILURE(acpi_tb_verify_table
+                         (&acpi_gbl_root_table_list.
+                          tables[ACPI_TABLE_INDEX_DSDT]))) {
+                status = AE_NO_ACPI_TABLES;
+                goto unlock_and_exit;
        }
-        status = acpi_ut_validate_buffer(ret_buffer);
+        /*
-        if (ACPI_FAILURE(status)) {
+         * Find DSDT table
-                return_ACPI_STATUS(status);
+         */
+        status =
+            acpi_os_table_override(acpi_gbl_root_table_list.
+                                   tables[ACPI_TABLE_INDEX_DSDT].pointer,
+                                   &table);
+        if (ACPI_SUCCESS(status) && table) {
+                /*
+                 * DSDT table has been found
+                 */
+                acpi_tb_delete_table(&acpi_gbl_root_table_list.
+                                     tables[ACPI_TABLE_INDEX_DSDT]);
+                acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer =
+                    table;
+                acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].length =
+                    table->length;
+                acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].flags =
+                    ACPI_TABLE_ORIGIN_UNKNOWN;
+                ACPI_INFO((AE_INFO, "Table DSDT replaced by host OS"));
+                acpi_tb_print_table_header(0, table);
        }
-        /* Check the table type and instance */
+        status =
+            acpi_tb_verify_table(&acpi_gbl_root_table_list.
+                                 tables[ACPI_TABLE_INDEX_DSDT]);
+        if (ACPI_FAILURE(status)) {
-        if ((table_type > ACPI_TABLE_ID_MAX) ||
+                /* A valid DSDT is required */
-            (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &&
-             instance > 1)) {
+                status = AE_NO_ACPI_TABLES;
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                goto unlock_and_exit;
        }
-        /* Get a pointer to the entire table */
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        status = acpi_tb_get_table_ptr(table_type, instance, &tbl_ptr);
+        /*
+         * Load and parse tables.
+         */
+        status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
        /*
-         * acpi_tb_get_table_ptr will return a NULL pointer if the
+         * Load any SSDT or PSDT tables. Note: Loop leaves tables locked
-         * table is not loaded.
         */
-        if (tbl_ptr == NULL) {
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-                return_ACPI_STATUS(AE_NOT_EXIST);
+        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+                if ((!ACPI_COMPARE_NAME
+                     (&(acpi_gbl_root_table_list.tables[i].signature),
+                      ACPI_SIG_SSDT)
+                     &&
+                     !ACPI_COMPARE_NAME(&
+                                        (acpi_gbl_root_table_list.tables[i].
+                                         signature), ACPI_SIG_PSDT))
+                    ||
+                    ACPI_FAILURE(acpi_tb_verify_table
+                                 (&acpi_gbl_root_table_list.tables[i]))) {
+                        continue;
+                }
+                /* Ignore errors while loading tables, get as many as possible */
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                (void)acpi_ns_load_table(i, acpi_gbl_root_node);
+                (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
        }
-        /* Get the table length */
+        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
-        if (table_type == ACPI_TABLE_ID_RSDP) {
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
-                /* RSD PTR is the only "table" without a header */
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_load_tables
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
+ *
+ ******************************************************************************/
-                table_length = sizeof(struct rsdp_descriptor);
+acpi_status acpi_load_tables(void)
-        } else {
+{
-                table_length = (acpi_size) tbl_ptr->length;
+        acpi_status status;
-        }
-        /* Validate/Allocate/Clear caller buffer */
+        ACPI_FUNCTION_TRACE(acpi_load_tables);
-        status = acpi_ut_initialize_buffer(ret_buffer, table_length);
+        /*
+         * Load the namespace from the tables
+         */
+        status = acpi_tb_load_namespace();
        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While loading namespace from ACPI tables"));
        }
-        /* Copy the table to the buffer */
+        return_ACPI_STATUS(status);
-        ACPI_MEMCPY(ACPI_CAST_PTR(void, ret_buffer->pointer),
-                    ACPI_CAST_PTR(void, tbl_ptr), table_length);
-        return_ACPI_STATUS(AE_OK);
 }
-ACPI_EXPORT_SYMBOL(acpi_get_table)
+ACPI_EXPORT_SYMBOL(acpi_load_tables)
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index da2648bbdbc0..cf8fa514189f 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -48,16 +48,15 @@
 ACPI_MODULE_NAME("tbxfroot")
 /* Local prototypes */
-static acpi_status
-acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags);
 static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length);
+static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
 /*******************************************************************************
 *
 * FUNCTION:    acpi_tb_validate_rsdp
 *
- * PARAMETERS:  Rsdp        - Pointer to unvalidated RSDP
+ * PARAMETERS:  Rsdp                - Pointer to unvalidated RSDP
 *
 * RETURN:      Status
 *
@@ -65,14 +64,18 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length);
 *
 ******************************************************************************/
-acpi_status acpi_tb_validate_rsdp(struct rsdp_descriptor *rsdp)
+static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 {
        ACPI_FUNCTION_ENTRY();
        /*
-         *  The signature and checksum must both be correct
+         * The signature and checksum must both be correct
+         *
+         * Note: Sometimes there exists more than one RSDP in memory; the valid
+         * RSDP has a valid checksum, all others have an invalid checksum.
         */
-        if (ACPI_STRNCMP((char *)rsdp, RSDP_SIG, sizeof(RSDP_SIG) - 1) != 0) {
+        if (ACPI_STRNCMP((char *)rsdp, ACPI_SIG_RSDP, sizeof(ACPI_SIG_RSDP) - 1)
+            != 0) {
                /* Nope, BAD Signature */
@@ -81,14 +84,14 @@ acpi_status acpi_tb_validate_rsdp(struct rsdp_descriptor *rsdp)
        /* Check the standard checksum */
-        if (acpi_tb_sum_table(rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {
+        if (acpi_tb_checksum((u8 *) rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {
                return (AE_BAD_CHECKSUM);
        }
        /* Check extended checksum if table version >= 2 */
        if ((rsdp->revision >= 2) &&
-            (acpi_tb_sum_table(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0)) {
+            (acpi_tb_checksum((u8 *) rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0)) {
                return (AE_BAD_CHECKSUM);
        }
@@ -97,314 +100,123 @@ acpi_status acpi_tb_validate_rsdp(struct rsdp_descriptor *rsdp)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_tb_find_table
+ * FUNCTION:    acpi_tb_find_rsdp
- *
- * PARAMETERS:  Signature           - String with ACPI table signature
- *              oem_id              - String with the table OEM ID
- *              oem_table_id        - String with the OEM Table ID
- *              table_ptr           - Where the table pointer is returned
- *
- * RETURN:      Status
 *
- * DESCRIPTION: Find an ACPI table (in the RSDT/XSDT) that matches the
+ * PARAMETERS:  table_address           - Where the table pointer is returned
- *              Signature, OEM ID and OEM Table ID.
 *
- ******************************************************************************/
+ * RETURN:      Status, RSDP physical address
-acpi_status
-acpi_tb_find_table(char *signature,
-                   char *oem_id,
-                   char *oem_table_id, struct acpi_table_header ** table_ptr)
-{
-        acpi_status status;
-        struct acpi_table_header *table;
-        ACPI_FUNCTION_TRACE(tb_find_table);
-        /* Validate string lengths */
-        if ((ACPI_STRLEN(signature) > ACPI_NAME_SIZE) ||
-            (ACPI_STRLEN(oem_id) > sizeof(table->oem_id)) ||
-            (ACPI_STRLEN(oem_table_id) > sizeof(table->oem_table_id))) {
-                return_ACPI_STATUS(AE_AML_STRING_LIMIT);
-        }
-        if (ACPI_COMPARE_NAME(signature, DSDT_SIG)) {
-                /*
-                 * The DSDT pointer is contained in the FADT, not the RSDT.
-                 * This code should suffice, because the only code that would perform
-                 * a "find" on the DSDT is the data_table_region() AML opcode -- in
-                 * which case, the DSDT is guaranteed to be already loaded.
-                 * If this becomes insufficient, the FADT will have to be found first.
-                 */
-                if (!acpi_gbl_DSDT) {
-                        return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-                }
-                table = acpi_gbl_DSDT;
-        } else {
-                /* Find the table */
-                status = acpi_get_firmware_table(signature, 1,
-                                                 ACPI_LOGICAL_ADDRESSING,
-                                                 &table);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-        /* Check oem_id and oem_table_id */
-        if ((oem_id[0] &&
-             ACPI_STRNCMP(oem_id, table->oem_id,
-                          sizeof(table->oem_id))) ||
-            (oem_table_id[0] &&
-             ACPI_STRNCMP(oem_table_id, table->oem_table_id,
-                          sizeof(table->oem_table_id)))) {
-                return_ACPI_STATUS(AE_AML_NAME_NOT_FOUND);
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_TABLES, "Found table [%4.4s]\n",
-                          table->signature));
-        *table_ptr = table;
-        return_ACPI_STATUS(AE_OK);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_firmware_table
 *
- * PARAMETERS:  Signature       - Any ACPI table signature
+ * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
- *              Instance        - the non zero instance of the table, allows
+ *              pointer structure.  If it is found, set *RSDP to point to it.
- *                                support for multiple tables of the same type
- *              Flags           - Physical/Virtual support
- *              table_pointer   - Where a buffer containing the table is
- *                                returned
 *
- * RETURN:      Status
+ * NOTE1:       The RSDP must be either in the first 1_k of the Extended
+ *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
+ *              Only a 32-bit physical address is necessary.
 *
- * DESCRIPTION: This function is called to get an ACPI table. A buffer is
+ * NOTE2:       This function is always available, regardless of the
- *              allocated for the table and returned in table_pointer.
+ *              initialization state of the rest of ACPI.
- *              This table will be a complete table including the header.
 *
 ******************************************************************************/
-acpi_status
+acpi_status acpi_find_root_pointer(acpi_native_uint * table_address)
-acpi_get_firmware_table(acpi_string signature,
-                        u32 instance,
-                        u32 flags, struct acpi_table_header **table_pointer)
 {
-        acpi_status status;
+        u8 *table_ptr;
-        struct acpi_pointer address;
+        u8 *mem_rover;
-        struct acpi_table_header *header = NULL;
+        u32 physical_address;
-        struct acpi_table_desc *table_info = NULL;
-        struct acpi_table_desc *rsdt_info;
-        u32 table_count;
-        u32 i;
-        u32 j;
-        ACPI_FUNCTION_TRACE(acpi_get_firmware_table);
-        /*
-         * Ensure that at least the table manager is initialized.  We don't
-         * require that the entire ACPI subsystem is up for this interface.
-         * If we have a buffer, we must have a length too
-         */
-        if ((instance == 0) || (!signature) || (!table_pointer)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-        /* Ensure that we have a RSDP */
-        if (!acpi_gbl_RSDP) {
-                /* Get the RSDP */
-                status = acpi_os_get_root_pointer(flags, &address);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "RSDP not found\n"));
-                        return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-                }
-                /* Map and validate the RSDP */
-                if ((flags & ACPI_MEMORY_MODE) == ACPI_LOGICAL_ADDRESSING) {
-                        status = acpi_os_map_memory(address.pointer.physical,
-                                                    sizeof(struct
-                                                           rsdp_descriptor),
-                                                    (void *)&acpi_gbl_RSDP);
-                        if (ACPI_FAILURE(status)) {
-                                return_ACPI_STATUS(status);
-                        }
-                } else {
-                        acpi_gbl_RSDP = address.pointer.logical;
-                }
-                /* The RDSP signature and checksum must both be correct */
-                status = acpi_tb_validate_rsdp(acpi_gbl_RSDP);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-        /* Get the RSDT address via the RSDP */
-        acpi_tb_get_rsdt_address(&address);
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, RSDT physical=%8.8X%8.8X\n",
-                          acpi_gbl_RSDP,
-                          ACPI_FORMAT_UINT64(address.pointer.value)));
-        /* Insert processor_mode flags */
+        ACPI_FUNCTION_TRACE(acpi_find_root_pointer);
-        address.pointer_type |= flags;
+        /* 1a) Get the location of the Extended BIOS Data Area (EBDA) */
-        /* Get and validate the RSDT */
+        table_ptr = acpi_os_map_memory((acpi_physical_address)
+                                       ACPI_EBDA_PTR_LOCATION,
+                                       ACPI_EBDA_PTR_LENGTH);
+        if (!table_ptr) {
+                ACPI_ERROR((AE_INFO,
+                            "Could not map memory at %8.8X for length %X",
+                            ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
-        rsdt_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));
-        if (!rsdt_info) {
                return_ACPI_STATUS(AE_NO_MEMORY);
        }
-        status = acpi_tb_get_table(&address, rsdt_info);
+        ACPI_MOVE_16_TO_32(&physical_address, table_ptr);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-        status = acpi_tb_validate_rsdt(rsdt_info->pointer);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-        /* Allocate a scratch table header and table descriptor */
+        /* Convert segment part to physical address */
-        header = ACPI_ALLOCATE(sizeof(struct acpi_table_header));
+        physical_address <<= 4;
-        if (!header) {
+        acpi_os_unmap_memory(table_ptr, ACPI_EBDA_PTR_LENGTH);
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-        table_info = ACPI_ALLOCATE(sizeof(struct acpi_table_desc));
+        /* EBDA present? */
-        if (!table_info) {
-                status = AE_NO_MEMORY;
-                goto cleanup;
-        }
-        /* Get the number of table pointers within the RSDT */
+        if (physical_address > 0x400) {
-        table_count =
-            acpi_tb_get_table_count(acpi_gbl_RSDP, rsdt_info->pointer);
-        address.pointer_type = acpi_gbl_table_flags | flags;
-        /*
-         * Search the RSDT/XSDT for the correct instance of the
-         * requested table
-         */
-        for (i = 0, j = 0; i < table_count; i++) {
                /*
-                 * Get the next table pointer, handle RSDT vs. XSDT
+                 * 1b) Search EBDA paragraphs (EBDA is required to be a
-                 * RSDT pointers are 32 bits, XSDT pointers are 64 bits
+                 *     minimum of 1_k length)
                 */
-                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
+                table_ptr = acpi_os_map_memory((acpi_native_uint)
-                        address.pointer.value =
+                                               physical_address,
-                            (ACPI_CAST_PTR
+                                               ACPI_EBDA_WINDOW_SIZE);
-                             (struct rsdt_descriptor,
+                if (!table_ptr) {
-                              rsdt_info->pointer))->table_offset_entry[i];
+                        ACPI_ERROR((AE_INFO,
-                } else {
+                                    "Could not map memory at %8.8X for length %X",
-                        address.pointer.value =
+                                    physical_address, ACPI_EBDA_WINDOW_SIZE));
-                            (ACPI_CAST_PTR
-                             (struct xsdt_descriptor,
-                              rsdt_info->pointer))->table_offset_entry[i];
-                }
-                /* Get the table header */
-                status = acpi_tb_get_table_header(&address, header);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
                }
-                /* Compare table signatures and table instance */
+                mem_rover =
+                    acpi_tb_scan_memory_for_rsdp(table_ptr,
-                if (ACPI_COMPARE_NAME(header->signature, signature)) {
+                                                 ACPI_EBDA_WINDOW_SIZE);
+                acpi_os_unmap_memory(table_ptr, ACPI_EBDA_WINDOW_SIZE);
-                        /* An instance of the table was found */
-                        j++;
+                if (mem_rover) {
-                        if (j >= instance) {
-                                /* Found the correct instance, get the entire table */
+                        /* Return the physical address */
-                                status =
+                        physical_address +=
-                                    acpi_tb_get_table_body(&address, header,
+                            (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
-                                                           table_info);
-                                if (ACPI_FAILURE(status)) {
-                                        goto cleanup;
-                                }
-                                *table_pointer = table_info->pointer;
+                        *table_address = physical_address;
-                                goto cleanup;
+                        return_ACPI_STATUS(AE_OK);
-                        }
                }
        }
-        /* Did not find the table */
+        /*
+         * 2) Search upper memory: 16-byte boundaries in E0000h-FFFFFh
+         */
+        table_ptr = acpi_os_map_memory((acpi_physical_address)
+                                       ACPI_HI_RSDP_WINDOW_BASE,
+                                       ACPI_HI_RSDP_WINDOW_SIZE);
-        status = AE_NOT_EXIST;
+        if (!table_ptr) {
+                ACPI_ERROR((AE_INFO,
+                            "Could not map memory at %8.8X for length %X",
+                            ACPI_HI_RSDP_WINDOW_BASE,
+                            ACPI_HI_RSDP_WINDOW_SIZE));
-      cleanup:
+                return_ACPI_STATUS(AE_NO_MEMORY);
-        if (rsdt_info->pointer) {
-                acpi_os_unmap_memory(rsdt_info->pointer,
-                                     (acpi_size) rsdt_info->pointer->length);
        }
-        ACPI_FREE(rsdt_info);
-        if (header) {
+        mem_rover =
-                ACPI_FREE(header);
+            acpi_tb_scan_memory_for_rsdp(table_ptr, ACPI_HI_RSDP_WINDOW_SIZE);
-        }
+        acpi_os_unmap_memory(table_ptr, ACPI_HI_RSDP_WINDOW_SIZE);
-        if (table_info) {
-                ACPI_FREE(table_info);
-        }
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_get_firmware_table)
+        if (mem_rover) {
-/* TBD: Move to a new file */
+                /* Return the physical address */
-#if ACPI_MACHINE_WIDTH != 16
-/*******************************************************************************
- *
- * FUNCTION:    acpi_find_root_pointer
- *
- * PARAMETERS:  Flags                   - Logical/Physical addressing
- *              rsdp_address            - Where to place the RSDP address
- *
- * RETURN:      Status, Physical address of the RSDP
- *
- * DESCRIPTION: Find the RSDP
- *
- ******************************************************************************/
-acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
-{
-        struct acpi_table_desc table_info;
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(acpi_find_root_pointer);
-        /* Get the RSDP */
-        status = acpi_tb_find_rsdp(&table_info, flags);
+                physical_address = (u32)
-        if (ACPI_FAILURE(status)) {
+                    (ACPI_HI_RSDP_WINDOW_BASE +
-                ACPI_EXCEPTION((AE_INFO, status,
+                     ACPI_PTR_DIFF(mem_rover, table_ptr));
-                                "RSDP structure not found - Flags=%X", flags));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
+                *table_address = physical_address;
+                return_ACPI_STATUS(AE_OK);
        }
-        rsdp_address->pointer_type = ACPI_PHYSICAL_POINTER;
+        /* A valid RSDP was not found */
-        rsdp_address->pointer.physical = table_info.physical_address;
-        return_ACPI_STATUS(AE_OK);
+        ACPI_ERROR((AE_INFO, "A valid RSDP was not found"));
+        return_ACPI_STATUS(AE_NOT_FOUND);
 }
 ACPI_EXPORT_SYMBOL(acpi_find_root_pointer)
@@ -440,7 +252,7 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
                status =
                    acpi_tb_validate_rsdp(ACPI_CAST_PTR
-                                          (struct rsdp_descriptor, mem_rover));
+                                          (struct acpi_table_rsdp, mem_rover));
                if (ACPI_SUCCESS(status)) {
                        /* Sig and checksum valid, we have found a real RSDP */
@@ -461,189 +273,3 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
                          start_address));
        return_PTR(NULL);
 }
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_find_rsdp
- *
- * PARAMETERS:  table_info              - Where the table info is returned
- *              Flags                   - Current memory mode (logical vs.
- *                                        physical addressing)
- *
- * RETURN:      Status, RSDP physical address
- *
- * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
- *              pointer structure.  If it is found, set *RSDP to point to it.
- *
- *              NOTE1: The RSDP must be either in the first 1_k of the Extended
- *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
- *              Only a 32-bit physical address is necessary.
- *
- *              NOTE2: This function is always available, regardless of the
- *              initialization state of the rest of ACPI.
- *
- ******************************************************************************/
-static acpi_status
-acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
-{
-        u8 *table_ptr;
-        u8 *mem_rover;
-        u32 physical_address;
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(tb_find_rsdp);
-        /*
-         * Scan supports either logical addressing or physical addressing
-         */
-        if ((flags & ACPI_MEMORY_MODE) == ACPI_LOGICAL_ADDRESSING) {
-                /* 1a) Get the location of the Extended BIOS Data Area (EBDA) */
-                status = acpi_os_map_memory((acpi_physical_address)
-                                            ACPI_EBDA_PTR_LOCATION,
-                                            ACPI_EBDA_PTR_LENGTH,
-                                            (void *)&table_ptr);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not map memory at %8.8X for length %X",
-                                    ACPI_EBDA_PTR_LOCATION,
-                                    ACPI_EBDA_PTR_LENGTH));
-                        return_ACPI_STATUS(status);
-                }
-                ACPI_MOVE_16_TO_32(&physical_address, table_ptr);
-                /* Convert segment part to physical address */
-                physical_address <<= 4;
-                acpi_os_unmap_memory(table_ptr, ACPI_EBDA_PTR_LENGTH);
-                /* EBDA present? */
-                if (physical_address > 0x400) {
-                        /*
-                         * 1b) Search EBDA paragraphs (EBDA is required to be a
-                         *     minimum of 1_k length)
-                         */
-                        status = acpi_os_map_memory((acpi_physical_address)
-                                                    physical_address,
-                                                    ACPI_EBDA_WINDOW_SIZE,
-                                                    (void *)&table_ptr);
-                        if (ACPI_FAILURE(status)) {
-                                ACPI_ERROR((AE_INFO,
-                                            "Could not map memory at %8.8X for length %X",
-                                            physical_address,
-                                            ACPI_EBDA_WINDOW_SIZE));
-                                return_ACPI_STATUS(status);
-                        }
-                        mem_rover = acpi_tb_scan_memory_for_rsdp(table_ptr,
-                                                                 ACPI_EBDA_WINDOW_SIZE);
-                        acpi_os_unmap_memory(table_ptr, ACPI_EBDA_WINDOW_SIZE);
-                        if (mem_rover) {
-                                /* Return the physical address */
-                                physical_address +=
-                                    (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
-                                table_info->physical_address =
-                                    (acpi_physical_address) physical_address;
-                                return_ACPI_STATUS(AE_OK);
-                        }
-                }
-                /*
-                 * 2) Search upper memory: 16-byte boundaries in E0000h-FFFFFh
-                 */
-                status = acpi_os_map_memory((acpi_physical_address)
-                                            ACPI_HI_RSDP_WINDOW_BASE,
-                                            ACPI_HI_RSDP_WINDOW_SIZE,
-                                            (void *)&table_ptr);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not map memory at %8.8X for length %X",
-                                    ACPI_HI_RSDP_WINDOW_BASE,
-                                    ACPI_HI_RSDP_WINDOW_SIZE));
-                        return_ACPI_STATUS(status);
-                }
-                mem_rover =
-                    acpi_tb_scan_memory_for_rsdp(table_ptr,
-                                                 ACPI_HI_RSDP_WINDOW_SIZE);
-                acpi_os_unmap_memory(table_ptr, ACPI_HI_RSDP_WINDOW_SIZE);
-                if (mem_rover) {
-                        /* Return the physical address */
-                        physical_address = (u32)
-                            (ACPI_HI_RSDP_WINDOW_BASE +
-                             ACPI_PTR_DIFF(mem_rover, table_ptr));
-                        table_info->physical_address =
-                            (acpi_physical_address) physical_address;
-                        return_ACPI_STATUS(AE_OK);
-                }
-        }
-        /*
-         * Physical addressing
-         */
-        else {
-                /* 1a) Get the location of the EBDA */
-                ACPI_MOVE_16_TO_32(&physical_address, ACPI_EBDA_PTR_LOCATION);
-                physical_address <<= 4; /* Convert segment to physical address */
-                /* EBDA present? */
-                if (physical_address > 0x400) {
-                        /*
-                         * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of
-                         *     1_k length)
-                         */
-                        mem_rover =
-                            acpi_tb_scan_memory_for_rsdp(ACPI_PHYSADDR_TO_PTR
-                                                         (physical_address),
-                                                         ACPI_EBDA_WINDOW_SIZE);
-                        if (mem_rover) {
-                                /* Return the physical address */
-                                table_info->physical_address =
-                                    ACPI_TO_INTEGER(mem_rover);
-                                return_ACPI_STATUS(AE_OK);
-                        }
-                }
-                /* 2) Search upper memory: 16-byte boundaries in E0000h-FFFFFh */
-                mem_rover =
-                    acpi_tb_scan_memory_for_rsdp(ACPI_PHYSADDR_TO_PTR
-                                                 (ACPI_HI_RSDP_WINDOW_BASE),
-                                                 ACPI_HI_RSDP_WINDOW_SIZE);
-                if (mem_rover) {
-                        /* Found it, return the physical address */
-                        table_info->physical_address =
-                            ACPI_TO_INTEGER(mem_rover);
-                        return_ACPI_STATUS(AE_OK);
-                }
-        }
-        /* A valid RSDP was not found */
-        ACPI_ERROR((AE_INFO, "No valid RSDP was found"));
-        return_ACPI_STATUS(AE_NOT_FOUND);
-}
-#endif
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 3650654f878e..f76d3168c2b2 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -663,7 +663,7 @@ static void acpi_thermal_run(unsigned long data)
 static void acpi_thermal_check(void *data)
 {
        int result = 0;
-        struct acpi_thermal *tz = (struct acpi_thermal *)data;
+        struct acpi_thermal *tz = data;
        unsigned long sleep_time = 0;
        int i = 0;
        struct acpi_thermal_state state;
@@ -778,7 +778,7 @@ static struct proc_dir_entry *acpi_thermal_dir;
 static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
        if (!tz)
@@ -813,7 +813,7 @@ static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)
 static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
 {
        int result = 0;
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
        if (!tz)
@@ -837,7 +837,7 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
 static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
        int i = 0;
        int j = 0;
@@ -893,8 +893,8 @@ acpi_thermal_write_trip_points(struct file *file,
                               const char __user * buffer,
                               size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct acpi_thermal *tz = m->private;
        char *limit_string;
        int num, critical, hot, passive;
@@ -902,12 +902,10 @@ acpi_thermal_write_trip_points(struct file *file,
        int i = 0;
-        limit_string = kmalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
+        limit_string = kzalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
        if (!limit_string)
                return -ENOMEM;
-        memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);
        active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
        if (!active) {
                kfree(limit_string);
@@ -953,7 +951,7 @@ acpi_thermal_write_trip_points(struct file *file,
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
        if (!tz)
@@ -984,8 +982,8 @@ acpi_thermal_write_cooling_mode(struct file *file,
                                const char __user * buffer,
                                size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct acpi_thermal *tz = m->private;
        int result = 0;
        char mode_string[12] = { '\0' };
@@ -1014,7 +1012,7 @@ acpi_thermal_write_cooling_mode(struct file *file,
 static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
        if (!tz)
@@ -1043,8 +1041,8 @@ acpi_thermal_write_polling(struct file *file,
                           const char __user * buffer,
                           size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct acpi_thermal *tz = m->private;
        int result = 0;
        char polling_string[12] = { '\0' };
        int seconds = 0;
@@ -1170,7 +1168,7 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
 static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)data;
+        struct acpi_thermal *tz = data;
        struct acpi_device *device = NULL;
@@ -1271,10 +1269,9 @@ static int acpi_thermal_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        tz = kmalloc(sizeof(struct acpi_thermal), GFP_KERNEL);
+        tz = kzalloc(sizeof(struct acpi_thermal), GFP_KERNEL);
        if (!tz)
                return -ENOMEM;
-        memset(tz, 0, sizeof(struct acpi_thermal));
        tz->device = device;
        strcpy(tz->name, device->pnp.bus_id);
@@ -1324,7 +1321,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        tz = (struct acpi_thermal *)acpi_driver_data(device);
+        tz = acpi_driver_data(device);
        /* avoid timer adding new defer task */
        tz->zombie = 1;
@@ -1364,7 +1361,7 @@ static int acpi_thermal_resume(struct acpi_device *device)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        tz = (struct acpi_thermal *)acpi_driver_data(device);
+        tz = acpi_driver_data(device);
        acpi_thermal_get_temperature(tz);
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 7fe0b7ae9733..d9b651ffcdc0 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -41,6 +41,8 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_drivers.h>
@@ -210,6 +212,7 @@ static acpi_status hci_read1(u32 reg, u32 * out1, u32 * result)
 }
 static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;
+static struct backlight_device *toshiba_backlight_device;
 static int force_fan;
 static int last_key_event;
 static int key_event_valid;
@@ -271,14 +274,23 @@ dispatch_write(struct file *file, const char __user * buffer,
        return result;
 }
-static char *read_lcd(char *p)
+static int get_lcd(struct backlight_device *bd)
 {
        u32 hci_result;
        u32 value;
        hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result);
        if (hci_result == HCI_SUCCESS) {
-                value = value >> HCI_LCD_BRIGHTNESS_SHIFT;
+                return (value >> HCI_LCD_BRIGHTNESS_SHIFT);
+        } else
+                return -EFAULT;
+}
+static char *read_lcd(char *p)
+{
+        int value = get_lcd(NULL);
+        if (value >= 0) {
                p += sprintf(p, "brightness:              %d\n", value);
                p += sprintf(p, "brightness_levels:       %d\n",
                             HCI_LCD_BRIGHTNESS_LEVELS);
@@ -289,22 +301,37 @@ static char *read_lcd(char *p)
        return p;
 }
+static int set_lcd(int value)
+{
+        u32 hci_result;
+        value = value << HCI_LCD_BRIGHTNESS_SHIFT;
+        hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result);
+        if (hci_result != HCI_SUCCESS)
+                return -EFAULT;
+        return 0;
+}
+static int set_lcd_status(struct backlight_device *bd)
+{
+        return set_lcd(bd->props->brightness);
+}
 static unsigned long write_lcd(const char *buffer, unsigned long count)
 {
        int value;
-        u32 hci_result;
+        int ret;
        if (sscanf(buffer, " brightness : %i", &value) == 1 &&
            value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) {
-                value = value << HCI_LCD_BRIGHTNESS_SHIFT;
+                ret = set_lcd(value);
-                hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result);
+                if (ret == 0)
-                if (hci_result != HCI_SUCCESS)
+                        ret = count;
-                        return -EFAULT;
        } else {
-                return -EINVAL;
+                ret = -EINVAL;
        }
+        return ret;
-        return count;
 }
 static char *read_video(char *p)
@@ -506,6 +533,26 @@ static acpi_status __exit remove_device(void)
        return AE_OK;
 }
+static struct backlight_properties toshiba_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = get_lcd,
+        .update_status  = set_lcd_status,
+        .max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1,
+};
+static void __exit toshiba_acpi_exit(void)
+{
+        if (toshiba_backlight_device)
+                backlight_device_unregister(toshiba_backlight_device);
+        remove_device();
+        if (toshiba_proc_dir)
+                remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
+        return;
+}
 static int __init toshiba_acpi_init(void)
 {
        acpi_status status = AE_OK;
@@ -546,17 +593,16 @@ static int __init toshiba_acpi_init(void)
                        remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
        }
-        return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;
+        toshiba_backlight_device = backlight_device_register("toshiba",NULL,
-}
+                                                NULL,
+                                                &toshiba_backlight_data);
-static void __exit toshiba_acpi_exit(void)
+        if (IS_ERR(toshiba_backlight_device)) {
-{
+                printk(KERN_ERR "Could not register toshiba backlight device\n");
-        remove_device();
+                toshiba_backlight_device = NULL;
+                toshiba_acpi_exit();
-        if (toshiba_proc_dir)
+        }
-                remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
-        return;
+        return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;
 }
 module_init(toshiba_acpi_init);
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index f6cbc0b1bfd0..55a764807499 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
 */
 #include <acpi/acpi.h>
+#include <acpi/acdebug.h>
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utalloc")
@@ -142,6 +143,14 @@ acpi_status acpi_ut_create_caches(void)
 acpi_status acpi_ut_delete_caches(void)
 {
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+        char buffer[7];
+        if (acpi_gbl_display_final_mem_stats) {
+                ACPI_STRCPY(buffer, "MEMORY");
+                acpi_db_display_statistics(buffer);
+        }
+#endif
        (void)acpi_os_delete_cache(acpi_gbl_namespace_cache);
        acpi_gbl_namespace_cache = NULL;
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 1a1f8109159c..870f6edeb5f2 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -289,6 +289,14 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
                ACPI_MEM_TRACKING(cache->total_allocated++);
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+                if ((cache->total_allocated - cache->total_freed) >
+                    cache->max_occupied) {
+                        cache->max_occupied =
+                            cache->total_allocated - cache->total_freed;
+                }
+#endif
                /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 5e1a80d1bc36..84d529db0a66 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -719,6 +719,15 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                acpi_ut_add_reference(source_desc->reference.object);
                break;
+        case ACPI_TYPE_REGION:
+                /*
+                 * We copied the Region Handler, so we now must add a reference
+                 */
+                if (dest_desc->region.handler) {
+                        acpi_ut_add_reference(dest_desc->region.handler);
+                }
+                break;
        default:
                /* Nothing to do for other simple objects */
                break;
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index bb1eaf9aa653..61ad4f2daee2 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -180,8 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
        if (thread_id != acpi_gbl_prev_thread_id) {
                if (ACPI_LV_THREADS & acpi_dbg_level) {
                        acpi_os_printf
-                            ("\n**** Context Switch from TID %X to TID %X ****\n\n",
+                            ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
-                             (u32) acpi_gbl_prev_thread_id, (u32) thread_id);
+                             (unsigned long)acpi_gbl_prev_thread_id, (unsigned long)thread_id);
                }
                acpi_gbl_prev_thread_id = thread_id;
@@ -194,7 +194,7 @@ acpi_ut_debug_print(u32 requested_debug_level,
        acpi_os_printf("%8s-%04ld ", module_name, line_number);
        if (ACPI_LV_THREADS & acpi_dbg_level) {
-                acpi_os_printf("[%04lX] ", thread_id);
+                acpi_os_printf("[%04lX] ", (unsigned long)thread_id);
        }
        acpi_os_printf("[%02ld] %-22.22s: ",
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 9d3f1149ba21..f777cebdc46d 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -158,16 +158,20 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                                  "***** Mutex %p, OS Mutex %p\n",
                                  object, object->mutex.os_mutex));
-                if (object->mutex.os_mutex != ACPI_GLOBAL_LOCK) {
+                if (object->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
-                        acpi_ex_unlink_mutex(object);
-                        acpi_os_delete_mutex(object->mutex.os_mutex);
+                        /* Global Lock has extra semaphore */
-                } else {
-                        /* Global Lock "mutex" is actually a counting semaphore */
                        (void)
                            acpi_os_delete_semaphore
                            (acpi_gbl_global_lock_semaphore);
                        acpi_gbl_global_lock_semaphore = NULL;
+                        acpi_os_delete_mutex(object->mutex.os_mutex);
+                        acpi_gbl_global_lock_mutex = NULL;
+                } else {
+                        acpi_ex_unlink_mutex(object);
+                        acpi_os_delete_mutex(object->mutex.os_mutex);
                }
                break;
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index d6d7121583c0..13d5879cd98b 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 014030af8b50..af33358a964b 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -46,89 +46,9 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
+ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 #define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utglobal")
+    ACPI_MODULE_NAME("utglobal")
-/*******************************************************************************
- *
- * 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.
- *
- ******************************************************************************/
-const char *acpi_format_exception(acpi_status status)
-{
-        acpi_status sub_status;
-        const char *exception = NULL;
-        ACPI_FUNCTION_ENTRY();
-        /*
-         * Status is composed of two parts, a "type" and an actual code
-         */
-        sub_status = (status & ~AE_CODE_MASK);
-        switch (status & AE_CODE_MASK) {
-        case AE_CODE_ENVIRONMENTAL:
-                if (sub_status <= AE_CODE_ENV_MAX) {
-                        exception = acpi_gbl_exception_names_env[sub_status];
-                }
-                break;
-        case AE_CODE_PROGRAMMER:
-                if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_pgm[sub_status - 1];
-                }
-                break;
-        case AE_CODE_ACPI_TABLES:
-                if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_tbl[sub_status - 1];
-                }
-                break;
-        case AE_CODE_AML:
-                if (sub_status <= AE_CODE_AML_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_aml[sub_status - 1];
-                }
-                break;
-        case AE_CODE_CONTROL:
-                if (sub_status <= AE_CODE_CTRL_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_ctrl[sub_status - 1];
-                }
-                break;
-        default:
-                break;
-        }
-        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));
-}
 /*******************************************************************************
 *
@@ -163,8 +83,6 @@ u32 acpi_gbl_startup_flags = 0;
 u8 acpi_gbl_shutdown = TRUE;
-const u8 acpi_gbl_decode_to8bit[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
 const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {
        "\\_S0_",
        "\\_S1_",
@@ -183,10 +101,45 @@ const char *acpi_gbl_highest_dstate_names[4] = {
 /*******************************************************************************
 *
- * Namespace globals
+ * 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)
+/*******************************************************************************
+ *
+ * Namespace globals
+ *
+ ******************************************************************************/
 /*
 * Predefined ACPI Names (Built-in to the Interpreter)
 *
@@ -280,53 +233,6 @@ char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)
        return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
 }
-/*******************************************************************************
- *
- * Table name globals
- *
- * NOTE: This table includes ONLY the ACPI tables that the subsystem consumes.
- * it is NOT an exhaustive list of all possible ACPI tables.  All ACPI tables
- * that are not used by the subsystem are simply ignored.
- *
- * Do NOT add any table to this list that is not consumed directly by this
- * subsystem (No MADT, ECDT, SBST, etc.)
- *
- ******************************************************************************/
-struct acpi_table_list acpi_gbl_table_lists[ACPI_TABLE_ID_MAX + 1];
-struct acpi_table_support acpi_gbl_table_data[ACPI_TABLE_ID_MAX + 1] = {
-        /***********    Name,   Signature, Global typed pointer     Signature size,      Type                  How many allowed?,    Contains valid AML? */
-        /* RSDP 0 */ {RSDP_NAME, RSDP_SIG, NULL, sizeof(RSDP_SIG) - 1,
-                      ACPI_TABLE_ROOT | ACPI_TABLE_SINGLE}
-        ,
-        /* DSDT 1 */ {DSDT_SIG, DSDT_SIG, (void *)&acpi_gbl_DSDT,
-                      sizeof(DSDT_SIG) - 1,
-                      ACPI_TABLE_SECONDARY | ACPI_TABLE_SINGLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* FADT 2 */ {FADT_SIG, FADT_SIG, (void *)&acpi_gbl_FADT,
-                      sizeof(FADT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_SINGLE}
-        ,
-        /* FACS 3 */ {FACS_SIG, FACS_SIG, (void *)&acpi_gbl_FACS,
-                      sizeof(FACS_SIG) - 1,
-                      ACPI_TABLE_SECONDARY | ACPI_TABLE_SINGLE}
-        ,
-        /* PSDT 4 */ {PSDT_SIG, PSDT_SIG, NULL, sizeof(PSDT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_MULTIPLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* SSDT 5 */ {SSDT_SIG, SSDT_SIG, NULL, sizeof(SSDT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_MULTIPLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* XSDT 6 */ {XSDT_SIG, XSDT_SIG, NULL, sizeof(RSDT_SIG) - 1,
-                      ACPI_TABLE_ROOT | ACPI_TABLE_SINGLE}
-        ,
-};
 /******************************************************************************
 *
 * Event and Hardware globals
@@ -612,7 +518,7 @@ char *acpi_ut_get_node_name(void *object)
        /* 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.integer);
+                node->name.integer = acpi_ut_repair_name(node->name.ascii);
        }
        /* Return the name */
@@ -751,13 +657,6 @@ void acpi_ut_init_globals(void)
                return;
        }
-        /* ACPI table structure */
-        for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
-                acpi_gbl_table_lists[i].next = NULL;
-                acpi_gbl_table_lists[i].count = 0;
-        }
        /* Mutex locked flags */
        for (i = 0; i < ACPI_NUM_MUTEX; i++) {
@@ -773,6 +672,7 @@ void acpi_ut_init_globals(void)
        /* GPE support */
+        acpi_gpe_count = 0;
        acpi_gbl_gpe_xrupt_list_head = NULL;
        acpi_gbl_gpe_fadt_blocks[0] = NULL;
        acpi_gbl_gpe_fadt_blocks[1] = NULL;
@@ -784,25 +684,15 @@ void acpi_ut_init_globals(void)
        acpi_gbl_exception_handler = NULL;
        acpi_gbl_init_handler = NULL;
-        /* Global "typed" ACPI table pointers */
-        acpi_gbl_RSDP = NULL;
-        acpi_gbl_XSDT = NULL;
-        acpi_gbl_FACS = NULL;
-        acpi_gbl_FADT = NULL;
-        acpi_gbl_DSDT = NULL;
        /* Global Lock support */
        acpi_gbl_global_lock_semaphore = NULL;
+        acpi_gbl_global_lock_mutex = NULL;
        acpi_gbl_global_lock_acquired = FALSE;
-        acpi_gbl_global_lock_thread_count = 0;
        acpi_gbl_global_lock_handle = 0;
        /* Miscellaneous variables */
-        acpi_gbl_table_flags = ACPI_PHYSICAL_POINTER;
-        acpi_gbl_rsdp_original_location = 0;
        acpi_gbl_cm_single_step = FALSE;
        acpi_gbl_db_terminate_threads = FALSE;
        acpi_gbl_shutdown = FALSE;
@@ -837,8 +727,13 @@ void acpi_ut_init_globals(void)
        acpi_gbl_lowest_stack_pointer = ACPI_SIZE_MAX;
 #endif
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+        acpi_gbl_display_final_mem_stats = FALSE;
+#endif
        return_VOID;
 }
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+ACPI_EXPORT_SYMBOL(acpi_gpe_count)
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index ff76055eb7d6..ad3c0d0a5cf8 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,119 +44,14 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
+#include <acpi/actables.h>
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utinit")
 /* Local prototypes */
-static void
-acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset);
 static void acpi_ut_terminate(void);
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_fadt_register_error
- *
- * PARAMETERS:  register_name           - Pointer to string identifying register
- *              Value                   - Actual register contents value
- *              Offset                  - Byte offset in the FADT
- *
- * RETURN:      AE_BAD_VALUE
- *
- * DESCRIPTION: Display failure message
- *
- ******************************************************************************/
-static void
-acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset)
-{
-        ACPI_WARNING((AE_INFO,
-                      "Invalid FADT value %s=%X at offset %X FADT=%p",
-                      register_name, value, offset, acpi_gbl_FADT));
-}
-/******************************************************************************
- *
- * FUNCTION:    acpi_ut_validate_fadt
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Validate various ACPI registers in the FADT
- *
- ******************************************************************************/
-acpi_status acpi_ut_validate_fadt(void)
-{
-        /*
-         * Verify Fixed ACPI Description Table fields,
-         * but don't abort on any problems, just display error
-         */
-        if (acpi_gbl_FADT->pm1_evt_len < 4) {
-                acpi_ut_fadt_register_error("PM1_EVT_LEN",
-                                            (u32) acpi_gbl_FADT->pm1_evt_len,
-                                            ACPI_FADT_OFFSET(pm1_evt_len));
-        }
-        if (!acpi_gbl_FADT->pm1_cnt_len) {
-                acpi_ut_fadt_register_error("PM1_CNT_LEN", 0,
-                                            ACPI_FADT_OFFSET(pm1_cnt_len));
-        }
-        if (!acpi_gbl_FADT->xpm1a_evt_blk.address) {
-                acpi_ut_fadt_register_error("X_PM1a_EVT_BLK", 0,
-                                            ACPI_FADT_OFFSET(xpm1a_evt_blk.
-                                                             address));
-        }
-        if (!acpi_gbl_FADT->xpm1a_cnt_blk.address) {
-                acpi_ut_fadt_register_error("X_PM1a_CNT_BLK", 0,
-                                            ACPI_FADT_OFFSET(xpm1a_cnt_blk.
-                                                             address));
-        }
-        if (!acpi_gbl_FADT->xpm_tmr_blk.address) {
-                acpi_ut_fadt_register_error("X_PM_TMR_BLK", 0,
-                                            ACPI_FADT_OFFSET(xpm_tmr_blk.
-                                                             address));
-        }
-        if ((acpi_gbl_FADT->xpm2_cnt_blk.address &&
-             !acpi_gbl_FADT->pm2_cnt_len)) {
-                acpi_ut_fadt_register_error("PM2_CNT_LEN",
-                                            (u32) acpi_gbl_FADT->pm2_cnt_len,
-                                            ACPI_FADT_OFFSET(pm2_cnt_len));
-        }
-        if (acpi_gbl_FADT->pm_tm_len < 4) {
-                acpi_ut_fadt_register_error("PM_TM_LEN",
-                                            (u32) acpi_gbl_FADT->pm_tm_len,
-                                            ACPI_FADT_OFFSET(pm_tm_len));
-        }
-        /* Length of GPE blocks must be a multiple of 2 */
-        if (acpi_gbl_FADT->xgpe0_blk.address &&
-            (acpi_gbl_FADT->gpe0_blk_len & 1)) {
-                acpi_ut_fadt_register_error("(x)GPE0_BLK_LEN",
-                                            (u32) acpi_gbl_FADT->gpe0_blk_len,
-                                            ACPI_FADT_OFFSET(gpe0_blk_len));
-        }
-        if (acpi_gbl_FADT->xgpe1_blk.address &&
-            (acpi_gbl_FADT->gpe1_blk_len & 1)) {
-                acpi_ut_fadt_register_error("(x)GPE1_BLK_LEN",
-                                            (u32) acpi_gbl_FADT->gpe1_blk_len,
-                                            ACPI_FADT_OFFSET(gpe1_blk_len));
-        }
-        return (AE_OK);
-}
 /******************************************************************************
 *
 * FUNCTION:    acpi_ut_terminate
@@ -178,7 +73,6 @@ static void acpi_ut_terminate(void)
        ACPI_FUNCTION_TRACE(ut_terminate);
-        /* Free global tables, etc. */
        /* Free global GPE blocks and related info structures */
        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
@@ -239,6 +133,10 @@ void acpi_ut_subsystem_shutdown(void)
        acpi_ns_terminate();
+        /* Delete the ACPI tables */
+        acpi_tb_terminate();
        /* Close the globals */
        acpi_ut_terminate();
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 19d74bedce27..0c56a0d20b29 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 6d8a8211be90..50133fffe420 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,78 @@ ACPI_MODULE_NAME("utmisc")
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_ut_validate_exception
+ *
+ * PARAMETERS:  Status       - The acpi_status code to be formatted
+ *
+ * RETURN:      A string containing the exception text. NULL if exception is
+ *              not valid.
+ *
+ * DESCRIPTION: This function validates and translates an ACPI exception into
+ *              an ASCII string.
+ *
+ ******************************************************************************/
+const char *acpi_ut_validate_exception(acpi_status status)
+{
+        acpi_status sub_status;
+        const char *exception = NULL;
+        ACPI_FUNCTION_ENTRY();
+        /*
+         * Status is composed of two parts, a "type" and an actual code
+         */
+        sub_status = (status & ~AE_CODE_MASK);
+        switch (status & AE_CODE_MASK) {
+        case AE_CODE_ENVIRONMENTAL:
+                if (sub_status <= AE_CODE_ENV_MAX) {
+                        exception = acpi_gbl_exception_names_env[sub_status];
+                }
+                break;
+        case AE_CODE_PROGRAMMER:
+                if (sub_status <= AE_CODE_PGM_MAX) {
+                        exception =
+                            acpi_gbl_exception_names_pgm[sub_status - 1];
+                }
+                break;
+        case AE_CODE_ACPI_TABLES:
+                if (sub_status <= AE_CODE_TBL_MAX) {
+                        exception =
+                            acpi_gbl_exception_names_tbl[sub_status - 1];
+                }
+                break;
+        case AE_CODE_AML:
+                if (sub_status <= AE_CODE_AML_MAX) {
+                        exception =
+                            acpi_gbl_exception_names_aml[sub_status - 1];
+                }
+                break;
+        case AE_CODE_CONTROL:
+                if (sub_status <= AE_CODE_CTRL_MAX) {
+                        exception =
+                            acpi_gbl_exception_names_ctrl[sub_status - 1];
+                }
+                break;
+        default:
+                break;
+        }
+        return (ACPI_CAST_PTR(const char, exception));
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ut_is_aml_table
 *
 * PARAMETERS:  Table               - An ACPI table
@@ -62,14 +134,15 @@ ACPI_MODULE_NAME("utmisc")
 *              data tables that do not contain AML code.
 *
 ******************************************************************************/
 u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
 {
        /* These are the only tables that contain executable AML */
-        if (ACPI_COMPARE_NAME(table->signature, DSDT_SIG) ||
+        if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) ||
-            ACPI_COMPARE_NAME(table->signature, PSDT_SIG) ||
+            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_PSDT) ||
-            ACPI_COMPARE_NAME(table->signature, SSDT_SIG)) {
+            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT)) {
                return (TRUE);
        }
@@ -418,7 +491,7 @@ u32 acpi_ut_dword_byte_swap(u32 value)
 void acpi_ut_set_integer_width(u8 revision)
 {
-        if (revision <= 1) {
+        if (revision < 2) {
                /* 32-bit case */
@@ -582,26 +655,25 @@ u8 acpi_ut_valid_acpi_name(u32 name)
 *
 ******************************************************************************/
-acpi_name acpi_ut_repair_name(acpi_name name)
+acpi_name acpi_ut_repair_name(char *name)
 {
-        char *name_ptr = ACPI_CAST_PTR(char, &name);
-        char new_name[ACPI_NAME_SIZE];
        acpi_native_uint i;
+        char new_name[ACPI_NAME_SIZE];
        for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                new_name[i] = name_ptr[i];
+                new_name[i] = name[i];
                /*
                 * Replace a bad character with something printable, yet technically
                 * still invalid. This prevents any collisions with existing "good"
                 * names in the namespace.
                 */
-                if (!acpi_ut_valid_acpi_char(name_ptr[i], i)) {
+                if (!acpi_ut_valid_acpi_char(name[i], i)) {
                        new_name[i] = '*';
                }
        }
-        return (*ACPI_CAST_PTR(u32, new_name));
+        return (*(u32 *) new_name);
 }
 /*******************************************************************************
@@ -996,9 +1068,13 @@ acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
 {
        va_list args;
-        acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);
+        /*
+         * Removed module_name, line_number, and acpica version, not needed
+         * for info output
+         */
+        acpi_os_printf("ACPI: ");
        va_start(args, format);
        acpi_os_vprintf(format, args);
-        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+        acpi_os_printf("\n");
 }
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index c39062a047cd..cbad2ef5987d 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -243,23 +243,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 #endif
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                          "Thread %X attempting to acquire Mutex [%s]\n",
+                          "Thread %lX attempting to acquire Mutex [%s]\n",
-                          (u32) this_thread_id, acpi_ut_get_mutex_name(mutex_id)));
+                          (unsigned long) this_thread_id,
+                          acpi_ut_get_mutex_name(mutex_id)));
        status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,
                                       ACPI_WAIT_FOREVER);
        if (ACPI_SUCCESS(status)) {
                ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                                  "Thread %X acquired Mutex [%s]\n",
+                                  "Thread %lX acquired Mutex [%s]\n",
-                                  (u32) this_thread_id,
+                                  (unsigned long) this_thread_id,
                                  acpi_ut_get_mutex_name(mutex_id)));
                acpi_gbl_mutex_info[mutex_id].use_count++;
                acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
        } else {
                ACPI_EXCEPTION((AE_INFO, status,
-                                "Thread %X could not acquire Mutex [%X]",
+                                "Thread %lX could not acquire Mutex [%X]",
-                                (u32) this_thread_id, mutex_id));
+                                (unsigned long) this_thread_id, mutex_id));
        }
        return (status);
@@ -285,7 +286,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
        this_thread_id = acpi_os_get_thread_id();
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                          "Thread %X releasing Mutex [%s]\n", (u32) this_thread_id,
+                          "Thread %lX releasing Mutex [%s]\n",
+                          (unsigned long) this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
        if (mutex_id > ACPI_MAX_MUTEX) {
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index ba7d8ac702df..4696124759e1 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index 5a2de92831d3..e8fe1ba6cc24 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index eaa13d05c859..edcaafad0a31 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index 3538f69c82a1..de3276f4f468 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,7 @@ acpi_status acpi_initialize_subsystem(void)
        ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
+        acpi_gbl_startup_flags = ACPI_SUBSYSTEM_INITIALIZE;
        ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
        /* Initialize the OS-Dependent layer */
@@ -127,20 +128,6 @@ acpi_status acpi_enable_subsystem(u32 flags)
        ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
-        /*
-         * We must initialize the hardware before we can enable ACPI.
-         * The values from the FADT are validated here.
-         */
-        if (!(flags & ACPI_NO_HARDWARE_INIT)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Initializing ACPI hardware\n"));
-                status = acpi_hw_initialize();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
        /* Enable ACPI mode */
        if (!(flags & ACPI_NO_ACPI_ENABLE)) {
@@ -398,7 +385,6 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
 {
        struct acpi_system_info *info_ptr;
        acpi_status status;
-        u32 i;
        ACPI_FUNCTION_TRACE(acpi_get_system_info);
@@ -431,9 +417,7 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
        /* Timer resolution - 24 or 32 bits  */
-        if (!acpi_gbl_FADT) {
+        if (acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) {
-                info_ptr->timer_resolution = 0;
-        } else if (acpi_gbl_FADT->tmr_val_ext == 0) {
                info_ptr->timer_resolution = 24;
        } else {
                info_ptr->timer_resolution = 32;
@@ -449,13 +433,6 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
        info_ptr->debug_layer = acpi_dbg_layer;
        info_ptr->debug_level = acpi_dbg_level;
-        /* Current status of the ACPI tables, per table type */
-        info_ptr->num_table_types = ACPI_TABLE_ID_MAX + 1;
-        for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
-                info_ptr->table_info[i].count = acpi_gbl_table_lists[i].count;
-        }
        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index d0d84c43a9d4..68a809fa7b19 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -83,7 +83,7 @@ acpi_extract_package(union acpi_object *package,
                return AE_BAD_DATA;
        }
-        format_string = (char *)format->pointer;
+        format_string = format->pointer;
        /*
         * Calculate size_required.
@@ -262,11 +262,10 @@ acpi_evaluate_integer(acpi_handle handle,
        if (!data)
                return AE_BAD_PARAMETER;
-        element = kmalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
+        element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
        if (!element)
                return AE_NO_MEMORY;
-        memset(element, 0, sizeof(union acpi_object));
        buffer.length = sizeof(union acpi_object);
        buffer.pointer = element;
        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
@@ -321,12 +320,11 @@ acpi_evaluate_string(acpi_handle handle,
                return AE_BAD_DATA;
        }
-        *data = kmalloc(element->string.length + 1, GFP_KERNEL);
+        *data = kzalloc(element->string.length + 1, GFP_KERNEL);
        if (!data) {
                printk(KERN_ERR PREFIX "Memory allocation\n");
                return -ENOMEM;
        }
-        memset(*data, 0, element->string.length + 1);
        memcpy(*data, element->string.pointer, element->string.length);
@@ -361,7 +359,7 @@ acpi_evaluate_reference(acpi_handle handle,
        if (ACPI_FAILURE(status))
                goto end;
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
        if ((buffer.length == 0) || !package) {
                printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6e99eea689c8..e0b97add8c63 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -3,6 +3,7 @@
 *
 *  Copyright (C) 2004 Luming Yu <luming.yu@intel.com>
 *  Copyright (C) 2004 Bruno Ducrot <ducrot@poupinou.org>
+ *  Copyright (C) 2006 Thomas Tuttle <linux-kernel@ttuttle.net>
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
@@ -31,6 +32,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/backlight.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_bus.h>
@@ -47,14 +49,20 @@
 #define ACPI_VIDEO_NOTIFY_NEXT_OUTPUT   0x83
 #define ACPI_VIDEO_NOTIFY_PREV_OUTPUT   0x84
-#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS      0x82
+#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS      0x85
-#define ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x83
+#define ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x86
-#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS        0x84
+#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS        0x87
-#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS       0x85
+#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS       0x88
-#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF           0x86
+#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF           0x89
 #define ACPI_VIDEO_HEAD_INVALID         (~0u - 1)
 #define ACPI_VIDEO_HEAD_END             (~0u)
+#define MAX_NAME_LEN    20
+#define ACPI_VIDEO_DISPLAY_CRT  1
+#define ACPI_VIDEO_DISPLAY_TV   2
+#define ACPI_VIDEO_DISPLAY_DVI  3
+#define ACPI_VIDEO_DISPLAY_LCD  4
 #define _COMPONENT              ACPI_VIDEO_COMPONENT
 ACPI_MODULE_NAME("acpi_video")
@@ -130,20 +138,21 @@ struct acpi_video_device_flags {
        u8 crt:1;
        u8 lcd:1;
        u8 tvout:1;
+        u8 dvi:1;
        u8 bios:1;
        u8 unknown:1;
-        u8 reserved:3;
+        u8 reserved:2;
 };
 struct acpi_video_device_cap {
        u8 _ADR:1;              /*Return the unique ID */
        u8 _BCL:1;              /*Query list of brightness control levels supported */
        u8 _BCM:1;              /*Set the brightness level */
+        u8 _BQC:1;              /* Get current brightness level */
        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 */
-        u8 _reserved:1;
 };
 struct acpi_video_device_brightness {
@@ -160,6 +169,8 @@ struct acpi_video_device {
        struct acpi_video_bus *video;
        struct acpi_device *dev;
        struct acpi_video_device_brightness *brightness;
+        struct backlight_device *backlight;
+        struct backlight_properties *data;
 };
 /* bus */
@@ -254,11 +265,35 @@ static void acpi_video_device_bind(struct acpi_video_bus *video,
                                   struct acpi_video_device *device);
 static int acpi_video_device_enumerate(struct acpi_video_bus *video);
 static int acpi_video_switch_output(struct acpi_video_bus *video, int event);
+static int acpi_video_device_lcd_set_level(struct acpi_video_device *device,
+                        int level);
+static int acpi_video_device_lcd_get_level_current(
+                        struct acpi_video_device *device,
+                        unsigned long *level);
 static int acpi_video_get_next_level(struct acpi_video_device *device,
                                     u32 level_current, u32 event);
 static void acpi_video_switch_brightness(struct acpi_video_device *device,
                                         int event);
+/*backlight device sysfs support*/
+static int acpi_video_get_brightness(struct backlight_device *bd)
+{
+        unsigned long cur_level;
+        struct acpi_video_device *vd =
+                (struct acpi_video_device *)class_get_devdata(&bd->class_dev);
+        acpi_video_device_lcd_get_level_current(vd, &cur_level);
+        return (int) cur_level;
+}
+static int acpi_video_set_brightness(struct backlight_device *bd)
+{
+        int request_level = bd->props->brightness;
+        struct acpi_video_device *vd =
+                (struct acpi_video_device *)class_get_devdata(&bd->class_dev);
+        acpi_video_device_lcd_set_level(vd, request_level);
+        return 0;
+}
 /* --------------------------------------------------------------------------
                               Video Management
   -------------------------------------------------------------------------- */
@@ -384,7 +419,7 @@ acpi_video_device_EDID(struct acpi_video_device *device,
        if (ACPI_FAILURE(status))
                return -ENODEV;
-        obj = (union acpi_object *)buffer.pointer;
+        obj = buffer.pointer;
        if (obj && obj->type == ACPI_TYPE_BUFFER)
                *edid = obj;
@@ -496,6 +531,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        acpi_integer status;
        acpi_handle h_dummy1;
        int i;
+        u32 max_level = 0;
        union acpi_object *obj = NULL;
        struct acpi_video_device_brightness *br = NULL;
@@ -511,6 +547,8 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCM", &h_dummy1))) {
                device->cap._BCM = 1;
        }
+        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle,"_BQC",&h_dummy1)))
+                device->cap._BQC = 1;
        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
                device->cap._DDC = 1;
        }
@@ -530,11 +568,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                int count = 0;
                union acpi_object *o;
-                br = kmalloc(sizeof(*br), GFP_KERNEL);
+                br = kzalloc(sizeof(*br), GFP_KERNEL);
                if (!br) {
                        printk(KERN_ERR "can't allocate memory\n");
                } else {
-                        memset(br, 0, sizeof(*br));
                        br->levels = kmalloc(obj->package.count *
                                             sizeof *(br->levels), GFP_KERNEL);
                        if (!br->levels)
@@ -548,6 +585,8 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                                        continue;
                                }
                                br->levels[count] = (u32) o->integer.value;
+                                if (br->levels[count] > max_level)
+                                        max_level = br->levels[count];
                                count++;
                        }
                      out:
@@ -566,6 +605,37 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        kfree(obj);
+        if (device->cap._BCL && device->cap._BCM && device->cap._BQC){
+                unsigned long tmp;
+                static int count = 0;
+                char *name;
+                struct backlight_properties *acpi_video_data;
+                name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
+                if (!name)
+                        return;
+                acpi_video_data = kzalloc(
+                        sizeof(struct backlight_properties),
+                        GFP_KERNEL);
+                if (!acpi_video_data){
+                        kfree(name);
+                        return;
+                }
+                acpi_video_data->owner = THIS_MODULE;
+                acpi_video_data->get_brightness =
+                        acpi_video_get_brightness;
+                acpi_video_data->update_status =
+                        acpi_video_set_brightness;
+                sprintf(name, "acpi_video%d", count++);
+                device->data = acpi_video_data;
+                acpi_video_data->max_brightness = max_level;
+                acpi_video_device_lcd_get_level_current(device, &tmp);
+                acpi_video_data->brightness = (int)tmp;
+                device->backlight = backlight_device_register(name,
+                        NULL, device, acpi_video_data);
+                kfree(name);
+        }
        return;
 }
@@ -652,8 +722,7 @@ static struct proc_dir_entry *acpi_video_dir;
 static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
+        struct acpi_video_device *dev = seq->private;
-            (struct acpi_video_device *)seq->private;
        if (!dev)
@@ -667,6 +736,8 @@ static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, "LCD\n");
        else if (dev->flags.tvout)
                seq_printf(seq, "TVOUT\n");
+        else if (dev->flags.dvi)
+                seq_printf(seq, "DVI\n");
        else
                seq_printf(seq, "UNKNOWN\n");
@@ -686,8 +757,7 @@ acpi_video_device_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
 {
        int status;
-        struct acpi_video_device *dev =
+        struct acpi_video_device *dev = seq->private;
-            (struct acpi_video_device *)seq->private;
        unsigned long state;
@@ -725,8 +795,8 @@ acpi_video_device_write_state(struct file *file,
                              size_t count, loff_t * data)
 {
        int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_video_device *dev = (struct acpi_video_device *)m->private;
+        struct acpi_video_device *dev = m->private;
        char str[12] = { 0 };
        u32 state = 0;
@@ -752,8 +822,7 @@ acpi_video_device_write_state(struct file *file,
 static int
 acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
+        struct acpi_video_device *dev = seq->private;
-            (struct acpi_video_device *)seq->private;
        int i;
@@ -782,8 +851,8 @@ acpi_video_device_write_brightness(struct file *file,
                                   const char __user * buffer,
                                   size_t count, loff_t * data)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_video_device *dev = (struct acpi_video_device *)m->private;
+        struct acpi_video_device *dev = m->private;
        char str[4] = { 0 };
        unsigned int level = 0;
        int i;
@@ -815,8 +884,7 @@ acpi_video_device_write_brightness(struct file *file,
 static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
+        struct acpi_video_device *dev = seq->private;
-            (struct acpi_video_device *)seq->private;
        int status;
        int i;
        union acpi_object *edid = NULL;
@@ -864,7 +932,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
        if (!device)
                return -ENODEV;
-        vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
+        vid_dev = acpi_driver_data(device);
        if (!vid_dev)
                return -ENODEV;
@@ -929,7 +997,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
 {
        struct acpi_video_device *vid_dev;
-        vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
+        vid_dev = acpi_driver_data(device);
        if (!vid_dev || !vid_dev->video || !vid_dev->video->dir)
                return -ENODEV;
@@ -948,7 +1016,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
 /* video bus */
 static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
        if (!video)
@@ -973,7 +1041,7 @@ static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
        if (!video)
@@ -993,7 +1061,7 @@ static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
        unsigned long options;
        int status;
@@ -1031,7 +1099,7 @@ acpi_video_bus_POST_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
        int status;
        unsigned long id;
@@ -1052,7 +1120,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 static int acpi_video_bus_DOS_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
        seq_printf(seq, "DOS setting: <%d>\n", video->dos_setting);
@@ -1077,8 +1145,8 @@ acpi_video_bus_write_POST(struct file *file,
                          size_t count, loff_t * data)
 {
        int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_video_bus *video = (struct acpi_video_bus *)m->private;
+        struct acpi_video_bus *video = m->private;
        char str[12] = { 0 };
        unsigned long opt, options;
@@ -1117,8 +1185,8 @@ acpi_video_bus_write_DOS(struct file *file,
                         size_t count, loff_t * data)
 {
        int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct seq_file *m = file->private_data;
-        struct acpi_video_bus *video = (struct acpi_video_bus *)m->private;
+        struct acpi_video_bus *video = m->private;
        char str[12] = { 0 };
        unsigned long opt;
@@ -1148,7 +1216,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
        struct acpi_video_bus *video;
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
@@ -1224,7 +1292,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
        struct acpi_video_bus *video;
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
        if (acpi_device_dir(device)) {
                remove_proc_entry("info", acpi_device_dir(device));
@@ -1244,6 +1312,16 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
   -------------------------------------------------------------------------- */
 /* device interface */
+static struct acpi_video_device_attrib*
+acpi_video_get_device_attr(struct acpi_video_bus *video, unsigned long device_id)
+{
+        int count;
+        for(count = 0; count < video->attached_count; count++)
+                if((video->attached_array[count].value.int_val & 0xffff) == device_id)
+                        return &(video->attached_array[count].value.attrib);
+        return NULL;
+}
 static int
 acpi_video_bus_get_one_device(struct acpi_device *device,
@@ -1252,7 +1330,7 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
        unsigned long device_id;
        int status;
        struct acpi_video_device *data;
+        struct acpi_video_device_attrib* attribute;
        if (!device || !video)
                return -EINVAL;
@@ -1261,12 +1339,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
        if (ACPI_SUCCESS(status)) {
-                data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
+                data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
                if (!data)
                        return -ENOMEM;
-                memset(data, 0, sizeof(struct acpi_video_device));
                strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
                strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
                acpi_driver_data(device) = data;
@@ -1275,20 +1351,30 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                data->video = video;
                data->dev = device;
-                switch (device_id & 0xffff) {
+                attribute = acpi_video_get_device_attr(video, device_id);
-                case 0x0100:
-                        data->flags.crt = 1;
+                if((attribute != NULL) && attribute->device_id_scheme) {
-                        break;
+                        switch (attribute->display_type) {
-                case 0x0400:
+                        case ACPI_VIDEO_DISPLAY_CRT:
-                        data->flags.lcd = 1;
+                                data->flags.crt = 1;
-                        break;
+                                break;
-                case 0x0200:
+                        case ACPI_VIDEO_DISPLAY_TV:
-                        data->flags.tvout = 1;
+                                data->flags.tvout = 1;
-                        break;
+                                break;
-                default:
+                        case ACPI_VIDEO_DISPLAY_DVI:
+                                data->flags.dvi = 1;
+                                break;
+                        case ACPI_VIDEO_DISPLAY_LCD:
+                                data->flags.lcd = 1;
+                                break;
+                        default:
+                                data->flags.unknown = 1;
+                                break;
+                        }
+                        if(attribute->bios_can_detect)
+                                data->flags.bios = 1;
+                } else
                        data->flags.unknown = 1;
-                        break;
-                }
                acpi_video_device_bind(video, data);
                acpi_video_device_find_cap(data);
@@ -1401,7 +1487,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
                return status;
        }
-        dod = (union acpi_object *)buffer.pointer;
+        dod = buffer.pointer;
        if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {
                ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));
                status = -EFAULT;
@@ -1424,7 +1510,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
        count = 0;
        for (i = 0; i < dod->package.count; i++) {
-                obj = (union acpi_object *)&dod->package.elements[i];
+                obj = &dod->package.elements[i];
                if (obj->type != ACPI_TYPE_INTEGER) {
                        printk(KERN_ERR PREFIX "Invalid _DOD data\n");
@@ -1507,8 +1593,34 @@ static int
 acpi_video_get_next_level(struct acpi_video_device *device,
                          u32 level_current, u32 event)
 {
-        /*Fix me */
+        int min, max, min_above, max_below, i, l;
-        return level_current;
+        max = max_below = 0;
+        min = min_above = 255;
+        for (i = 0; i < device->brightness->count; i++) {
+                l = device->brightness->levels[i];
+                if (l < min)
+                        min = l;
+                if (l > max)
+                        max = l;
+                if (l < min_above && l > level_current)
+                        min_above = l;
+                if (l > max_below && l < level_current)
+                        max_below = l;
+        }
+        switch (event) {
+        case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:
+                return (level_current < max) ? min_above : min;
+        case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:
+                return (level_current < max) ? min_above : max;
+        case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:
+                return (level_current > min) ? max_below : min;
+        case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS:
+        case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:
+                return 0;
+        default:
+                return level_current;
+        }
 }
 static void
@@ -1566,7 +1678,10 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
        status = acpi_remove_notify_handler(device->dev->handle,
                                            ACPI_DEVICE_NOTIFY,
                                            acpi_video_device_notify);
+        if (device->backlight){
+                backlight_device_unregister(device->backlight);
+                kfree(device->data);
+        }
        return 0;
 }
@@ -1610,7 +1725,7 @@ static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)data;
+        struct acpi_video_bus *video = data;
        struct acpi_device *device = NULL;
        printk("video bus notify\n");
@@ -1652,12 +1767,9 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_video_device *video_device =
+        struct acpi_video_device *video_device = data;
-            (struct acpi_video_device *)data;
        struct acpi_device *device = NULL;
-        printk("video device notify\n");
        if (!video_device)
                return;
@@ -1694,10 +1806,9 @@ static int acpi_video_bus_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
-        video = kmalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
+        video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
        if (!video)
                return -ENOMEM;
-        memset(video, 0, sizeof(struct acpi_video_bus));
        video->device = device;
        strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
@@ -1755,7 +1866,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
        acpi_video_bus_stop_devices(video);