Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI and power management updates from Rafael J Wysocki: - New power capping framework and the the Intel Running Average Power Limit (RAPL) driver using it from Srinivas Pandruvada and Jacob Pan. - Addition of the in-kernel switching feature to the arm_big_little cpufreq driver from Viresh Kumar and Nicolas Pitre. - cpufreq support for iMac G5 from Aaro Koskinen. - Baytrail processors support for intel_pstate from Dirk Brandewie. - cpufreq support for Midway/ECX-2000 from Mark Langsdorf. - ARM vexpress/TC2 cpufreq support from Sudeep KarkadaNagesha. - ACPI power management support for the I2C and SPI bus types from Mika Westerberg and Lv Zheng. - cpufreq core fixes and cleanups from Viresh Kumar, Srivatsa S Bhat, Stratos Karafotis, Xiaoguang Chen, Lan Tianyu. - cpufreq drivers updates (mostly fixes and cleanups) from Viresh Kumar, Aaro Koskinen, Jungseok Lee, Sudeep KarkadaNagesha, Lukasz Majewski, Manish Badarkhe, Hans-Christian Egtvedt, Evgeny Kapaev. - intel_pstate updates from Dirk Brandewie and Adrian Huang. - ACPICA update to version 20130927 includig fixes and cleanups and some reduction of divergences between the ACPICA code in the kernel and ACPICA upstream in order to improve the automatic ACPICA patch generation process. From Bob Moore, Lv Zheng, Tomasz Nowicki, Naresh Bhat, Bjorn Helgaas, David E Box. - ACPI IPMI driver fixes and cleanups from Lv Zheng. - ACPI hotplug fixes and cleanups from Bjorn Helgaas, Toshi Kani, Zhang Yanfei, Rafael J Wysocki. - Conversion of the ACPI AC driver to the platform bus type and multiple driver fixes and cleanups related to ACPI from Zhang Rui. - ACPI processor driver fixes and cleanups from Hanjun Guo, Jiang Liu, Bartlomiej Zolnierkiewicz, Mathieu Rhéaume, Rafael J Wysocki. - Fixes and cleanups and new blacklist entries related to the ACPI video support from Aaron Lu, Felipe Contreras, Lennart Poettering, Kirill Tkhai. - cpuidle core cleanups from Viresh Kumar and Lorenzo Pieralisi. - cpuidle drivers fixes and cleanups from Daniel Lezcano, Jingoo Han, Bartlomiej Zolnierkiewicz, Prarit Bhargava. - devfreq updates from Sachin Kamat, Dan Carpenter, Manish Badarkhe. - Operation Performance Points (OPP) core updates from Nishanth Menon. - Runtime power management core fix from Rafael J Wysocki and update from Ulf Hansson. - Hibernation fixes from Aaron Lu and Rafael J Wysocki. - Device suspend/resume lockup detection mechanism from Benoit Goby. - Removal of unused proc directories created for various ACPI drivers from Lan Tianyu. - ACPI LPSS driver fix and new device IDs for the ACPI platform scan handler from Heikki Krogerus and Jarkko Nikula. - New ACPI _OSI blacklist entry for Toshiba NB100 from Levente Kurusa. - Assorted fixes and cleanups related to ACPI from Andy Shevchenko, Al Stone, Bartlomiej Zolnierkiewicz, Colin Ian King, Dan Carpenter, Felipe Contreras, Jianguo Wu, Lan Tianyu, Yinghai Lu, Mathias Krause, Liu Chuansheng. - Assorted PM fixes and cleanups from Andy Shevchenko, Thierry Reding, Jean-Christophe Plagniol-Villard. * tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (386 commits) cpufreq: conservative: fix requested_freq reduction issue ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines PM / runtime: Use pm_runtime_put_sync() in __device_release_driver() ACPI / event: remove unneeded NULL pointer check Revert "ACPI / video: Ignore BIOS initial backlight value for HP 250 G1" ACPI / video: Quirk initial backlight level 0 ACPI / video: Fix initial level validity test intel_pstate: skip the driver if ACPI has power mgmt option PM / hibernate: Avoid overflow in hibernate_preallocate_memory() ACPI / hotplug: Do not execute "insert in progress" _OST ACPI / hotplug: Carry out PCI root eject directly ACPI / hotplug: Merge device hot-removal routines ACPI / hotplug: Make acpi_bus_hot_remove_device() internal ACPI / hotplug: Simplify device ejection routines ACPI / hotplug: Fix handle_root_bridge_removal() ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug ACPI / scan: Start matching drivers after trying scan handlers ACPI: Remove acpi_pci_slot_init() headers from internal.h ACPI / blacklist: fix name of ThinkPad Edge E530 PowerCap: Fix build error with option -Werror=format-security ... Conflicts: arch/arm/mach-omap2/opp.c drivers/Kconfig drivers/spi/spi.c
author: Linus Torvalds <torvalds@linux-foundation.org> 2013-11-13 23:41:48 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2013-11-13 23:41:48 -0500
commit: f9300eaaac1ca300083ad41937923a90cc3a2394 (patch)
tree: 724b72ad729a8b85c09d2d54f8ca7d8ba22d774f /drivers/acpi
parent: 7f2dc5c4bcbff035b0d03f7aa78a182664b21e47 (diff)
parent: faddf2f5d278f1656e9444961bdd8d9db4deb5bf (diff)
122 files changed, 1921 insertions, 2439 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index e11faae81ed9..c95df0b8c880 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -56,23 +56,6 @@ config ACPI_PROCFS
          Say N to delete /proc/acpi/ files that have moved to /sys/
-config ACPI_PROCFS_POWER
-        bool "Deprecated power /proc/acpi directories"
-        depends on PROC_FS
-        help
-          For backwards compatibility, this option allows
-          deprecated power /proc/acpi/ directories to exist, even when
-          they have been replaced by functions in /sys.
-          The deprecated directories (and their replacements) include:
-          /proc/acpi/battery/* (/sys/class/power_supply/*)
-          /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
-          This option has no effect on /proc/acpi/ directories
-          and functions, which do not yet exist in /sys
-          This option, together with the proc directories, will be
-          deleted in 2.6.39.
-          Say N to delete power /proc/acpi/ directories that have moved to /sys/
 config ACPI_EC_DEBUGFS
        tristate "EC read/write access through /sys/kernel/debug/ec"
        default n
@@ -175,9 +158,10 @@ config ACPI_PROCESSOR
          To compile this driver as a module, choose M here:
          the module will be called processor.
 config ACPI_IPMI
        tristate "IPMI"
-        depends on IPMI_SI && IPMI_HANDLER
+        depends on IPMI_SI
        default n
        help
          This driver enables the ACPI to access the BMC controller. And it
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index bce34afadcd0..0331f91d56e6 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -47,7 +47,6 @@ acpi-y				+= sysfs.o
 acpi-$(CONFIG_X86)              += acpi_cmos_rtc.o
 acpi-$(CONFIG_DEBUG_FS)         += debugfs.o
 acpi-$(CONFIG_ACPI_NUMA)        += numa.o
-acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 ifdef CONFIG_ACPI_VIDEO
 acpi-y                          += video_detect.o
 endif
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index f37beaa32750..b9f0d5f4bba5 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -30,10 +30,7 @@
 #include <linux/types.h>
 #include <linux/dmi.h>
 #include <linux/delay.h>
-#ifdef CONFIG_ACPI_PROCFS_POWER
+#include <linux/platform_device.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#endif
 #include <linux/power_supply.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -55,75 +52,30 @@ MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI AC Adapter Driver");
 MODULE_LICENSE("GPL");
-#ifdef CONFIG_ACPI_PROCFS_POWER
-extern struct proc_dir_entry *acpi_lock_ac_dir(void);
-extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);
-static int acpi_ac_open_fs(struct inode *inode, struct file *file);
-#endif
-static int acpi_ac_add(struct acpi_device *device);
-static int acpi_ac_remove(struct acpi_device *device);
-static void acpi_ac_notify(struct acpi_device *device, u32 event);
-static const struct acpi_device_id ac_device_ids[] = {
-        {"ACPI0003", 0},
-        {"", 0},
-};
-MODULE_DEVICE_TABLE(acpi, ac_device_ids);
-#ifdef CONFIG_PM_SLEEP
-static int acpi_ac_resume(struct device *dev);
-#endif
-static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);
 static int ac_sleep_before_get_state_ms;
-static struct acpi_driver acpi_ac_driver = {
-        .name = "ac",
-        .class = ACPI_AC_CLASS,
-        .ids = ac_device_ids,
-        .flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
-        .ops = {
-                .add = acpi_ac_add,
-                .remove = acpi_ac_remove,
-                .notify = acpi_ac_notify,
-                },
-        .drv.pm = &acpi_ac_pm,
-};
 struct acpi_ac {
        struct power_supply charger;
-        struct acpi_device * device;
+        struct acpi_device *adev;
+        struct platform_device *pdev;
        unsigned long long state;
 };
 #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger)
-#ifdef CONFIG_ACPI_PROCFS_POWER
-static const struct file_operations acpi_ac_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_ac_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-#endif
 /* --------------------------------------------------------------------------
                               AC Adapter Management
   -------------------------------------------------------------------------- */
 static int acpi_ac_get_state(struct acpi_ac *ac)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
-        if (!ac)
-                return -EINVAL;
-        status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL, &ac->state);
+        status = acpi_evaluate_integer(ac->adev->handle, "_PSR", NULL,
+                                       &ac->state);
        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Error reading AC Adapter state"));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Error reading AC Adapter state"));
                ac->state = ACPI_AC_STATUS_UNKNOWN;
                return -ENODEV;
        }
@@ -160,91 +112,13 @@ static enum power_supply_property ac_props[] = {
        POWER_SUPPLY_PROP_ONLINE,
 };
-#ifdef CONFIG_ACPI_PROCFS_POWER
-/* --------------------------------------------------------------------------
-                              FS Interface (/proc)
-   -------------------------------------------------------------------------- */
-static struct proc_dir_entry *acpi_ac_dir;
-static int acpi_ac_seq_show(struct seq_file *seq, void *offset)
-{
-        struct acpi_ac *ac = seq->private;
-        if (!ac)
-                return 0;
-        if (acpi_ac_get_state(ac)) {
-                seq_puts(seq, "ERROR: Unable to read AC Adapter state\n");
-                return 0;
-        }
-        seq_puts(seq, "state:                   ");
-        switch (ac->state) {
-        case ACPI_AC_STATUS_OFFLINE:
-                seq_puts(seq, "off-line\n");
-                break;
-        case ACPI_AC_STATUS_ONLINE:
-                seq_puts(seq, "on-line\n");
-                break;
-        default:
-                seq_puts(seq, "unknown\n");
-                break;
-        }
-        return 0;
-}
-static int acpi_ac_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_ac_seq_show, PDE_DATA(inode));
-}
-static int acpi_ac_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"
-                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_ac_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-        /* 'state' [R] */
-        entry = proc_create_data(ACPI_AC_FILE_STATE,
-                                 S_IRUGO, acpi_device_dir(device),
-                                 &acpi_ac_fops, acpi_driver_data(device));
-        if (!entry)
-                return -ENODEV;
-        return 0;
-}
-static int acpi_ac_remove_fs(struct acpi_device *device)
-{
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_AC_FILE_STATE, acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_ac_dir);
-                acpi_device_dir(device) = NULL;
-        }
-        return 0;
-}
-#endif
 /* --------------------------------------------------------------------------
                                   Driver Model
   -------------------------------------------------------------------------- */
-static void acpi_ac_notify(struct acpi_device *device, u32 event)
+static void acpi_ac_notify_handler(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_ac *ac = acpi_driver_data(device);
+        struct acpi_ac *ac = data;
        if (!ac)
                return;
@@ -267,10 +141,10 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
                        msleep(ac_sleep_before_get_state_ms);
                acpi_ac_get_state(ac);
-                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                acpi_bus_generate_netlink_event(ac->adev->pnp.device_class,
-                                                  dev_name(&device->dev), event,
+                                                dev_name(&ac->pdev->dev),
-                                                  (u32) ac->state);
+                                                event, (u32) ac->state);
-                acpi_notifier_call_chain(device, event, (u32) ac->state);
+                acpi_notifier_call_chain(ac->adev, event, (u32) ac->state);
                kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
        }
@@ -295,53 +169,55 @@ static struct dmi_system_id ac_dmi_table[] = {
        {},
 };
-static int acpi_ac_add(struct acpi_device *device)
+static int acpi_ac_probe(struct platform_device *pdev)
 {
        int result = 0;
        struct acpi_ac *ac = NULL;
+        struct acpi_device *adev;
+        if (!pdev)
-        if (!device)
                return -EINVAL;
+        result = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
+        if (result)
+                return -ENODEV;
        ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL);
        if (!ac)
                return -ENOMEM;
-        ac->device = device;
+        strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
-        strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);
+        strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
-        strcpy(acpi_device_class(device), ACPI_AC_CLASS);
+        ac->adev = adev;
-        device->driver_data = ac;
+        ac->pdev = pdev;
+        platform_set_drvdata(pdev, ac);
        result = acpi_ac_get_state(ac);
        if (result)
                goto end;
-#ifdef CONFIG_ACPI_PROCFS_POWER
+        ac->charger.name = acpi_device_bid(adev);
-        result = acpi_ac_add_fs(device);
-#endif
-        if (result)
-                goto end;
-        ac->charger.name = acpi_device_bid(device);
        ac->charger.type = POWER_SUPPLY_TYPE_MAINS;
        ac->charger.properties = ac_props;
        ac->charger.num_properties = ARRAY_SIZE(ac_props);
        ac->charger.get_property = get_ac_property;
-        result = power_supply_register(&ac->device->dev, &ac->charger);
+        result = power_supply_register(&pdev->dev, &ac->charger);
        if (result)
                goto end;
+        result = acpi_install_notify_handler(ACPI_HANDLE(&pdev->dev),
+                        ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler, ac);
+        if (result) {
+                power_supply_unregister(&ac->charger);
+                goto end;
+        }
        printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
-               acpi_device_name(device), acpi_device_bid(device),
+               acpi_device_name(adev), acpi_device_bid(adev),
               ac->state ? "on-line" : "off-line");
-      end:
+end:
-        if (result) {
+        if (result)
-#ifdef CONFIG_ACPI_PROCFS_POWER
-                acpi_ac_remove_fs(device);
-#endif
                kfree(ac);
-        }
        dmi_check_system(ac_dmi_table);
        return result;
@@ -356,7 +232,7 @@ static int acpi_ac_resume(struct device *dev)
        if (!dev)
                return -EINVAL;
-        ac = acpi_driver_data(to_acpi_device(dev));
+        ac = platform_get_drvdata(to_platform_device(dev));
        if (!ac)
                return -EINVAL;
@@ -368,28 +244,44 @@ static int acpi_ac_resume(struct device *dev)
        return 0;
 }
 #endif
+static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);
-static int acpi_ac_remove(struct acpi_device *device)
+static int acpi_ac_remove(struct platform_device *pdev)
 {
-        struct acpi_ac *ac = NULL;
+        struct acpi_ac *ac;
-        if (!device || !acpi_driver_data(device))
+        if (!pdev)
                return -EINVAL;
-        ac = acpi_driver_data(device);
+        acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev),
+                        ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler);
+        ac = platform_get_drvdata(pdev);
        if (ac->charger.dev)
                power_supply_unregister(&ac->charger);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_ac_remove_fs(device);
-#endif
        kfree(ac);
        return 0;
 }
+static const struct acpi_device_id acpi_ac_match[] = {
+        { "ACPI0003", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, acpi_ac_match);
+static struct platform_driver acpi_ac_driver = {
+        .probe          = acpi_ac_probe,
+        .remove         = acpi_ac_remove,
+        .driver         = {
+                .name   = "acpi-ac",
+                .owner  = THIS_MODULE,
+                .pm     = &acpi_ac_pm_ops,
+                .acpi_match_table = ACPI_PTR(acpi_ac_match),
+        },
+};
 static int __init acpi_ac_init(void)
 {
        int result;
@@ -397,34 +289,16 @@ static int __init acpi_ac_init(void)
        if (acpi_disabled)
                return -ENODEV;
-#ifdef CONFIG_ACPI_PROCFS_POWER
+        result = platform_driver_register(&acpi_ac_driver);
-        acpi_ac_dir = acpi_lock_ac_dir();
+        if (result < 0)
-        if (!acpi_ac_dir)
                return -ENODEV;
-#endif
-        result = acpi_bus_register_driver(&acpi_ac_driver);
-        if (result < 0) {
-#ifdef CONFIG_ACPI_PROCFS_POWER
-                acpi_unlock_ac_dir(acpi_ac_dir);
-#endif
-                return -ENODEV;
-        }
        return 0;
 }
 static void __exit acpi_ac_exit(void)
 {
+        platform_driver_unregister(&acpi_ac_driver);
-        acpi_bus_unregister_driver(&acpi_ac_driver);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_unlock_ac_dir(acpi_ac_dir);
-#endif
-        return;
 }
 module_init(acpi_ac_init);
 module_exit(acpi_ac_exit);
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
index a6977e12d574..ac0f52f6df2b 100644
--- a/drivers/acpi/acpi_ipmi.c
+++ b/drivers/acpi/acpi_ipmi.c
@@ -1,8 +1,9 @@
 /*
 *  acpi_ipmi.c - ACPI IPMI opregion
 *
- *  Copyright (C) 2010 Intel Corporation
+ *  Copyright (C) 2010, 2013 Intel Corporation
- *  Copyright (C) 2010 Zhao Yakui <yakui.zhao@intel.com>
+ *    Author: Zhao Yakui <yakui.zhao@intel.com>
+ *            Lv Zheng <lv.zheng@intel.com>
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
@@ -23,60 +24,58 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
+#include <linux/acpi.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/ipmi.h>
-#include <linux/device.h>
-#include <linux/pnp.h>
 #include <linux/spinlock.h>
 MODULE_AUTHOR("Zhao Yakui");
 MODULE_DESCRIPTION("ACPI IPMI Opregion driver");
 MODULE_LICENSE("GPL");
-#define IPMI_FLAGS_HANDLER_INSTALL      0
 #define ACPI_IPMI_OK                    0
 #define ACPI_IPMI_TIMEOUT               0x10
 #define ACPI_IPMI_UNKNOWN               0x07
 /* the IPMI timeout is 5s */
-#define IPMI_TIMEOUT                    (5 * HZ)
+#define IPMI_TIMEOUT                    (5000)
+#define ACPI_IPMI_MAX_MSG_LENGTH        64
 struct acpi_ipmi_device {
        /* the device list attached to driver_data.ipmi_devices */
        struct list_head head;
        /* the IPMI request message list */
        struct list_head tx_msg_list;
-        spinlock_t      tx_msg_lock;
+        spinlock_t tx_msg_lock;
        acpi_handle handle;
-        struct pnp_dev *pnp_dev;
+        struct device *dev;
-        ipmi_user_t     user_interface;
+        ipmi_user_t user_interface;
        int ipmi_ifnum; /* IPMI interface number */
        long curr_msgid;
-        unsigned long flags;
+        bool dead;
-        struct ipmi_smi_info smi_data;
+        struct kref kref;
 };
 struct ipmi_driver_data {
-        struct list_head        ipmi_devices;
+        struct list_head ipmi_devices;
-        struct ipmi_smi_watcher bmc_events;
+        struct ipmi_smi_watcher bmc_events;
-        struct ipmi_user_hndl   ipmi_hndlrs;
+        struct ipmi_user_hndl ipmi_hndlrs;
-        struct mutex            ipmi_lock;
+        struct mutex ipmi_lock;
+        /*
+         * NOTE: IPMI System Interface Selection
+         * There is no system interface specified by the IPMI operation
+         * region access.  We try to select one system interface with ACPI
+         * handle set.  IPMI messages passed from the ACPI codes are sent
+         * to this selected global IPMI system interface.
+         */
+        struct acpi_ipmi_device *selected_smi;
 };
 struct acpi_ipmi_msg {
        struct list_head head;
        /*
         * General speaking the addr type should be SI_ADDR_TYPE. And
         * the addr channel should be BMC.
@@ -86,30 +85,31 @@ struct acpi_ipmi_msg {
         */
        struct ipmi_addr addr;
        long tx_msgid;
        /* it is used to track whether the IPMI message is finished */
        struct completion tx_complete;
        struct kernel_ipmi_msg tx_message;
-        int     msg_done;
+        int msg_done;
-        /* tx data . And copy it from ACPI object buffer */
-        u8      tx_data[64];
+        /* tx/rx data . And copy it from/to ACPI object buffer */
-        int     tx_len;
+        u8 data[ACPI_IPMI_MAX_MSG_LENGTH];
-        u8      rx_data[64];
+        u8 rx_len;
-        int     rx_len;
        struct acpi_ipmi_device *device;
+        struct kref kref;
 };
 /* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */
 struct acpi_ipmi_buffer {
        u8 status;
        u8 length;
-        u8 data[64];
+        u8 data[ACPI_IPMI_MAX_MSG_LENGTH];
 };
 static void ipmi_register_bmc(int iface, struct device *dev);
 static void ipmi_bmc_gone(int iface);
 static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
-static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device);
-static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device);
 static struct ipmi_driver_data driver_data = {
        .ipmi_devices = LIST_HEAD_INIT(driver_data.ipmi_devices),
@@ -121,29 +121,142 @@ static struct ipmi_driver_data driver_data = {
        .ipmi_hndlrs = {
                .ipmi_recv_hndl = ipmi_msg_handler,
        },
+        .ipmi_lock = __MUTEX_INITIALIZER(driver_data.ipmi_lock)
 };
-static struct acpi_ipmi_msg *acpi_alloc_ipmi_msg(struct acpi_ipmi_device *ipmi)
+static struct acpi_ipmi_device *
+ipmi_dev_alloc(int iface, struct device *dev, acpi_handle handle)
+{
+        struct acpi_ipmi_device *ipmi_device;
+        int err;
+        ipmi_user_t user;
+        ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL);
+        if (!ipmi_device)
+                return NULL;
+        kref_init(&ipmi_device->kref);
+        INIT_LIST_HEAD(&ipmi_device->head);
+        INIT_LIST_HEAD(&ipmi_device->tx_msg_list);
+        spin_lock_init(&ipmi_device->tx_msg_lock);
+        ipmi_device->handle = handle;
+        ipmi_device->dev = get_device(dev);
+        ipmi_device->ipmi_ifnum = iface;
+        err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs,
+                               ipmi_device, &user);
+        if (err) {
+                put_device(dev);
+                kfree(ipmi_device);
+                return NULL;
+        }
+        ipmi_device->user_interface = user;
+        return ipmi_device;
+}
+static void ipmi_dev_release(struct acpi_ipmi_device *ipmi_device)
+{
+        ipmi_destroy_user(ipmi_device->user_interface);
+        put_device(ipmi_device->dev);
+        kfree(ipmi_device);
+}
+static void ipmi_dev_release_kref(struct kref *kref)
+{
+        struct acpi_ipmi_device *ipmi =
+                container_of(kref, struct acpi_ipmi_device, kref);
+        ipmi_dev_release(ipmi);
+}
+static void __ipmi_dev_kill(struct acpi_ipmi_device *ipmi_device)
+{
+        list_del(&ipmi_device->head);
+        if (driver_data.selected_smi == ipmi_device)
+                driver_data.selected_smi = NULL;
+        /*
+         * Always setting dead flag after deleting from the list or
+         * list_for_each_entry() codes must get changed.
+         */
+        ipmi_device->dead = true;
+}
+static struct acpi_ipmi_device *acpi_ipmi_dev_get(void)
+{
+        struct acpi_ipmi_device *ipmi_device = NULL;
+        mutex_lock(&driver_data.ipmi_lock);
+        if (driver_data.selected_smi) {
+                ipmi_device = driver_data.selected_smi;
+                kref_get(&ipmi_device->kref);
+        }
+        mutex_unlock(&driver_data.ipmi_lock);
+        return ipmi_device;
+}
+static void acpi_ipmi_dev_put(struct acpi_ipmi_device *ipmi_device)
+{
+        kref_put(&ipmi_device->kref, ipmi_dev_release_kref);
+}
+static struct acpi_ipmi_msg *ipmi_msg_alloc(void)
 {
+        struct acpi_ipmi_device *ipmi;
        struct acpi_ipmi_msg *ipmi_msg;
-        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+        ipmi = acpi_ipmi_dev_get();
+        if (!ipmi)
+                return NULL;
        ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL);
-        if (!ipmi_msg)  {
+        if (!ipmi_msg) {
-                dev_warn(&pnp_dev->dev, "Can't allocate memory for ipmi_msg\n");
+                acpi_ipmi_dev_put(ipmi);
                return NULL;
        }
+        kref_init(&ipmi_msg->kref);
        init_completion(&ipmi_msg->tx_complete);
        INIT_LIST_HEAD(&ipmi_msg->head);
        ipmi_msg->device = ipmi;
+        ipmi_msg->msg_done = ACPI_IPMI_UNKNOWN;
        return ipmi_msg;
 }
-#define         IPMI_OP_RGN_NETFN(offset)       ((offset >> 8) & 0xff)
+static void ipmi_msg_release(struct acpi_ipmi_msg *tx_msg)
-#define         IPMI_OP_RGN_CMD(offset)         (offset & 0xff)
+{
-static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,
+        acpi_ipmi_dev_put(tx_msg->device);
-                                acpi_physical_address address,
+        kfree(tx_msg);
-                                acpi_integer *value)
+}
+static void ipmi_msg_release_kref(struct kref *kref)
+{
+        struct acpi_ipmi_msg *tx_msg =
+                container_of(kref, struct acpi_ipmi_msg, kref);
+        ipmi_msg_release(tx_msg);
+}
+static struct acpi_ipmi_msg *acpi_ipmi_msg_get(struct acpi_ipmi_msg *tx_msg)
+{
+        kref_get(&tx_msg->kref);
+        return tx_msg;
+}
+static void acpi_ipmi_msg_put(struct acpi_ipmi_msg *tx_msg)
+{
+        kref_put(&tx_msg->kref, ipmi_msg_release_kref);
+}
+#define IPMI_OP_RGN_NETFN(offset)       ((offset >> 8) & 0xff)
+#define IPMI_OP_RGN_CMD(offset)         (offset & 0xff)
+static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
+                                    acpi_physical_address address,
+                                    acpi_integer *value)
 {
        struct kernel_ipmi_msg *msg;
        struct acpi_ipmi_buffer *buffer;
@@ -151,21 +264,31 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,
        unsigned long flags;
        msg = &tx_msg->tx_message;
        /*
         * IPMI network function and command are encoded in the address
         * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3.
         */
        msg->netfn = IPMI_OP_RGN_NETFN(address);
        msg->cmd = IPMI_OP_RGN_CMD(address);
-        msg->data = tx_msg->tx_data;
+        msg->data = tx_msg->data;
        /*
         * value is the parameter passed by the IPMI opregion space handler.
         * It points to the IPMI request message buffer
         */
        buffer = (struct acpi_ipmi_buffer *)value;
        /* copy the tx message data */
+        if (buffer->length > ACPI_IPMI_MAX_MSG_LENGTH) {
+                dev_WARN_ONCE(tx_msg->device->dev, true,
+                              "Unexpected request (msg len %d).\n",
+                              buffer->length);
+                return -EINVAL;
+        }
        msg->data_len = buffer->length;
-        memcpy(tx_msg->tx_data, buffer->data, msg->data_len);
+        memcpy(tx_msg->data, buffer->data, msg->data_len);
        /*
         * now the default type is SYSTEM_INTERFACE and channel type is BMC.
         * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE,
@@ -179,14 +302,17 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,
        /* Get the msgid */
        device = tx_msg->device;
        spin_lock_irqsave(&device->tx_msg_lock, flags);
        device->curr_msgid++;
        tx_msg->tx_msgid = device->curr_msgid;
        spin_unlock_irqrestore(&device->tx_msg_lock, flags);
+        return 0;
 }
 static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
-                acpi_integer *value, int rem_time)
+                                      acpi_integer *value)
 {
        struct acpi_ipmi_buffer *buffer;
@@ -195,110 +321,158 @@ static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
         * IPMI message returned by IPMI command.
         */
        buffer = (struct acpi_ipmi_buffer *)value;
-        if (!rem_time && !msg->msg_done) {
-                buffer->status = ACPI_IPMI_TIMEOUT;
-                return;
-        }
        /*
-         * If the flag of msg_done is not set or the recv length is zero, it
+         * If the flag of msg_done is not set, it means that the IPMI command is
-         * means that the IPMI command is not executed correctly.
+         * not executed correctly.
-         * The status code will be ACPI_IPMI_UNKNOWN.
         */
-        if (!msg->msg_done || !msg->rx_len) {
+        buffer->status = msg->msg_done;
-                buffer->status = ACPI_IPMI_UNKNOWN;
+        if (msg->msg_done != ACPI_IPMI_OK)
                return;
-        }
        /*
         * If the IPMI response message is obtained correctly, the status code
         * will be ACPI_IPMI_OK
         */
-        buffer->status = ACPI_IPMI_OK;
        buffer->length = msg->rx_len;
-        memcpy(buffer->data, msg->rx_data, msg->rx_len);
+        memcpy(buffer->data, msg->data, msg->rx_len);
 }
 static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi)
 {
-        struct acpi_ipmi_msg *tx_msg, *temp;
+        struct acpi_ipmi_msg *tx_msg;
-        int count = HZ / 10;
+        unsigned long flags;
-        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+        /*
+         * NOTE: On-going ipmi_recv_msg
+         * ipmi_msg_handler() may still be invoked by ipmi_si after
+         * flushing.  But it is safe to do a fast flushing on module_exit()
+         * without waiting for all ipmi_recv_msg(s) to complete from
+         * ipmi_msg_handler() as it is ensured by ipmi_si that all
+         * ipmi_recv_msg(s) are freed after invoking ipmi_destroy_user().
+         */
+        spin_lock_irqsave(&ipmi->tx_msg_lock, flags);
+        while (!list_empty(&ipmi->tx_msg_list)) {
+                tx_msg = list_first_entry(&ipmi->tx_msg_list,
+                                          struct acpi_ipmi_msg,
+                                          head);
+                list_del(&tx_msg->head);
+                spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags);
-        list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) {
                /* wake up the sleep thread on the Tx msg */
                complete(&tx_msg->tx_complete);
+                acpi_ipmi_msg_put(tx_msg);
+                spin_lock_irqsave(&ipmi->tx_msg_lock, flags);
        }
+        spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags);
+}
+static void ipmi_cancel_tx_msg(struct acpi_ipmi_device *ipmi,
+                               struct acpi_ipmi_msg *msg)
+{
+        struct acpi_ipmi_msg *tx_msg, *temp;
+        bool msg_found = false;
+        unsigned long flags;
-        /* wait for about 100ms to flush the tx message list */
+        spin_lock_irqsave(&ipmi->tx_msg_lock, flags);
-        while (count--) {
+        list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) {
-                if (list_empty(&ipmi->tx_msg_list))
+                if (msg == tx_msg) {
+                        msg_found = true;
+                        list_del(&tx_msg->head);
                        break;
-                schedule_timeout(1);
+                }
        }
-        if (!list_empty(&ipmi->tx_msg_list))
+        spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags);
-                dev_warn(&pnp_dev->dev, "tx msg list is not NULL\n");
+        if (msg_found)
+                acpi_ipmi_msg_put(tx_msg);
 }
 static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
 {
        struct acpi_ipmi_device *ipmi_device = user_msg_data;
-        int msg_found = 0;
+        bool msg_found = false;
-        struct acpi_ipmi_msg *tx_msg;
+        struct acpi_ipmi_msg *tx_msg, *temp;
-        struct pnp_dev *pnp_dev = ipmi_device->pnp_dev;
+        struct device *dev = ipmi_device->dev;
        unsigned long flags;
        if (msg->user != ipmi_device->user_interface) {
-                dev_warn(&pnp_dev->dev, "Unexpected response is returned. "
+                dev_warn(dev,
-                        "returned user %p, expected user %p\n",
+                         "Unexpected response is returned. returned user %p, expected user %p\n",
-                        msg->user, ipmi_device->user_interface);
+                         msg->user, ipmi_device->user_interface);
-                ipmi_free_recv_msg(msg);
+                goto out_msg;
-                return;
        }
        spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);
-        list_for_each_entry(tx_msg, &ipmi_device->tx_msg_list, head) {
+        list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) {
                if (msg->msgid == tx_msg->tx_msgid) {
-                        msg_found = 1;
+                        msg_found = true;
+                        list_del(&tx_msg->head);
                        break;
                }
        }
        spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
        if (!msg_found) {
-                dev_warn(&pnp_dev->dev, "Unexpected response (msg id %ld) is "
+                dev_warn(dev,
-                        "returned.\n", msg->msgid);
+                         "Unexpected response (msg id %ld) is returned.\n",
-                ipmi_free_recv_msg(msg);
+                         msg->msgid);
-                return;
+                goto out_msg;
        }
-        if (msg->msg.data_len) {
+        /* copy the response data to Rx_data buffer */
-                /* copy the response data to Rx_data buffer */
+        if (msg->msg.data_len > ACPI_IPMI_MAX_MSG_LENGTH) {
-                memcpy(tx_msg->rx_data, msg->msg_data, msg->msg.data_len);
+                dev_WARN_ONCE(dev, true,
-                tx_msg->rx_len = msg->msg.data_len;
+                              "Unexpected response (msg len %d).\n",
-                tx_msg->msg_done = 1;
+                              msg->msg.data_len);
+                goto out_comp;
        }
+        /* response msg is an error msg */
+        msg->recv_type = IPMI_RESPONSE_RECV_TYPE;
+        if (msg->recv_type == IPMI_RESPONSE_RECV_TYPE &&
+            msg->msg.data_len == 1) {
+                if (msg->msg.data[0] == IPMI_TIMEOUT_COMPLETION_CODE) {
+                        dev_WARN_ONCE(dev, true,
+                                      "Unexpected response (timeout).\n");
+                        tx_msg->msg_done = ACPI_IPMI_TIMEOUT;
+                }
+                goto out_comp;
+        }
+        tx_msg->rx_len = msg->msg.data_len;
+        memcpy(tx_msg->data, msg->msg.data, tx_msg->rx_len);
+        tx_msg->msg_done = ACPI_IPMI_OK;
+out_comp:
        complete(&tx_msg->tx_complete);
+        acpi_ipmi_msg_put(tx_msg);
+out_msg:
        ipmi_free_recv_msg(msg);
-};
+}
 static void ipmi_register_bmc(int iface, struct device *dev)
 {
        struct acpi_ipmi_device *ipmi_device, *temp;
-        struct pnp_dev *pnp_dev;
-        ipmi_user_t             user;
        int err;
        struct ipmi_smi_info smi_data;
        acpi_handle handle;
        err = ipmi_get_smi_info(iface, &smi_data);
        if (err)
                return;
-        if (smi_data.addr_src != SI_ACPI) {
+        if (smi_data.addr_src != SI_ACPI)
-                put_device(smi_data.dev);
+                goto err_ref;
-                return;
-        }
        handle = smi_data.addr_info.acpi_info.acpi_handle;
+        if (!handle)
+                goto err_ref;
+        ipmi_device = ipmi_dev_alloc(iface, smi_data.dev, handle);
+        if (!ipmi_device) {
+                dev_warn(smi_data.dev, "Can't create IPMI user interface\n");
+                goto err_ref;
+        }
        mutex_lock(&driver_data.ipmi_lock);
        list_for_each_entry(temp, &driver_data.ipmi_devices, head) {
@@ -307,34 +481,20 @@ static void ipmi_register_bmc(int iface, struct device *dev)
                 * to the device list, don't add it again.
                 */
                if (temp->handle == handle)
-                        goto out;
+                        goto err_lock;
        }
+        if (!driver_data.selected_smi)
-        ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL);
+                driver_data.selected_smi = ipmi_device;
+        list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices);
-        if (!ipmi_device)
-                goto out;
-        pnp_dev = to_pnp_dev(smi_data.dev);
-        ipmi_device->handle = handle;
-        ipmi_device->pnp_dev = pnp_dev;
-        err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs,
-                                        ipmi_device, &user);
-        if (err) {
-                dev_warn(&pnp_dev->dev, "Can't create IPMI user interface\n");
-                kfree(ipmi_device);
-                goto out;
-        }
-        acpi_add_ipmi_device(ipmi_device);
-        ipmi_device->user_interface = user;
-        ipmi_device->ipmi_ifnum = iface;
        mutex_unlock(&driver_data.ipmi_lock);
-        memcpy(&ipmi_device->smi_data, &smi_data, sizeof(struct ipmi_smi_info));
+        put_device(smi_data.dev);
        return;
-out:
+err_lock:
        mutex_unlock(&driver_data.ipmi_lock);
+        ipmi_dev_release(ipmi_device);
+err_ref:
        put_device(smi_data.dev);
        return;
 }
@@ -342,23 +502,29 @@ out:
 static void ipmi_bmc_gone(int iface)
 {
        struct acpi_ipmi_device *ipmi_device, *temp;
+        bool dev_found = false;
        mutex_lock(&driver_data.ipmi_lock);
        list_for_each_entry_safe(ipmi_device, temp,
-                                &driver_data.ipmi_devices, head) {
+                                 &driver_data.ipmi_devices, head) {
-                if (ipmi_device->ipmi_ifnum != iface)
+                if (ipmi_device->ipmi_ifnum != iface) {
-                        continue;
+                        dev_found = true;
+                        __ipmi_dev_kill(ipmi_device);
-                acpi_remove_ipmi_device(ipmi_device);
+                        break;
-                put_device(ipmi_device->smi_data.dev);
+                }
-                kfree(ipmi_device);
-                break;
        }
+        if (!driver_data.selected_smi)
+                driver_data.selected_smi = list_first_entry_or_null(
+                                        &driver_data.ipmi_devices,
+                                        struct acpi_ipmi_device, head);
        mutex_unlock(&driver_data.ipmi_lock);
+        if (dev_found) {
+                ipmi_flush_tx_msg(ipmi_device);
+                acpi_ipmi_dev_put(ipmi_device);
+        }
 }
-/* --------------------------------------------------------------------------
- *                      Address Space Management
- * -------------------------------------------------------------------------- */
 /*
 * This is the IPMI opregion space handler.
 * @function: indicates the read/write. In fact as the IPMI message is driven
@@ -371,17 +537,17 @@ static void ipmi_bmc_gone(int iface)
 *           the response IPMI message returned by IPMI command.
 * @handler_context: IPMI device context.
 */
 static acpi_status
 acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
-                      u32 bits, acpi_integer *value,
+                        u32 bits, acpi_integer *value,
-                      void *handler_context, void *region_context)
+                        void *handler_context, void *region_context)
 {
        struct acpi_ipmi_msg *tx_msg;
-        struct acpi_ipmi_device *ipmi_device = handler_context;
+        struct acpi_ipmi_device *ipmi_device;
-        int err, rem_time;
+        int err;
        acpi_status status;
        unsigned long flags;
        /*
         * IPMI opregion message.
         * IPMI message is firstly written to the BMC and system software
@@ -391,118 +557,75 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
        if ((function & ACPI_IO_MASK) == ACPI_READ)
                return AE_TYPE;
-        if (!ipmi_device->user_interface)
+        tx_msg = ipmi_msg_alloc();
+        if (!tx_msg)
                return AE_NOT_EXIST;
+        ipmi_device = tx_msg->device;
-        tx_msg = acpi_alloc_ipmi_msg(ipmi_device);
+        if (acpi_format_ipmi_request(tx_msg, address, value) != 0) {
-        if (!tx_msg)
+                ipmi_msg_release(tx_msg);
-                return AE_NO_MEMORY;
+                return AE_TYPE;
+        }
-        acpi_format_ipmi_msg(tx_msg, address, value);
+        acpi_ipmi_msg_get(tx_msg);
+        mutex_lock(&driver_data.ipmi_lock);
+        /* Do not add a tx_msg that can not be flushed. */
+        if (ipmi_device->dead) {
+                mutex_unlock(&driver_data.ipmi_lock);
+                ipmi_msg_release(tx_msg);
+                return AE_NOT_EXIST;
+        }
        spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);
        list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list);
        spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
+        mutex_unlock(&driver_data.ipmi_lock);
        err = ipmi_request_settime(ipmi_device->user_interface,
-                                        &tx_msg->addr,
+                                   &tx_msg->addr,
-                                        tx_msg->tx_msgid,
+                                   tx_msg->tx_msgid,
-                                        &tx_msg->tx_message,
+                                   &tx_msg->tx_message,
-                                        NULL, 0, 0, 0);
+                                   NULL, 0, 0, IPMI_TIMEOUT);
        if (err) {
                status = AE_ERROR;
-                goto end_label;
+                goto out_msg;
        }
-        rem_time = wait_for_completion_timeout(&tx_msg->tx_complete,
+        wait_for_completion(&tx_msg->tx_complete);
-                                        IPMI_TIMEOUT);
-        acpi_format_ipmi_response(tx_msg, value, rem_time);
+        acpi_format_ipmi_response(tx_msg, value);
        status = AE_OK;
-end_label:
+out_msg:
-        spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);
+        ipmi_cancel_tx_msg(ipmi_device, tx_msg);
-        list_del(&tx_msg->head);
+        acpi_ipmi_msg_put(tx_msg);
-        spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
-        kfree(tx_msg);
        return status;
 }
-static void ipmi_remove_space_handler(struct acpi_ipmi_device *ipmi)
+static int __init acpi_ipmi_init(void)
-{
-        if (!test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
-                return;
-        acpi_remove_address_space_handler(ipmi->handle,
-                                ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler);
-        clear_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
-}
-static int ipmi_install_space_handler(struct acpi_ipmi_device *ipmi)
 {
+        int result;
        acpi_status status;
-        if (test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
+        if (acpi_disabled)
                return 0;
-        status = acpi_install_address_space_handler(ipmi->handle,
+        status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
                                                    ACPI_ADR_SPACE_IPMI,
                                                    &acpi_ipmi_space_handler,
-                                                    NULL, ipmi);
+                                                    NULL, NULL);
        if (ACPI_FAILURE(status)) {
-                struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+                pr_warn("Can't register IPMI opregion space handle\n");
-                dev_warn(&pnp_dev->dev, "Can't register IPMI opregion space "
-                        "handle\n");
                return -EINVAL;
        }
-        set_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
-        return 0;
-}
-static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device)
-{
-        INIT_LIST_HEAD(&ipmi_device->head);
-        spin_lock_init(&ipmi_device->tx_msg_lock);
-        INIT_LIST_HEAD(&ipmi_device->tx_msg_list);
-        ipmi_install_space_handler(ipmi_device);
-        list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices);
-}
-static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device)
-{
-        /*
-         * If the IPMI user interface is created, it should be
-         * destroyed.
-         */
-        if (ipmi_device->user_interface) {
-                ipmi_destroy_user(ipmi_device->user_interface);
-                ipmi_device->user_interface = NULL;
-        }
-        /* flush the Tx_msg list */
-        if (!list_empty(&ipmi_device->tx_msg_list))
-                ipmi_flush_tx_msg(ipmi_device);
-        list_del(&ipmi_device->head);
-        ipmi_remove_space_handler(ipmi_device);
-}
-static int __init acpi_ipmi_init(void)
-{
-        int result = 0;
-        if (acpi_disabled)
-                return result;
-        mutex_init(&driver_data.ipmi_lock);
        result = ipmi_smi_watcher_register(&driver_data.bmc_events);
+        if (result)
+                pr_err("Can't register IPMI system interface watcher\n");
        return result;
 }
 static void __exit acpi_ipmi_exit(void)
 {
-        struct acpi_ipmi_device *ipmi_device, *temp;
+        struct acpi_ipmi_device *ipmi_device;
        if (acpi_disabled)
                return;
@@ -516,13 +639,22 @@ static void __exit acpi_ipmi_exit(void)
         * handler and free it.
         */
        mutex_lock(&driver_data.ipmi_lock);
-        list_for_each_entry_safe(ipmi_device, temp,
+        while (!list_empty(&driver_data.ipmi_devices)) {
-                                &driver_data.ipmi_devices, head) {
+                ipmi_device = list_first_entry(&driver_data.ipmi_devices,
-                acpi_remove_ipmi_device(ipmi_device);
+                                               struct acpi_ipmi_device,
-                put_device(ipmi_device->smi_data.dev);
+                                               head);
-                kfree(ipmi_device);
+                __ipmi_dev_kill(ipmi_device);
+                mutex_unlock(&driver_data.ipmi_lock);
+                ipmi_flush_tx_msg(ipmi_device);
+                acpi_ipmi_dev_put(ipmi_device);
+                mutex_lock(&driver_data.ipmi_lock);
        }
        mutex_unlock(&driver_data.ipmi_lock);
+        acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
+                                          ACPI_ADR_SPACE_IPMI,
+                                          &acpi_ipmi_space_handler);
 }
 module_init(acpi_ipmi_init);
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index fb78bb9ad8f6..d3961014aad7 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -30,6 +30,7 @@ ACPI_MODULE_NAME("acpi_lpss");
 /* Offsets relative to LPSS_PRIVATE_OFFSET */
 #define LPSS_GENERAL                    0x08
 #define LPSS_GENERAL_LTR_MODE_SW        BIT(2)
+#define LPSS_GENERAL_UART_RTS_OVRD      BIT(3)
 #define LPSS_SW_LTR                     0x10
 #define LPSS_AUTO_LTR                   0x14
 #define LPSS_TX_INT                     0x20
@@ -68,11 +69,16 @@ struct lpss_private_data {
 static void lpss_uart_setup(struct lpss_private_data *pdata)
 {
-        unsigned int tx_int_offset = pdata->dev_desc->prv_offset + LPSS_TX_INT;
+        unsigned int offset;
        u32 reg;
-        reg = readl(pdata->mmio_base + tx_int_offset);
+        offset = pdata->dev_desc->prv_offset + LPSS_TX_INT;
-        writel(reg | LPSS_TX_INT_MASK, pdata->mmio_base + tx_int_offset);
+        reg = readl(pdata->mmio_base + offset);
+        writel(reg | LPSS_TX_INT_MASK, pdata->mmio_base + offset);
+        offset = pdata->dev_desc->prv_offset + LPSS_GENERAL;
+        reg = readl(pdata->mmio_base + offset);
+        writel(reg | LPSS_GENERAL_UART_RTS_OVRD, pdata->mmio_base + offset);
 }
 static struct lpss_device_desc lpt_dev_desc = {
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 999adb5499c7..551dad712ffe 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -152,8 +152,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
        unsigned long long current_status;
        /* Get device present/absent information from the _STA */
-        if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA",
+        if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle,
-                                               NULL, &current_status)))
+                                               METHOD_NAME__STA, NULL,
+                                               &current_status)))
                return -ENODEV;
        /*
         * Check for device status. Device should be
@@ -281,7 +282,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
                if (!info->enabled)
                        continue;
-                if (nid < 0)
+                if (nid == NUMA_NO_NODE)
                        nid = memory_add_physaddr_to_nid(info->start_addr);
                acpi_unbind_memory_blocks(info, handle);
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 1bde12708f9e..8a4cfc7e71f0 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -29,6 +29,13 @@ ACPI_MODULE_NAME("platform");
 static const struct acpi_device_id acpi_platform_device_ids[] = {
        { "PNP0D40" },
+        { "ACPI0003" },
+        { "VPC2004" },
+        { "BCM4752" },
+        /* Intel Smart Sound Technology */
+        { "INT33C8" },
+        { "80860F28" },
        { }
 };
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index f29e06efa479..3c1d6b0c09a4 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -140,15 +140,11 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
        return 0;
 }
-static int acpi_processor_errata(struct acpi_processor *pr)
+static int acpi_processor_errata(void)
 {
        int result = 0;
        struct pci_dev *dev = NULL;
-        if (!pr)
-                return -EINVAL;
        /*
         * PIIX4
         */
@@ -181,7 +177,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr)
        cpu_maps_update_begin();
        cpu_hotplug_begin();
-        ret = acpi_map_lsapic(pr->handle, &pr->id);
+        ret = acpi_map_lsapic(pr->handle, pr->apic_id, &pr->id);
        if (ret)
                goto out;
@@ -219,11 +215,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
        int cpu_index, device_declaration = 0;
        acpi_status status = AE_OK;
        static int cpu0_initialized;
+        unsigned long long value;
-        if (num_online_cpus() > 1)
+        acpi_processor_errata();
-                errata.smp = TRUE;
-        acpi_processor_errata(pr);
        /*
         * Check to see if we have bus mastering arbitration control.  This
@@ -247,18 +241,12 @@ static int acpi_processor_get_info(struct acpi_device *device)
                        return -ENODEV;
                }
-                /*
-                 * 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;
        } else {
                /*
                 * Declared with "Device" statement; match _UID.
                 * Note that we don't handle string _UIDs yet.
                 */
-                unsigned long long value;
                status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
                                                NULL, &value);
                if (ACPI_FAILURE(status)) {
@@ -270,7 +258,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
                device_declaration = 1;
                pr->acpi_id = value;
        }
-        cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id);
+        pr->apic_id = acpi_get_apicid(pr->handle, device_declaration,
+                                        pr->acpi_id);
+        cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id);
        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
        if (!cpu0_initialized && (cpu_index == -1) &&
@@ -332,9 +322,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
         * ensure we get the right value in the "physical id" field
         * of /proc/cpuinfo
         */
-        status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);
+        status = acpi_evaluate_integer(pr->handle, "_SUN", NULL, &value);
        if (ACPI_SUCCESS(status))
-                arch_fix_phys_package_id(pr->id, object.integer.value);
+                arch_fix_phys_package_id(pr->id, value);
        return 0;
 }
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 9feba08c29fe..a9fd0b872062 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -114,10 +114,12 @@ ACPI_HW_DEPENDENT_RETURN_VOID(void
                              acpi_db_generate_gpe(char *gpe_arg,
                                                   char *block_arg))
+ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))
 /*
 * dbconvert - miscellaneous conversion routines
 */
- acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value);
+acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value);
 acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object);
@@ -154,6 +156,8 @@ void acpi_db_set_scope(char *name);
 void acpi_db_dump_namespace(char *start_arg, char *depth_arg);
+void acpi_db_dump_namespace_paths(void);
 void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);
 acpi_status acpi_db_find_name_in_namespace(char *name_arg);
@@ -240,6 +244,8 @@ void acpi_db_display_history(void);
 char *acpi_db_get_from_history(char *command_num_arg);
+char *acpi_db_get_history_by_index(u32 commandd_num);
 /*
 * dbinput - user front-end to the AML debugger
 */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index ab0e97710381..41abe552c7a3 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -71,7 +71,8 @@ acpi_status acpi_ev_init_global_lock_handler(void);
 ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
                            acpi_ev_acquire_global_lock(u16 timeout))
- ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
+ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
 acpi_status acpi_ev_remove_global_lock_handler(void);
 /*
@@ -242,11 +243,11 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
 */
 u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context);
-u32 acpi_ev_install_sci_handler(void);
+u32 acpi_ev_sci_dispatch(void);
-acpi_status acpi_ev_remove_sci_handler(void);
+u32 acpi_ev_install_sci_handler(void);
-u32 acpi_ev_initialize_SCI(u32 program_SCI);
+acpi_status acpi_ev_remove_all_sci_handlers(void);
 ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))
 #endif                          /* __ACEVENTS_H__  */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 90e846f985fa..e9f1fc7f99c7 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -269,6 +269,7 @@ ACPI_EXTERN acpi_table_handler acpi_gbl_table_handler;
 ACPI_EXTERN void *acpi_gbl_table_handler_context;
 ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;
 ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler;
+ACPI_EXTERN struct acpi_sci_handler_info *acpi_gbl_sci_handler_list;
 /* Owner ID support */
@@ -405,7 +406,9 @@ extern u32 acpi_gbl_nesting_level;
 /* Event counters */
+ACPI_EXTERN u32 acpi_method_count;
 ACPI_EXTERN u32 acpi_gpe_count;
+ACPI_EXTERN u32 acpi_sci_count;
 ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
 /* Support for dynamic control method tracing mechanism */
@@ -445,13 +448,6 @@ ACPI_EXTERN u8 acpi_gbl_db_opt_tables;
 ACPI_EXTERN u8 acpi_gbl_db_opt_stats;
 ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;
 ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support;
-ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char acpi_gbl_db_scope_buf[80];
-ACPI_EXTERN char acpi_gbl_db_debug_filename[80];
 ACPI_EXTERN u8 acpi_gbl_db_output_to_file;
 ACPI_EXTERN char *acpi_gbl_db_buffer;
 ACPI_EXTERN char *acpi_gbl_db_filename;
@@ -459,6 +455,16 @@ ACPI_EXTERN u32 acpi_gbl_db_debug_level;
 ACPI_EXTERN u32 acpi_gbl_db_console_debug_level;
 ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node;
+ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];
+/* These buffers should all be the same size */
+ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_EXTERN char acpi_gbl_db_scope_buf[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_EXTERN char acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE];
 /*
 * Statistic globals
 */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 0ed00669cd21..53ed1a8ba4f0 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -398,6 +398,14 @@ struct acpi_simple_repair_info {
 *
 ****************************************************************************/
+/* Dispatch info for each host-installed SCI handler */
+struct acpi_sci_handler_info {
+        struct acpi_sci_handler_info *next;
+        acpi_sci_handler address;       /* Address of handler */
+        void *context;          /* Context to be passed to handler */
+};
 /* Dispatch info for each GPE -- either a method or handler, cannot be both */
 struct acpi_gpe_handler_info {
@@ -1064,7 +1072,7 @@ struct acpi_db_method_info {
        char *name;
        u32 flags;
        u32 num_loops;
-        char pathname[128];
+        char pathname[ACPI_DB_LINE_BUFFER_SIZE];
        char **args;
        acpi_object_type *types;
@@ -1086,6 +1094,7 @@ struct acpi_integrity_info {
        u32 objects;
 };
+#define ACPI_DB_DISABLE_OUTPUT          0x00
 #define ACPI_DB_REDIRECTABLE_OUTPUT     0x01
 #define ACPI_DB_CONSOLE_OUTPUT          0x02
 #define ACPI_DB_DUPLICATE_OUTPUT        0x03
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 530a2f8c1252..2a86c65d873b 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -410,37 +410,6 @@
 #endif
 /*
- * Memory allocation tracking (DEBUG ONLY)
- */
-#define ACPI_MEM_PARAMETERS         _COMPONENT, _acpi_module_name, __LINE__
-#ifndef ACPI_DBG_TRACK_ALLOCATIONS
-/* Memory allocation */
-#ifndef ACPI_ALLOCATE
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size) (a), ACPI_MEM_PARAMETERS)
-#endif
-#ifndef ACPI_ALLOCATE_ZEROED
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size) (a), ACPI_MEM_PARAMETERS)
-#endif
-#ifndef ACPI_FREE
-#define ACPI_FREE(a)                acpi_os_free(a)
-#endif
-#define ACPI_MEM_TRACKING(a)
-#else
-/* Memory allocation */
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_FREE(a)                acpi_ut_free_and_track(a, ACPI_MEM_PARAMETERS)
-#define ACPI_MEM_TRACKING(a)        a
-#endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
-/*
 * Macros used for ACPICA utilities only
 */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 40b04bd5579e..e6138ac4a160 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -213,6 +213,12 @@ acpi_ns_dump_objects(acpi_object_type type,
                     u8 display_type,
                     u32 max_depth,
                     acpi_owner_id owner_id, acpi_handle start_handle);
+void
+acpi_ns_dump_object_paths(acpi_object_type type,
+                          u8 display_type,
+                          u32 max_depth,
+                          acpi_owner_id owner_id, acpi_handle start_handle);
 #endif                          /* ACPI_FUTURE_USAGE */
 /*
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index d5a62a6182bb..be8180c17d7e 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -628,6 +628,17 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position);
 void acpi_ut_repair_name(char *name);
+#if defined (ACPI_DEBUGGER) || defined (ACPI_APPLICATION)
+u8 acpi_ut_safe_strcpy(char *dest, acpi_size dest_size, char *source);
+u8 acpi_ut_safe_strcat(char *dest, acpi_size dest_size, char *source);
+u8
+acpi_ut_safe_strncat(char *dest,
+                     acpi_size dest_size,
+                     char *source, acpi_size max_transfer_length);
+#endif
 /*
 * utmutex - mutex support
 */
@@ -652,12 +663,6 @@ acpi_status
 acpi_ut_initialize_buffer(struct acpi_buffer *buffer,
                          acpi_size required_length);
-void *acpi_ut_allocate(acpi_size size,
-                       u32 component, const char *module, u32 line);
-void *acpi_ut_allocate_zeroed(acpi_size size,
-                              u32 component, const char *module, u32 line);
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 void *acpi_ut_allocate_and_track(acpi_size size,
                                 u32 component, const char *module, u32 line);
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index fb09b08d7080..afdc6df17abf 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -158,7 +158,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
        walk_state->deferred_node = node;
        status = acpi_ps_parse_aml(walk_state);
-      cleanup:
+cleanup:
        acpi_ps_delete_parse_tree(op);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index d4bfe7b7f90a..2d4c07322576 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -259,7 +259,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                goto cleanup;
        }
-      cleanup:
+cleanup:
        /* Remove local reference to the object */
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index a9ffd44c18fe..81a78ba84311 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -292,9 +292,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
         * reentered one more time (even if it is the same thread)
         */
        obj_desc->method.thread_count++;
+        acpi_method_count++;
        return_ACPI_STATUS(status);
-      cleanup:
+cleanup:
        /* On error, must release the method mutex (if present) */
        if (obj_desc->method.mutex) {
@@ -424,7 +425,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
        return_ACPI_STATUS(status);
-      cleanup:
+cleanup:
        /* On error, we must terminate the method properly */
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 63f0d220ca3d..b1746a68dad1 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -240,7 +240,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(status);
        }
-      exit:
+exit:
        *obj_desc_ptr = obj_desc;
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 1fc1ff114f26..5205edcf2c01 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -257,7 +257,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
            (buffer_desc->common.reference_count +
             obj_desc->common.reference_count);
-      cleanup:
+cleanup:
        /* Always delete the operands */
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index c666fc014987..ade44e49deb4 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -299,7 +299,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                goto result_used;
        }
-      result_used:
+result_used:
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                          "Result of [%s] used by Parent [%s] Op=%p\n",
                          acpi_ps_get_opcode_name(op->common.aml_opcode),
@@ -308,7 +308,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
        return_UINT8(TRUE);
-      result_not_used:
+result_not_used:
        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                          "Result of [%s] not used by Parent [%s] Op=%p\n",
                          acpi_ps_get_opcode_name(op->common.aml_opcode),
@@ -752,7 +752,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
        return_ACPI_STATUS(status);
-      cleanup:
+cleanup:
        /*
         * We must undo everything done above; meaning that we must
         * pop everything off of the operand stack and delete those
@@ -851,7 +851,7 @@ acpi_status acpi_ds_evaluate_name_path(struct acpi_walk_state *walk_state)
                goto exit;
        }
-      push_result:
+push_result:
        walk_state->result_obj = new_obj_desc;
@@ -863,7 +863,7 @@ acpi_status acpi_ds_evaluate_name_path(struct acpi_walk_state *walk_state)
                op->common.flags |= ACPI_PARSEOP_IN_STACK;
        }
-      exit:
+exit:
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 151d924817e1..1bbb22fd6fa0 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -170,7 +170,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
        (void)acpi_ds_do_implicit_return(local_obj_desc, walk_state, TRUE);
-      cleanup:
+cleanup:
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Completed a predicate eval=%X Op=%p\n",
                          walk_state->control_state->common.value,
@@ -335,7 +335,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
        return_ACPI_STATUS(status);
-      error_exit:
+error_exit:
        status = acpi_ds_method_error(status, walk_state);
        return_ACPI_STATUS(status);
 }
@@ -722,7 +722,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                walk_state->result_obj = NULL;
        }
-      cleanup:
+cleanup:
        if (walk_state->result_obj) {
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index b1f8f4725c23..7f569d573027 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -728,7 +728,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                break;
        }
-      cleanup:
+cleanup:
        /* Remove the Node pushed at the very beginning */
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index fdb0a76e40a3..4c67193a9fa7 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -173,7 +173,7 @@ static u32 acpi_ev_global_lock_handler(void *context)
        acpi_gbl_global_lock_pending = FALSE;
-      cleanup_and_exit:
+cleanup_and_exit:
        acpi_os_release_lock(acpi_gbl_global_lock_pending_lock, flags);
        return (ACPI_INTERRUPT_HANDLED);
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index c8a1f7d5931f..a9cb4a1a4bb8 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -458,7 +458,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                gpe_block = gpe_block->next;
        }
-      unlock_and_exit:
+unlock_and_exit:
        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
        return (int_status);
@@ -522,6 +522,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
        status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(local_gpe_event_info);
                return_VOID;
        }
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index c1aa1eda26c3..a9e76bc4ad97 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -111,7 +111,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
        gpe_block->xrupt_block = gpe_xrupt_block;
        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-      unlock_and_exit:
+unlock_and_exit:
        status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
@@ -178,7 +178,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
        ACPI_FREE(gpe_block->event_info);
        ACPI_FREE(gpe_block);
-      unlock_and_exit:
+unlock_and_exit:
        status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
@@ -302,7 +302,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
        return_ACPI_STATUS(AE_OK);
-      error_exit:
+error_exit:
        if (gpe_register_info) {
                ACPI_FREE(gpe_register_info);
        }
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 7842700346a4..a3e2f38aadf6 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -203,7 +203,7 @@ acpi_status acpi_ev_gpe_initialize(void)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index b24dbb80fab8..d3f5e1e2a2b1 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -101,7 +101,7 @@ acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context)
                gpe_xrupt_info = gpe_xrupt_info->next;
        }
-      unlock_and_exit:
+unlock_and_exit:
        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
        return_ACPI_STATUS(status);
 }
@@ -196,7 +196,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 *
 * FUNCTION:    acpi_ev_get_gpe_xrupt_block
 *
- * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
+ * PARAMETERS:  interrupt_number            - Interrupt for a GPE block
 *
 * RETURN:      A GPE interrupt block
 *
diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c
index 068af96134b8..e3157313eb27 100644
--- a/drivers/acpi/acpica/evhandler.c
+++ b/drivers/acpi/acpica/evhandler.c
@@ -129,7 +129,7 @@ acpi_status acpi_ev_install_region_handlers(void)
                }
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
@@ -531,6 +531,6 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
                                        acpi_ev_install_handler, NULL,
                                        handler_obj, NULL);
-      unlock_and_exit:
+unlock_and_exit:
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 1b111ef74903..a5687540e9a6 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -264,13 +264,6 @@ void acpi_ev_terminate(void)
                status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL);
-                /* Remove SCI handler */
-                status = acpi_ev_remove_sci_handler();
-                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,
@@ -280,6 +273,13 @@ void acpi_ev_terminate(void)
                acpi_gbl_events_initialized = FALSE;
        }
+        /* Remove SCI handlers */
+        status = acpi_ev_remove_all_sci_handlers();
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not remove SCI handler"));
+        }
        /* Deallocate all handler objects installed within GPE info structs */
        status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL);
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index cea14d6fc76c..144cbb9b73bc 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -217,16 +217,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
                        region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
-                        if (region_obj2->extra.region_context) {
+                        /*
+                         * Save the returned context for use in all accesses to
-                                /* The handler for this region was already installed */
+                         * the handler for this particular region
+                         */
-                                ACPI_FREE(region_context);
+                        if (!(region_obj2->extra.region_context)) {
-                        } else {
-                                /*
-                                 * Save the returned context for use in all accesses to
-                                 * this particular region
-                                 */
                                region_obj2->extra.region_context =
                                    region_context;
                        }
@@ -402,6 +397,14 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                                                 handler_obj->address_space.
                                                 context, region_context);
+                                /*
+                                 * region_context should have been released by the deactivate
+                                 * operation. We don't need access to it anymore here.
+                                 */
+                                if (region_context) {
+                                        *region_context = NULL;
+                                }
                                /* Init routine may fail, Just ignore errors */
                                if (ACPI_FAILURE(status)) {
@@ -570,10 +573,10 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
        status = acpi_ns_evaluate(info);
        acpi_ut_remove_reference(args[1]);
-      cleanup2:
+cleanup2:
        acpi_ut_remove_reference(args[0]);
-      cleanup1:
+cleanup1:
        ACPI_FREE(info);
        return_ACPI_STATUS(status);
 }
@@ -758,7 +761,7 @@ acpi_ev_orphan_ec_reg_method(struct acpi_namespace_node *ec_device_node)
        status = acpi_evaluate_object(reg_method, NULL, &args, NULL);
-      exit:
+exit:
        /* We ignore all errors from above, don't care */
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index b905acf7aacd..9e9e3454d893 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -54,6 +54,50 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context);
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_ev_sci_dispatch
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status code indicates whether interrupt was handled.
+ *
+ * DESCRIPTION: Dispatch the SCI to all host-installed SCI handlers.
+ *
+ ******************************************************************************/
+u32 acpi_ev_sci_dispatch(void)
+{
+        struct acpi_sci_handler_info *sci_handler;
+        acpi_cpu_flags flags;
+        u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
+        ACPI_FUNCTION_NAME(ev_sci_dispatch);
+        /* Are there any host-installed SCI handlers? */
+        if (!acpi_gbl_sci_handler_list) {
+                return (int_status);
+        }
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        /* Invoke all host-installed SCI handlers */
+        sci_handler = acpi_gbl_sci_handler_list;
+        while (sci_handler) {
+                /* Invoke the installed handler (at interrupt level) */
+                int_status |= sci_handler->address(sci_handler->context);
+                sci_handler = sci_handler->next;
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return (int_status);
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ev_sci_xrupt_handler
 *
 * PARAMETERS:  context   - Calling Context
@@ -89,6 +133,11 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
         */
        interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
+        /* Invoke all host-installed SCI handlers */
+        interrupt_handled |= acpi_ev_sci_dispatch();
+        acpi_sci_count++;
        return_UINT32(interrupt_handled);
 }
@@ -112,14 +161,13 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
        ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler);
        /*
-         * We are guaranteed by the ACPI CA initialization/shutdown code that
+         * We are guaranteed by the ACPICA initialization/shutdown code that
         * if this interrupt handler is installed, ACPI is enabled.
         */
        /* GPEs: Check for and dispatch any GPEs that have occurred */
        interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
        return_UINT32(interrupt_handled);
 }
@@ -150,15 +198,15 @@ u32 acpi_ev_install_sci_handler(void)
 /******************************************************************************
 *
- * FUNCTION:    acpi_ev_remove_sci_handler
+ * FUNCTION:    acpi_ev_remove_all_sci_handlers
 *
 * PARAMETERS:  none
 *
- * RETURN:      E_OK if handler uninstalled OK, E_ERROR if handler was not
+ * RETURN:      AE_OK if handler uninstalled, AE_ERROR if handler was not
 *              installed to begin with
 *
 * DESCRIPTION: Remove the SCI interrupt handler. No further SCIs will be
- *              taken.
+ *              taken. Remove all host-installed SCI handlers.
 *
 * Note:  It doesn't seem important to disable all events or set the event
 *        enable registers to their original values. The OS should disable
@@ -167,11 +215,13 @@ u32 acpi_ev_install_sci_handler(void)
 *
 ******************************************************************************/
-acpi_status acpi_ev_remove_sci_handler(void)
+acpi_status acpi_ev_remove_all_sci_handlers(void)
 {
+        struct acpi_sci_handler_info *sci_handler;
+        acpi_cpu_flags flags;
        acpi_status status;
-        ACPI_FUNCTION_TRACE(ev_remove_sci_handler);
+        ACPI_FUNCTION_TRACE(ev_remove_all_sci_handlers);
        /* Just let the OS remove the handler and disable the level */
@@ -179,6 +229,21 @@ acpi_status acpi_ev_remove_sci_handler(void)
            acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt,
                                             acpi_ev_sci_xrupt_handler);
+        if (!acpi_gbl_sci_handler_list) {
+                return (status);
+        }
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        /* Free all host-installed SCI handlers */
+        while (acpi_gbl_sci_handler_list) {
+                sci_handler = acpi_gbl_sci_handler_list;
+                acpi_gbl_sci_handler_list = sci_handler->next;
+                ACPI_FREE(sci_handler);
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index ca5fba99c33b..23a7fadca412 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -374,7 +375,7 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
        acpi_gbl_exception_handler = handler;
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
@@ -385,6 +386,144 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_install_sci_handler
+ *
+ * PARAMETERS:  address             - Address of the handler
+ *              context             - Value passed to the handler on each SCI
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Install a handler for a System Control Interrupt.
+ *
+ ******************************************************************************/
+acpi_status acpi_install_sci_handler(acpi_sci_handler address, void *context)
+{
+        struct acpi_sci_handler_info *new_sci_handler;
+        struct acpi_sci_handler_info *sci_handler;
+        acpi_cpu_flags flags;
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(acpi_install_sci_handler);
+        if (!address) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        /* Allocate and init a handler object */
+        new_sci_handler = ACPI_ALLOCATE(sizeof(struct acpi_sci_handler_info));
+        if (!new_sci_handler) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+        new_sci_handler->address = address;
+        new_sci_handler->context = context;
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                goto exit;
+        }
+        /* Lock list during installation */
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        sci_handler = acpi_gbl_sci_handler_list;
+        /* Ensure handler does not already exist */
+        while (sci_handler) {
+                if (address == sci_handler->address) {
+                        status = AE_ALREADY_EXISTS;
+                        goto unlock_and_exit;
+                }
+                sci_handler = sci_handler->next;
+        }
+        /* Install the new handler into the global list (at head) */
+        new_sci_handler->next = acpi_gbl_sci_handler_list;
+        acpi_gbl_sci_handler_list = new_sci_handler;
+unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+exit:
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(new_sci_handler);
+        }
+        return_ACPI_STATUS(status);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_remove_sci_handler
+ *
+ * PARAMETERS:  address             - Address of the handler
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a handler for a System Control Interrupt.
+ *
+ ******************************************************************************/
+acpi_status acpi_remove_sci_handler(acpi_sci_handler address)
+{
+        struct acpi_sci_handler_info *prev_sci_handler;
+        struct acpi_sci_handler_info *next_sci_handler;
+        acpi_cpu_flags flags;
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(acpi_remove_sci_handler);
+        if (!address) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        /* Remove the SCI handler with lock */
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        prev_sci_handler = NULL;
+        next_sci_handler = acpi_gbl_sci_handler_list;
+        while (next_sci_handler) {
+                if (next_sci_handler->address == address) {
+                        /* Unlink and free the SCI handler info block */
+                        if (prev_sci_handler) {
+                                prev_sci_handler->next = next_sci_handler->next;
+                        } else {
+                                acpi_gbl_sci_handler_list =
+                                    next_sci_handler->next;
+                        }
+                        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+                        ACPI_FREE(next_sci_handler);
+                        goto unlock_and_exit;
+                }
+                prev_sci_handler = next_sci_handler;
+                next_sci_handler = next_sci_handler->next;
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        status = AE_NOT_EXIST;
+unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_install_global_event_handler
 *
 * PARAMETERS:  handler         - Pointer to the global event handler function
@@ -398,6 +537,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 *              Can be used to update event counters, etc.
 *
 ******************************************************************************/
 acpi_status
 acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)
 {
@@ -426,7 +566,7 @@ acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)
        acpi_gbl_global_event_handler = handler;
        acpi_gbl_global_event_handler_context = context;
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
@@ -498,7 +638,7 @@ acpi_install_fixed_event_handler(u32 event,
                                  handler));
        }
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 7039606a0ba8..39d06af5e347 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "actables.h"
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 7662f1a42ff6..5713da77c665 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
@@ -471,7 +472,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,
        if (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
                *event_status |= ACPI_EVENT_FLAG_HANDLE;
-      unlock_and_exit:
+unlock_and_exit:
        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
        return_ACPI_STATUS(status);
 }
@@ -624,7 +625,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
        obj_desc->device.gpe_block = gpe_block;
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
@@ -679,7 +680,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
                obj_desc->device.gpe_block = NULL;
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 80cecf838591..02ed75ac56cd 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -42,7 +42,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -147,7 +148,7 @@ acpi_install_address_space_handler(acpi_handle device,
        status = acpi_ev_execute_reg_methods(node, space_id);
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
@@ -286,7 +287,7 @@ acpi_remove_address_space_handler(acpi_handle device,
        status = AE_NOT_EXIST;
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 269e81d86ef4..3c2e6dcdad3e 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -193,7 +193,7 @@ acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state)
            acpi_ns_attach_object((struct acpi_namespace_node *)walk_state->
                                  operands[0], obj_desc, ACPI_TYPE_EVENT);
-      cleanup:
+cleanup:
        /*
         * Remove local reference to the object (on error, will cause deletion
         * of both object and semaphore if present.)
@@ -248,7 +248,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
            acpi_ns_attach_object(obj_desc->mutex.node, obj_desc,
                                  ACPI_TYPE_MUTEX);
-      cleanup:
+cleanup:
        /*
         * Remove local reference to the object (on error, will cause deletion
         * of both object and semaphore if present.)
@@ -347,7 +347,7 @@ acpi_ex_create_region(u8 * aml_start,
        status = acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_REGION);
-      cleanup:
+cleanup:
        /* Remove local reference to the object */
@@ -520,7 +520,7 @@ acpi_ex_create_method(u8 * aml_start,
        acpi_ut_remove_reference(obj_desc);
-      exit:
+exit:
        /* Remove a reference to the operand */
        acpi_ut_remove_reference(operand[1]);
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index c2a65aaf29af..cfd875243421 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -197,7 +197,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
        status = acpi_ex_extract_from_field(obj_desc, buffer, (u32) length);
        acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
-      exit:
+exit:
        if (ACPI_FAILURE(status)) {
                acpi_ut_remove_reference(buffer_desc);
        } else {
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 7e0afe72487e..49fb742d61b9 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -123,12 +123,6 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                }
        }
-        /* Exit if Address/Length have been disallowed by the host OS */
-        if (rgn_desc->common.flags & AOPOBJ_INVALID) {
-                return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
-        }
        /*
         * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear
         * address space and the request cannot be directly validated
@@ -1002,7 +996,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                                                mask, merged_datum,
                                                field_offset);
-      exit:
+exit:
        /* Free temporary buffer if we used one */
        if (new_buffer) {
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 00bf29877574..65d93607f368 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -388,7 +388,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
        *actual_return_desc = return_desc;
-      cleanup:
+cleanup:
        if (local_operand1 != operand1) {
                acpi_ut_remove_reference(local_operand1);
        }
@@ -718,7 +718,7 @@ acpi_ex_do_logical_op(u16 opcode,
                }
        }
-      cleanup:
+cleanup:
        /* New object was created if implicit conversion performed - delete */
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 2cdd41d8ade6..d74cea416ca0 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -115,7 +115,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
                break;
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
@@ -234,7 +234,7 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        return_ACPI_STATUS(status);
 }
@@ -551,7 +551,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                status = acpi_ex_store(return_desc, operand[1], walk_state);
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
@@ -1054,7 +1054,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index d5088f7030c7..d6fa0fce1fc9 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -215,7 +215,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        /*
         * Since the remainder is not returned indirectly, remove a reference to
         * it. Only the quotient is returned indirectly.
@@ -445,7 +445,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                break;
        }
-      store_result_to_target:
+store_result_to_target:
        if (ACPI_SUCCESS(status)) {
                /*
@@ -462,7 +462,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                }
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
@@ -553,7 +553,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
                goto cleanup;
        }
-      store_logical_result:
+store_logical_result:
        /*
         * Set return value to according to logical_result. logical TRUE (all ones)
         * Default is FALSE (zero)
@@ -562,7 +562,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
                return_desc->integer.value = ACPI_UINT64_MAX;
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 37656f12f204..bc042adf8804 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -124,7 +124,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        return_ACPI_STATUS(status);
 }
@@ -252,7 +252,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
        status = acpi_ex_store(return_desc, operand[3], walk_state);
-      cleanup:
+cleanup:
        /* Delete return object on error */
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 879b6cd8319c..4459e32c683d 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -314,7 +314,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                goto cleanup;
        }
-      cleanup:
+cleanup:
        /* Delete return object on error */
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 303429bb4d5d..9d28867e60dc 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -400,6 +400,7 @@ acpi_ex_pci_config_space_handler(u32 function,
        switch (function) {
        case ACPI_READ:
+                *value = 0;
                status = acpi_os_read_pci_configuration(pci_id, pci_register,
                                                        value, bit_width);
                break;
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index ac04278ad28f..1606524312e3 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -521,7 +521,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
         */
        type = obj_desc->common.type;
-      exit:
+exit:
        /* Convert internal types to external types */
        switch (type) {
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 00e5af7129c1..be3f66973ee8 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -683,7 +683,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        return_ACPI_STATUS(status);
                }
-              next_operand:
+next_operand:
                /*
                 * If more operands needed, decrement stack_ptr to point
                 * to next operand on stack
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 8d2e866be15f..12e6cff54f78 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -560,7 +560,7 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                break;
        }
-      exit:
+exit:
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 2d7d22ebc782..3c498dc1636e 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 5ee7a814cd92..b4b47db2dee2 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -83,11 +84,17 @@ acpi_status acpi_reset(void)
                 * For I/O space, write directly to the OSL. This bypasses the port
                 * validation mechanism, which may block a valid write to the reset
                 * register.
-                 * Spec section 4.7.3.6 requires register width to be 8.
+                 *
+                 * NOTE:
+                 * The ACPI spec requires the reset register width to be 8, so we
+                 * hardcode it here and ignore the FADT value. This maintains
+                 * compatibility with other ACPI implementations that have allowed
+                 * BIOS code with bad register width values to go unnoticed.
                 */
                status =
                    acpi_os_write_port((acpi_io_address) reset_reg->address,
-                                       acpi_gbl_FADT.reset_value, 8);
+                                       acpi_gbl_FADT.reset_value,
+                                       ACPI_RESET_REGISTER_WIDTH);
        } else {
                /* Write the reset value to the reset register */
@@ -119,7 +126,8 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
 ******************************************************************************/
 acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
 {
-        u32 value;
+        u32 value_lo;
+        u32 value_hi;
        u32 width;
        u64 address;
        acpi_status status;
@@ -137,13 +145,8 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
                return (status);
        }
-        /* Initialize entire 64-bit return value to zero */
-        *return_value = 0;
-        value = 0;
        /*
-         * Two address spaces supported: Memory or IO. PCI_Config is
+         * Two address spaces supported: Memory or I/O. PCI_Config is
         * not supported here because the GAS structure is insufficient
         */
        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
@@ -155,29 +158,35 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
                }
        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+                value_lo = 0;
+                value_hi = 0;
                width = reg->bit_width;
                if (width == 64) {
                        width = 32;     /* Break into two 32-bit transfers */
                }
                status = acpi_hw_read_port((acpi_io_address)
-                                           address, &value, width);
+                                           address, &value_lo, width);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }
-                *return_value = value;
                if (reg->bit_width == 64) {
                        /* Read the top 32 bits */
                        status = acpi_hw_read_port((acpi_io_address)
-                                                   (address + 4), &value, 32);
+                                                   (address + 4), &value_hi,
+                                                   32);
                        if (ACPI_FAILURE(status)) {
                                return (status);
                        }
-                        *return_value |= ((u64)value << 32);
                }
+                /* Set the return value only if status is AE_OK */
+                *return_value = (value_lo | ((u64)value_hi << 32));
        }
        ACPI_DEBUG_PRINT((ACPI_DB_IO,
@@ -186,7 +195,7 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
                          ACPI_FORMAT_UINT64(address),
                          acpi_ut_get_region_name(reg->space_id)));
-        return (status);
+        return (AE_OK);
 }
 ACPI_EXPORT_SYMBOL(acpi_read)
@@ -561,10 +570,10 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
                break;
        }
-      cleanup1:
+cleanup1:
        acpi_ut_remove_reference(info->return_object);
-      cleanup:
+cleanup:
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status,
                                "While evaluating Sleep State [%s]",
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index f2e669db8b65..15dddc10fc9b 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
@@ -166,7 +167,7 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
 *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
 *
 ******************************************************************************/
-acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
+acpi_status acpi_enter_sleep_state_s4bios(void)
 {
        u32 in_value;
        acpi_status status;
@@ -360,7 +361,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
 *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
 *
 ******************************************************************************/
-acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
+acpi_status acpi_enter_sleep_state(u8 sleep_state)
 {
        acpi_status status;
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index c5316e5bd4ab..14f65f6345b9 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -240,7 +240,7 @@ acpi_status acpi_ns_root_initialize(void)
                }
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        /* Save a handle to "_GPE", it is always present */
@@ -424,8 +424,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                        /* Current scope has no parent scope */
                                        ACPI_ERROR((AE_INFO,
-                                                    "ACPI path has too many parent prefixes (^) "
+                                                    "%s: Path has too many parent prefixes (^) "
-                                                    "- reached beyond root node"));
+                                                    "- reached beyond root node",
+                                                    pathname));
                                        return_ACPI_STATUS(AE_NOT_FOUND);
                                }
                        }
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 7418c77fde8c..48b9c6f12643 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -59,6 +59,17 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
 #endif
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+#ifdef  ACPI_FUTURE_USAGE
+static acpi_status
+acpi_ns_dump_one_object_path(acpi_handle obj_handle,
+                             u32 level, void *context, void **return_value);
+static acpi_status
+acpi_ns_get_max_depth(acpi_handle obj_handle,
+                      u32 level, void *context, void **return_value);
+#endif                          /* ACPI_FUTURE_USAGE */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ns_print_pathname
@@ -609,7 +620,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                obj_type = ACPI_TYPE_INVALID;   /* Terminate loop after next pass */
        }
-      cleanup:
+cleanup:
        acpi_os_printf("\n");
        return (AE_OK);
 }
@@ -671,6 +682,136 @@ acpi_ns_dump_objects(acpi_object_type type,
 }
 #endif                          /* ACPI_FUTURE_USAGE */
+#ifdef  ACPI_FUTURE_USAGE
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_dump_one_object_path, acpi_ns_get_max_depth
+ *
+ * PARAMETERS:  obj_handle          - Node to be dumped
+ *              level               - Nesting level of the handle
+ *              context             - Passed into walk_namespace
+ *              return_value        - Not used
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dump the full pathname to a namespace object. acp_ns_get_max_depth
+ *              computes the maximum nesting depth in the namespace tree, in
+ *              order to simplify formatting in acpi_ns_dump_one_object_path.
+ *              These procedures are user_functions called by acpi_ns_walk_namespace.
+ *
+ ******************************************************************************/
+static acpi_status
+acpi_ns_dump_one_object_path(acpi_handle obj_handle,
+                             u32 level, void *context, void **return_value)
+{
+        u32 max_level = *((u32 *)context);
+        char *pathname;
+        struct acpi_namespace_node *node;
+        int path_indent;
+        if (!obj_handle) {
+                return (AE_OK);
+        }
+        node = acpi_ns_validate_handle(obj_handle);
+        if (!node) {
+                /* Ignore bad node during namespace walk */
+                return (AE_OK);
+        }
+        pathname = acpi_ns_get_external_pathname(node);
+        path_indent = 1;
+        if (level <= max_level) {
+                path_indent = max_level - level + 1;
+        }
+        acpi_os_printf("%2d%*s%-12s%*s",
+                       level, level, " ", acpi_ut_get_type_name(node->type),
+                       path_indent, " ");
+        acpi_os_printf("%s\n", &pathname[1]);
+        ACPI_FREE(pathname);
+        return (AE_OK);
+}
+static acpi_status
+acpi_ns_get_max_depth(acpi_handle obj_handle,
+                      u32 level, void *context, void **return_value)
+{
+        u32 *max_level = (u32 *)context;
+        if (level > *max_level) {
+                *max_level = level;
+        }
+        return (AE_OK);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_dump_object_paths
+ *
+ * PARAMETERS:  type                - Object type to be dumped
+ *              display_type        - 0 or ACPI_DISPLAY_SUMMARY
+ *              max_depth           - Maximum depth of dump. Use ACPI_UINT32_MAX
+ *                                    for an effectively unlimited depth.
+ *              owner_id            - Dump only objects owned by this ID. Use
+ *                                    ACPI_UINT32_MAX to match all owners.
+ *              start_handle        - Where in namespace to start/end search
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Dump full object pathnames within the loaded namespace. Uses
+ *              acpi_ns_walk_namespace in conjunction with acpi_ns_dump_one_object_path.
+ *
+ ******************************************************************************/
+void
+acpi_ns_dump_object_paths(acpi_object_type type,
+                          u8 display_type,
+                          u32 max_depth,
+                          acpi_owner_id owner_id, acpi_handle start_handle)
+{
+        acpi_status status;
+        u32 max_level = 0;
+        ACPI_FUNCTION_ENTRY();
+        /*
+         * Just lock the entire namespace for the duration of the dump.
+         * We don't want any changes to the namespace during this time,
+         * especially the temporary nodes since we are going to display
+         * them also.
+         */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_printf("Could not acquire namespace mutex\n");
+                return;
+        }
+        /* Get the max depth of the namespace tree, for formatting later */
+        (void)acpi_ns_walk_namespace(type, start_handle, max_depth,
+                                     ACPI_NS_WALK_NO_UNLOCK |
+                                     ACPI_NS_WALK_TEMP_NODES,
+                                     acpi_ns_get_max_depth, NULL,
+                                     (void *)&max_level, NULL);
+        /* Now dump the entire namespace */
+        (void)acpi_ns_walk_namespace(type, start_handle, max_depth,
+                                     ACPI_NS_WALK_NO_UNLOCK |
+                                     ACPI_NS_WALK_TEMP_NODES,
+                                     acpi_ns_dump_one_object_path, NULL,
+                                     (void *)&max_level, NULL);
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+}
+#endif                          /* ACPI_FUTURE_USAGE */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ns_dump_entry
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 409ae80824d1..283762511b73 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -69,6 +69,7 @@ static acpi_status
 acpi_ns_dump_one_device(acpi_handle obj_handle,
                        u32 level, void *context, void **return_value)
 {
+        struct acpi_buffer buffer;
        struct acpi_device_info *info;
        acpi_status status;
        u32 i;
@@ -78,15 +79,17 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
        status =
            acpi_ns_dump_one_object(obj_handle, level, context, return_value);
-        status = acpi_get_object_info(obj_handle, &info);
+        buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+        status = acpi_get_object_info(obj_handle, &buffer);
        if (ACPI_SUCCESS(status)) {
+                info = buffer.pointer;
                for (i = 0; i < level; i++) {
                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, " "));
                }
                ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES,
                                      "    HID: %s, ADR: %8.8X%8.8X, Status: %X\n",
-                                      info->hardware_id.string,
+                                      info->hardware_id.value,
                                      ACPI_FORMAT_UINT64(info->address),
                                      info->current_status));
                ACPI_FREE(info);
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 18108bc2e51c..963ceef063f8 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -314,7 +314,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                          "*** Completed evaluation of object %s ***\n",
                          info->relative_pathname));
- cleanup:
+cleanup:
        /*
         * Namespace was unlocked by the handling acpi_ns* function, so we
         * just free the pathname and return
@@ -486,7 +486,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
                parent_node->type = (u8)type;
        }
-      exit:
+exit:
        if (parent_obj) {
                acpi_ut_remove_reference(parent_obj);
        }
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index dd2ceae3f717..3a0423af968c 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -213,7 +213,7 @@ acpi_status acpi_ns_initialize_devices(void)
        return_ACPI_STATUS(status);
-      error_exit:
+error_exit:
        ACPI_EXCEPTION((AE_INFO, status, "During device initialization"));
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 0a7badc3179f..89ec645e7730 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -114,7 +114,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
                (void)acpi_tb_release_owner_id(table_index);
        }
-      unlock:
+unlock:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 35dde8151c0d..177857340271 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -140,7 +140,7 @@ acpi_ns_one_complete_parse(u32 pass_number,
                          pass_number));
        status = acpi_ps_parse_aml(walk_state);
-      cleanup:
+cleanup:
        acpi_ps_delete_parse_tree(parse_root);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 098e7666cbc9..d2855d9857c4 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -271,7 +271,7 @@ acpi_ns_check_object_type(struct acpi_evaluate_info *info,
                return (AE_OK); /* Successful repair */
        }
-      type_error_exit:
+type_error_exit:
        /* Create a string with all expected types for this predefined object */
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 6d55cef7916c..3d5391f9bcb5 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -330,7 +330,7 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
        return (status);
-      package_too_small:
+package_too_small:
        /* Error exit for the case with an incorrect package count */
@@ -555,7 +555,7 @@ acpi_ns_check_package_list(struct acpi_evaluate_info *info,
        return (AE_OK);
-      package_too_small:
+package_too_small:
        /* The sub-package count was smaller than required */
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index f8e71ea60319..a05afff50eb9 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -263,7 +263,7 @@ acpi_ns_simple_repair(struct acpi_evaluate_info *info,
        return (AE_AML_OPERAND_TYPE);
-      object_repaired:
+object_repaired:
        /* Object was successfully repaired */
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index c84603ee83ae..6a25d320b169 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -478,7 +478,7 @@ acpi_ns_repair_CST(struct acpi_evaluate_info *info,
                        removing = TRUE;
                }
-              remove_element:
+remove_element:
                if (removing) {
                        acpi_ns_remove_element(return_object, i + 1);
                        outer_element_count--;
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 5d43efc53a61..47420faef073 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -381,7 +381,8 @@ acpi_ns_search_and_enter(u32 target_name,
        /* Node is an object defined by an External() statement */
-        if (flags & ACPI_NS_EXTERNAL) {
+        if (flags & ACPI_NS_EXTERNAL ||
+            (walk_state && walk_state->opcode == AML_SCOPE_OP)) {
                new_node->flags |= ANOBJ_IS_EXTERNAL;
        }
 #endif
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 08c0b5beec88..cc2fea94c5f0 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -722,7 +722,7 @@ acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-      cleanup:
+cleanup:
        ACPI_FREE(internal_path);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index b38b4b07f86e..e973e311f856 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -42,7 +42,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -138,7 +139,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
                /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
-                ACPI_FREE(return_buffer->pointer);
+                ACPI_FREE_BUFFER(*return_buffer);
                return_buffer->pointer = NULL;
        }
@@ -441,7 +442,7 @@ acpi_evaluate_object(acpi_handle handle,
                acpi_ex_exit_interpreter();
        }
-      cleanup:
+cleanup:
        /* Free the input parameter list (if we created one) */
@@ -605,14 +606,22 @@ acpi_walk_namespace(acpi_object_type type,
                goto unlock_and_exit;
        }
+        /* Now we can validate the starting node */
+        if (!acpi_ns_validate_handle(start_object)) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit2;
+        }
        status = acpi_ns_walk_namespace(type, start_object, max_depth,
                                        ACPI_NS_WALK_UNLOCK,
                                        descending_callback, ascending_callback,
                                        context, return_value);
+unlock_and_exit2:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_read_lock(&acpi_gbl_namespace_rw_lock);
        return_ACPI_STATUS(status);
 }
@@ -856,7 +865,7 @@ acpi_attach_data(acpi_handle obj_handle,
        status = acpi_ns_attach_data(node, handler, data);
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
@@ -902,7 +911,7 @@ acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)
        status = acpi_ns_detach_data(node, handler);
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
@@ -949,7 +958,7 @@ acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)
        status = acpi_ns_get_attached_data(node, handler, data);
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 83c164434580..3a4bd3ff49a3 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -42,7 +42,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -208,7 +209,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
        ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
        status = AE_OK;
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
@@ -496,7 +497,7 @@ acpi_get_object_info(acpi_handle handle,
        *return_buffer = info;
        status = AE_OK;
-      cleanup:
+cleanup:
        if (hid) {
                ACPI_FREE(hid);
        }
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index c0853ef294e4..0e6d79e462d4 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -42,7 +42,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -200,7 +201,7 @@ acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)
                status = AE_NULL_ENTRY;
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
@@ -280,7 +281,7 @@ acpi_get_next_object(acpi_object_type type,
                *ret_handle = ACPI_CAST_PTR(acpi_handle, node);
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 86198a9139b5..79d9a28dedef 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -297,7 +297,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                        }
        }
-      cleanup:
+cleanup:
        /* Now we can actually delete the subtree rooted at Op */
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 11b99ab20bb3..fcb7a840e996 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -142,7 +142,7 @@ static void acpi_ps_start_trace(struct acpi_evaluate_info *info)
                acpi_dbg_layer = acpi_gbl_trace_dbg_layer;
        }
-      exit:
+exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 }
@@ -185,7 +185,7 @@ static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)
        acpi_dbg_level = acpi_gbl_original_dbg_level;
        acpi_dbg_layer = acpi_gbl_original_dbg_layer;
-      exit:
+exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 }
@@ -323,7 +323,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
        /* walk_state was deleted by parse_aml */
-      cleanup:
+cleanup:
        acpi_ps_delete_parse_tree(op);
        /* End optional tracing */
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 80d12994e0d0..c99cec9cefde 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -440,7 +440,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                info++;
        }
-      exit:
+exit:
        if (!flags_mode) {
                /* Round the resource struct length up to the next boundary (32 or 64) */
@@ -783,7 +783,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                info++;
        }
-      exit:
+exit:
        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 480b6b40c5ea..aef303d56d86 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -784,7 +784,7 @@ acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
        acpi_ut_remove_reference(args[0]);
-      cleanup:
+cleanup:
        ACPI_FREE(info);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 94e3517554f9..01e476988aae 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 42a13c0d7015..634357d51fe9 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -80,16 +80,10 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc)
                }
        }
-        /* FACS is the odd table, has no standard ACPI header and no checksum */
+        /* Always calculate checksum, ignore bad checksum if requested */
-        if (!ACPI_COMPARE_NAME(&table_desc->signature, ACPI_SIG_FACS)) {
+        status =
+            acpi_tb_verify_checksum(table_desc->pointer, table_desc->length);
-                /* Always calculate checksum, ignore bad checksum if requested */
-                status =
-                    acpi_tb_verify_checksum(table_desc->pointer,
-                                            table_desc->length);
-        }
        return_ACPI_STATUS(status);
 }
@@ -237,10 +231,10 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
                goto release;
        }
-      print_header:
+print_header:
        acpi_tb_print_table_header(table_desc->address, table_desc->pointer);
-      release:
+release:
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
        return_ACPI_STATUS(status);
 }
@@ -312,7 +306,7 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
        return (NULL);          /* There was no override */
-      finish_override:
+finish_override:
        ACPI_INFO((AE_INFO,
                   "%4.4s %p %s table override, new table: %p",
diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
index dc963f823d2c..6866e767ba90 100644
--- a/drivers/acpi/acpica/tbprint.c
+++ b/drivers/acpi/acpica/tbprint.c
@@ -135,10 +135,10 @@ acpi_tb_print_table_header(acpi_physical_address address,
                /* FACS only has signature and length fields */
-                ACPI_INFO((AE_INFO, "%4.4s %p %05X",
+                ACPI_INFO((AE_INFO, "%4.4s %p %06X",
                           header->signature, ACPI_CAST_PTR(void, address),
                           header->length));
-        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
+        } else if (ACPI_VALIDATE_RSDP_SIG(header->signature)) {
                /* RSDP has no common fields */
@@ -147,7 +147,7 @@ acpi_tb_print_table_header(acpi_physical_address address,
                                          header)->oem_id, ACPI_OEM_ID_SIZE);
                acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
-                ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
+                ACPI_INFO((AE_INFO, "RSDP %p %06X (v%.2d %6.6s)",
                           ACPI_CAST_PTR(void, address),
                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
                            revision >
@@ -162,7 +162,7 @@ acpi_tb_print_table_header(acpi_physical_address address,
                acpi_tb_cleanup_table_header(&local_header, header);
                ACPI_INFO((AE_INFO,
-                           "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
+                           "%4.4s %p %06X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
                           local_header.signature, ACPI_CAST_PTR(void, address),
                           local_header.length, local_header.revision,
                           local_header.oem_id, local_header.oem_table_id,
@@ -190,6 +190,16 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 {
        u8 checksum;
+        /*
+         * FACS/S3PT:
+         * They are the odd tables, have no standard ACPI header and no checksum
+         */
+        if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_S3PT) ||
+            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_FACS)) {
+                return (AE_OK);
+        }
        /* Compute the checksum on the table */
        checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length);
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index bffdfc7b8322..3d6bb83aa7e7 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -350,7 +350,7 @@ acpi_tb_install_table(acpi_physical_address address,
                acpi_tb_delete_table(table_desc);
        }
-      unmap_and_exit:
+unmap_and_exit:
        /* Always unmap the table header that we mapped above */
@@ -430,8 +430,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
 *
 ******************************************************************************/
-acpi_status __init
+acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
-acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
 {
        struct acpi_table_rsdp *rsdp;
        u32 table_entry_size;
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index ad11162482ff..db826eaadd1c 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "actables.h"
@@ -147,6 +148,8 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
        return_ACPI_STATUS(status);
 }
+ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_tables)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_reallocate_root_table
@@ -161,7 +164,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
 *              kernel.
 *
 ******************************************************************************/
-acpi_status acpi_reallocate_root_table(void)
+acpi_status __init acpi_reallocate_root_table(void)
 {
        acpi_status status;
@@ -181,6 +184,8 @@ acpi_status acpi_reallocate_root_table(void)
        return_ACPI_STATUS(status);
 }
+ACPI_EXPORT_SYMBOL_INIT(acpi_reallocate_root_table)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_get_table_header
@@ -356,6 +361,7 @@ acpi_get_table_with_size(char *signature,
        return (AE_NOT_FOUND);
 }
 ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)
 acpi_status
@@ -367,6 +373,7 @@ acpi_get_table(char *signature,
        return acpi_get_table_with_size(signature,
                       instance, out_table, &tbl_size);
 }
 ACPI_EXPORT_SYMBOL(acpi_get_table)
 /*******************************************************************************
@@ -424,7 +431,6 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
 ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_install_table_handler
@@ -465,7 +471,7 @@ acpi_install_table_handler(acpi_table_handler handler, void *context)
        acpi_gbl_table_handler = handler;
        acpi_gbl_table_handler_context = context;
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
@@ -506,7 +512,7 @@ acpi_status acpi_remove_table_handler(acpi_table_handler handler)
        acpi_gbl_table_handler = NULL;
-      cleanup:
+cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 0ba9e328d5d7..60b5a871833c 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -65,7 +66,7 @@ static acpi_status acpi_tb_load_namespace(void);
 *
 ******************************************************************************/
-acpi_status acpi_load_tables(void)
+acpi_status __init acpi_load_tables(void)
 {
        acpi_status status;
@@ -82,7 +83,7 @@ acpi_status acpi_load_tables(void)
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_load_tables)
+ACPI_EXPORT_SYMBOL_INIT(acpi_load_tables)
 /*******************************************************************************
 *
@@ -200,7 +201,7 @@ static acpi_status acpi_tb_load_namespace(void)
        ACPI_INFO((AE_INFO, "All ACPI Tables successfully acquired"));
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
        return_ACPI_STATUS(status);
 }
@@ -268,7 +269,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
                                             acpi_gbl_table_handler_context);
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 948c95e80d44..e4e1468877c3 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -68,8 +68,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
         * 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->signature, ACPI_SIG_RSDP,
+        if (!ACPI_VALIDATE_RSDP_SIG(rsdp->signature)) {
-                         sizeof(ACPI_SIG_RSDP) - 1) != 0) {
                /* Nope, BAD Signature */
@@ -112,7 +111,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 *
 ******************************************************************************/
-acpi_status acpi_find_root_pointer(acpi_size *table_address)
+acpi_status __init acpi_find_root_pointer(acpi_size *table_address)
 {
        u8 *table_ptr;
        u8 *mem_rover;
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index e0ffb580f4b0..814267f52715 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -48,6 +48,39 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utalloc")
+#if !defined (USE_NATIVE_ALLOCATE_ZEROED)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_allocate_zeroed
+ *
+ * PARAMETERS:  size                - Size of the allocation
+ *
+ * RETURN:      Address of the allocated memory on success, NULL on failure.
+ *
+ * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.
+ *              This is the default implementation. Can be overridden via the
+ *              USE_NATIVE_ALLOCATE_ZEROED flag.
+ *
+ ******************************************************************************/
+void *acpi_os_allocate_zeroed(acpi_size size)
+{
+        void *allocation;
+        ACPI_FUNCTION_ENTRY();
+        allocation = acpi_os_allocate(size);
+        if (allocation) {
+                /* Clear the memory block */
+                ACPI_MEMSET(allocation, 0, size);
+        }
+        return (allocation);
+}
+#endif                          /* !USE_NATIVE_ALLOCATE_ZEROED */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ut_create_caches
@@ -59,6 +92,7 @@ ACPI_MODULE_NAME("utalloc")
 * DESCRIPTION: Create all local caches
 *
 ******************************************************************************/
 acpi_status acpi_ut_create_caches(void)
 {
        acpi_status status;
@@ -175,10 +209,10 @@ acpi_status acpi_ut_delete_caches(void)
        /* Free memory lists */
-        ACPI_FREE(acpi_gbl_global_list);
+        acpi_os_free(acpi_gbl_global_list);
        acpi_gbl_global_list = NULL;
-        ACPI_FREE(acpi_gbl_ns_node_list);
+        acpi_os_free(acpi_gbl_ns_node_list);
        acpi_gbl_ns_node_list = NULL;
 #endif
@@ -302,82 +336,3 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
        ACPI_MEMSET(buffer->pointer, 0, required_length);
        return (AE_OK);
 }
-#ifdef NOT_USED_BY_LINUX
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_allocate
- *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: Subsystem equivalent of malloc.
- *
- ******************************************************************************/
-void *acpi_ut_allocate(acpi_size size,
-                       u32 component, const char *module, u32 line)
-{
-        void *allocation;
-        ACPI_FUNCTION_TRACE_U32(ut_allocate, size);
-        /* Check for an inadvertent size of zero bytes */
-        if (!size) {
-                ACPI_WARNING((module, line,
-                              "Attempt to allocate zero bytes, allocating 1 byte"));
-                size = 1;
-        }
-        allocation = acpi_os_allocate(size);
-        if (!allocation) {
-                /* Report allocation error */
-                ACPI_WARNING((module, line,
-                              "Could not allocate size %u", (u32) size));
-                return_PTR(NULL);
-        }
-        return_PTR(allocation);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_allocate_zeroed
- *
- * PARAMETERS:  size                - Size of the allocation
- *              component           - Component type of caller
- *              module              - Source file name of caller
- *              line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.
- *
- ******************************************************************************/
-void *acpi_ut_allocate_zeroed(acpi_size size,
-                              u32 component, const char *module, u32 line)
-{
-        void *allocation;
-        ACPI_FUNCTION_ENTRY();
-        allocation = acpi_ut_allocate(size, component, module, line);
-        if (allocation) {
-                /* Clear the memory block */
-                ACPI_MEMSET(allocation, 0, size);
-        }
-        return (allocation);
-}
-#endif
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index a877a9647fd9..366bfec4b770 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -65,7 +65,7 @@ ACPI_MODULE_NAME("utcache")
 acpi_status
 acpi_os_create_cache(char *cache_name,
                     u16 object_size,
-                     u16 max_depth, struct acpi_memory_list ** return_cache)
+                     u16 max_depth, struct acpi_memory_list **return_cache)
 {
        struct acpi_memory_list *cache;
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 1731c27c36a6..edff4e653d9a 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -552,7 +552,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
        *ret_internal_object = internal_object;
        return_ACPI_STATUS(AE_OK);
-      error_exit:
+error_exit:
        acpi_ut_remove_reference(internal_object);
        return_ACPI_STATUS(AE_NO_MEMORY);
 }
@@ -899,7 +899,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
        return (status);
-      error_exit:
+error_exit:
        acpi_ut_remove_reference(target_object);
        return (status);
 }
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 5796e11a0671..1a67b3944b3b 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
@@ -190,7 +191,7 @@ acpi_debug_print(u32 requested_debug_level,
         * Display the module name, current line number, thread ID (if requested),
         * current procedure nesting level, and the current procedure name
         */
-        acpi_os_printf("%8s-%04ld ", module_name, line_number);
+        acpi_os_printf("%9s-%04ld ", module_name, line_number);
        if (ACPI_LV_THREADS & acpi_dbg_level) {
                acpi_os_printf("[%u] ", (u32)thread_id);
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 11e2e02e1618..b3f31dd89a45 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -41,7 +41,6 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index d6b33f29d327..c07d2227ea42 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -649,7 +649,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
        return (AE_OK);
-      error_exit:
+error_exit:
        ACPI_EXCEPTION((AE_INFO, status,
                        "Could not update object reference count"));
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 4fd68971019b..16fb90506db7 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -181,7 +181,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
        *return_desc = info->return_object;
-      cleanup:
+cleanup:
        ACPI_FREE(info);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c
index ff6d9e8aa842..3cf7b597edb9 100644
--- a/drivers/acpi/acpica/utexcep.c
+++ b/drivers/acpi/acpica/utexcep.c
@@ -41,8 +41,9 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#define EXPORT_ACPI_INTERFACES
 #define ACPI_DEFINE_EXCEPTION_TABLE
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index d6f26bf8a062..81f9a9584451 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -41,9 +41,9 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#define EXPORT_ACPI_INTERFACES
 #define DEFINE_ACPI_GLOBALS
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
@@ -289,9 +289,19 @@ acpi_status acpi_ut_init_globals(void)
        acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;
+        /* Event counters */
+        acpi_method_count = 0;
+        acpi_sci_count = 0;
+        acpi_gpe_count = 0;
+        for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
+                acpi_fixed_event_count[i] = 0;
+        }
 #if (!ACPI_REDUCED_HARDWARE)
-        /* GPE support */
+        /* GPE/SCI support */
        acpi_gbl_all_gpes_initialized = FALSE;
        acpi_gbl_gpe_xrupt_list_head = NULL;
@@ -300,6 +310,7 @@ acpi_status acpi_ut_init_globals(void)
        acpi_current_gpe_count = 0;
        acpi_gbl_global_event_handler = NULL;
+        acpi_gbl_sci_handler_list = NULL;
 #endif                          /* !ACPI_REDUCED_HARDWARE */
@@ -377,6 +388,11 @@ acpi_status acpi_ut_init_globals(void)
 /* Public globals */
 ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+ACPI_EXPORT_SYMBOL(acpi_gpe_count)
 ACPI_EXPORT_SYMBOL(acpi_current_gpe_count)
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index fa69071db418..bfca7b4b6731 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -184,7 +184,7 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
        sub->length = length;
        *return_id = sub;
-      cleanup:
+cleanup:
        /* On exit, we must delete the return object */
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index aa61f66ee861..13e045025c33 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -180,7 +180,7 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)
        package_elements = ACPI_ALLOCATE_ZEROED(((acpi_size) count +
                                                 1) * sizeof(void *));
        if (!package_elements) {
-                acpi_ut_remove_reference(package_desc);
+                ACPI_FREE(package_desc);
                return_PTR(NULL);
        }
@@ -396,7 +396,6 @@ void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
        /* Mark the descriptor type */
-        memset(object, 0, sizeof(union acpi_operand_object));
        ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_OPERAND);
        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p Size %X\n",
@@ -461,25 +460,28 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
        ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);
+        /* Start with the length of the (external) Acpi object */
+        length = sizeof(union acpi_object);
+        /* A NULL object is allowed, can be a legal uninitialized package element */
+        if (!internal_object) {
        /*
-         * Handle a null object (Could be a uninitialized package
+                 * Object is NULL, just return the length of union acpi_object
-         * element -- which is legal)
+                 * (A NULL union acpi_object is an object of all zeroes.)
         */
-        if (!internal_object) {
+                *obj_length = ACPI_ROUND_UP_TO_NATIVE_WORD(length);
-                *obj_length = sizeof(union acpi_object);
                return_ACPI_STATUS(AE_OK);
        }
-        /* Start with the length of the Acpi object */
+        /* A Namespace Node should never appear here */
-        length = sizeof(union acpi_object);
        if (ACPI_GET_DESCRIPTOR_TYPE(internal_object) == ACPI_DESC_TYPE_NAMED) {
-                /* Object is a named object (reference), just return the length */
+                /* A namespace node should never get here */
-                *obj_length = ACPI_ROUND_UP_TO_NATIVE_WORD(length);
+                return_ACPI_STATUS(AE_AML_INTERNAL);
-                return_ACPI_STATUS(status);
        }
        /*
diff --git a/drivers/acpi/acpica/utownerid.c b/drivers/acpi/acpica/utownerid.c
index 835340b26d37..eb3aca761369 100644
--- a/drivers/acpi/acpica/utownerid.c
+++ b/drivers/acpi/acpica/utownerid.c
@@ -148,7 +148,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
        ACPI_ERROR((AE_INFO,
                    "Could not allocate new OwnerId (255 max), AE_OWNER_ID_LIMIT"));
-      exit:
+exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index cb7fa491decf..2c2accb9e534 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -643,7 +643,7 @@ acpi_ut_validate_resource(struct acpi_walk_state *walk_state,
        return (AE_OK);
-      invalid_resource:
+invalid_resource:
        if (walk_state) {
                ACPI_ERROR((AE_INFO,
@@ -652,7 +652,7 @@ acpi_ut_validate_resource(struct acpi_walk_state *walk_state,
        }
        return (AE_AML_INVALID_RESOURCE_TYPE);
-      bad_resource_length:
+bad_resource_length:
        if (walk_state) {
                ACPI_ERROR((AE_INFO,
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index a6b729d4c1dc..03c4c2febd84 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -161,7 +161,6 @@ union acpi_generic_state *acpi_ut_create_generic_state(void)
        if (state) {
                /* Initialize */
-                memset(state, 0, sizeof(union acpi_generic_state));
                state->common.descriptor_type = ACPI_DESC_TYPE_STATE;
        }
diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c
index cb1e9cc32d5f..45c0eb26b33d 100644
--- a/drivers/acpi/acpica/utstring.c
+++ b/drivers/acpi/acpica/utstring.c
@@ -310,7 +310,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
        /* All done, normal exit */
-      all_done:
+all_done:
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n",
                          ACPI_FORMAT_UINT64(return_value)));
@@ -318,7 +318,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
        *ret_integer = return_value;
        return_ACPI_STATUS(AE_OK);
-      error_exit:
+error_exit:
        /* Base was set/validated above */
        if (base == 10) {
@@ -584,3 +584,65 @@ void ut_convert_backslashes(char *pathname)
        }
 }
 #endif
+#if defined (ACPI_DEBUGGER) || defined (ACPI_APPLICATION)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_safe_strcpy, acpi_ut_safe_strcat, acpi_ut_safe_strncat
+ *
+ * PARAMETERS:  Adds a "DestSize" parameter to each of the standard string
+ *              functions. This is the size of the Destination buffer.
+ *
+ * RETURN:      TRUE if the operation would overflow the destination buffer.
+ *
+ * DESCRIPTION: Safe versions of standard Clib string functions. Ensure that
+ *              the result of the operation will not overflow the output string
+ *              buffer.
+ *
+ * NOTE:        These functions are typically only helpful for processing
+ *              user input and command lines. For most ACPICA code, the
+ *              required buffer length is precisely calculated before buffer
+ *              allocation, so the use of these functions is unnecessary.
+ *
+ ******************************************************************************/
+u8 acpi_ut_safe_strcpy(char *dest, acpi_size dest_size, char *source)
+{
+        if (ACPI_STRLEN(source) >= dest_size) {
+                return (TRUE);
+        }
+        ACPI_STRCPY(dest, source);
+        return (FALSE);
+}
+u8 acpi_ut_safe_strcat(char *dest, acpi_size dest_size, char *source)
+{
+        if ((ACPI_STRLEN(dest) + ACPI_STRLEN(source)) >= dest_size) {
+                return (TRUE);
+        }
+        ACPI_STRCAT(dest, source);
+        return (FALSE);
+}
+u8
+acpi_ut_safe_strncat(char *dest,
+                     acpi_size dest_size,
+                     char *source, acpi_size max_transfer_length)
+{
+        acpi_size actual_transfer_length;
+        actual_transfer_length =
+            ACPI_MIN(max_transfer_length, ACPI_STRLEN(source));
+        if ((ACPI_STRLEN(dest) + actual_transfer_length) >= dest_size) {
+                return (TRUE);
+        }
+        ACPI_STRNCAT(dest, source, max_transfer_length);
+        return (FALSE);
+}
+#endif
diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
index 160f13f4aab5..c0027773cccb 100644
--- a/drivers/acpi/acpica/uttrack.c
+++ b/drivers/acpi/acpica/uttrack.c
@@ -130,10 +130,23 @@ void *acpi_ut_allocate_and_track(acpi_size size,
        struct acpi_debug_mem_block *allocation;
        acpi_status status;
+        /* Check for an inadvertent size of zero bytes */
+        if (!size) {
+                ACPI_WARNING((module, line,
+                              "Attempt to allocate zero bytes, allocating 1 byte"));
+                size = 1;
+        }
        allocation =
-            acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),
+            acpi_os_allocate(size + sizeof(struct acpi_debug_mem_header));
-                             component, module, line);
        if (!allocation) {
+                /* Report allocation error */
+                ACPI_WARNING((module, line,
+                              "Could not allocate size %u", (u32)size));
                return (NULL);
        }
@@ -179,9 +192,17 @@ void *acpi_ut_allocate_zeroed_and_track(acpi_size size,
        struct acpi_debug_mem_block *allocation;
        acpi_status status;
+        /* Check for an inadvertent size of zero bytes */
+        if (!size) {
+                ACPI_WARNING((module, line,
+                              "Attempt to allocate zero bytes, allocating 1 byte"));
+                size = 1;
+        }
        allocation =
-            acpi_ut_allocate_zeroed(size + sizeof(struct acpi_debug_mem_header),
+            acpi_os_allocate_zeroed(size +
-                                    component, module, line);
+                                    sizeof(struct acpi_debug_mem_header));
        if (!allocation) {
                /* Report allocation error */
@@ -409,7 +430,7 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
                element->next = allocation;
        }
-      unlock_and_exit:
+unlock_and_exit:
        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 03a211e6e26a..be322c83643a 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdebug.h"
@@ -60,7 +61,7 @@ ACPI_MODULE_NAME("utxface")
 * DESCRIPTION: Shutdown the ACPICA subsystem and release all resources.
 *
 ******************************************************************************/
-acpi_status acpi_terminate(void)
+acpi_status __init acpi_terminate(void)
 {
        acpi_status status;
@@ -104,7 +105,7 @@ acpi_status acpi_terminate(void)
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_terminate)
+ACPI_EXPORT_SYMBOL_INIT(acpi_terminate)
 #ifndef ACPI_ASL_COMPILER
 #ifdef ACPI_FUTURE_USAGE
@@ -207,6 +208,44 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
 ACPI_EXPORT_SYMBOL(acpi_get_system_info)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_statistics
+ *
+ * PARAMETERS:  stats           - Where the statistics are returned
+ *
+ * RETURN:      status          - the status of the call
+ *
+ * DESCRIPTION: Get the contents of the various system counters
+ *
+ ******************************************************************************/
+acpi_status acpi_get_statistics(struct acpi_statistics *stats)
+{
+        ACPI_FUNCTION_TRACE(acpi_get_statistics);
+        /* Parameter validation */
+        if (!stats) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        /* Various interrupt-based event counters */
+        stats->sci_count = acpi_sci_count;
+        stats->gpe_count = acpi_gpe_count;
+        ACPI_MEMCPY(stats->fixed_event_count, acpi_fixed_event_count,
+                    sizeof(acpi_fixed_event_count));
+        /* Other counters */
+        stats->method_count = acpi_method_count;
+        return_ACPI_STATUS(AE_OK);
+}
+ACPI_EXPORT_SYMBOL(acpi_get_statistics)
 /*****************************************************************************
 *
 * FUNCTION:    acpi_install_initialization_handler
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index e966a2e47b76..f7edb88f6054 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 41ebaaf8bb1a..75efea0539c1 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
@@ -64,7 +65,7 @@ ACPI_MODULE_NAME("utxfinit")
 *              called, so any early initialization belongs here.
 *
 ******************************************************************************/
-acpi_status acpi_initialize_subsystem(void)
+acpi_status __init acpi_initialize_subsystem(void)
 {
        acpi_status status;
@@ -124,7 +125,8 @@ acpi_status acpi_initialize_subsystem(void)
        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
+ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_subsystem)
 /*******************************************************************************
 *
@@ -138,7 +140,7 @@ ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
 *              Puts system into ACPI mode if it isn't already.
 *
 ******************************************************************************/
-acpi_status acpi_enable_subsystem(u32 flags)
+acpi_status __init acpi_enable_subsystem(u32 flags)
 {
        acpi_status status = AE_OK;
@@ -228,7 +230,8 @@ acpi_status acpi_enable_subsystem(u32 flags)
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
+ACPI_EXPORT_SYMBOL_INIT(acpi_enable_subsystem)
 /*******************************************************************************
 *
@@ -242,7 +245,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
 *              objects and executing AML code for Regions, buffers, etc.
 *
 ******************************************************************************/
-acpi_status acpi_initialize_objects(u32 flags)
+acpi_status __init acpi_initialize_objects(u32 flags)
 {
        acpi_status status = AE_OK;
@@ -314,4 +317,5 @@ acpi_status acpi_initialize_objects(u32 flags)
        acpi_gbl_startup_flags |= ACPI_INITIALIZED_OK;
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
+ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_objects)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2c9958cd7a43..fbf1aceda8b8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -36,12 +36,6 @@
 #include <linux/suspend.h>
 #include <asm/unaligned.h>
-#ifdef CONFIG_ACPI_PROCFS_POWER
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-#endif
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/power_supply.h>
@@ -72,19 +66,6 @@ static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
-#ifdef CONFIG_ACPI_PROCFS_POWER
-extern struct proc_dir_entry *acpi_lock_battery_dir(void);
-extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
-enum acpi_battery_files {
-        info_tag = 0,
-        state_tag,
-        alarm_tag,
-        ACPI_BATTERY_NUMFILES,
-};
-#endif
 static const struct acpi_device_id battery_device_ids[] = {
        {"PNP0C0A", 0},
        {"", 0},
@@ -320,14 +301,6 @@ static enum power_supply_property energy_battery_props[] = {
        POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
-#ifdef CONFIG_ACPI_PROCFS_POWER
-inline char *acpi_battery_units(struct acpi_battery *battery)
-{
-        return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?
-                "mA" : "mW";
-}
-#endif
 /* --------------------------------------------------------------------------
                               Battery Management
   -------------------------------------------------------------------------- */
@@ -741,279 +714,6 @@ static void acpi_battery_refresh(struct acpi_battery *battery)
 }
 /* --------------------------------------------------------------------------
-                              FS Interface (/proc)
-   -------------------------------------------------------------------------- */
-#ifdef CONFIG_ACPI_PROCFS_POWER
-static struct proc_dir_entry *acpi_battery_dir;
-static int acpi_battery_print_info(struct seq_file *seq, int result)
-{
-        struct acpi_battery *battery = seq->private;
-        if (result)
-                goto end;
-        seq_printf(seq, "present:                 %s\n",
-                   acpi_battery_present(battery) ? "yes" : "no");
-        if (!acpi_battery_present(battery))
-                goto end;
-        if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "design capacity:         unknown\n");
-        else
-                seq_printf(seq, "design capacity:         %d %sh\n",
-                           battery->design_capacity,
-                           acpi_battery_units(battery));
-        if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "last full capacity:      unknown\n");
-        else
-                seq_printf(seq, "last full capacity:      %d %sh\n",
-                           battery->full_charge_capacity,
-                           acpi_battery_units(battery));
-        seq_printf(seq, "battery technology:      %srechargeable\n",
-                   (!battery->technology)?"non-":"");
-        if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "design voltage:          unknown\n");
-        else
-                seq_printf(seq, "design voltage:          %d mV\n",
-                           battery->design_voltage);
-        seq_printf(seq, "design capacity warning: %d %sh\n",
-                   battery->design_capacity_warning,
-                   acpi_battery_units(battery));
-        seq_printf(seq, "design capacity low:     %d %sh\n",
-                   battery->design_capacity_low,
-                   acpi_battery_units(battery));
-        seq_printf(seq, "cycle count:             %i\n", battery->cycle_count);
-        seq_printf(seq, "capacity granularity 1:  %d %sh\n",
-                   battery->capacity_granularity_1,
-                   acpi_battery_units(battery));
-        seq_printf(seq, "capacity granularity 2:  %d %sh\n",
-                   battery->capacity_granularity_2,
-                   acpi_battery_units(battery));
-        seq_printf(seq, "model number:            %s\n", battery->model_number);
-        seq_printf(seq, "serial number:           %s\n", battery->serial_number);
-        seq_printf(seq, "battery type:            %s\n", battery->type);
-        seq_printf(seq, "OEM info:                %s\n", battery->oem_info);
-      end:
-        if (result)
-                seq_printf(seq, "ERROR: Unable to read battery info\n");
-        return result;
-}
-static int acpi_battery_print_state(struct seq_file *seq, int result)
-{
-        struct acpi_battery *battery = seq->private;
-        if (result)
-                goto end;
-        seq_printf(seq, "present:                 %s\n",
-                   acpi_battery_present(battery) ? "yes" : "no");
-        if (!acpi_battery_present(battery))
-                goto end;
-        seq_printf(seq, "capacity state:          %s\n",
-                        (battery->state & 0x04) ? "critical" : "ok");
-        if ((battery->state & 0x01) && (battery->state & 0x02))
-                seq_printf(seq,
-                           "charging state:          charging/discharging\n");
-        else if (battery->state & 0x01)
-                seq_printf(seq, "charging state:          discharging\n");
-        else if (battery->state & 0x02)
-                seq_printf(seq, "charging state:          charging\n");
-        else
-                seq_printf(seq, "charging state:          charged\n");
-        if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "present rate:            unknown\n");
-        else
-                seq_printf(seq, "present rate:            %d %s\n",
-                           battery->rate_now, acpi_battery_units(battery));
-        if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "remaining capacity:      unknown\n");
-        else
-                seq_printf(seq, "remaining capacity:      %d %sh\n",
-                           battery->capacity_now, acpi_battery_units(battery));
-        if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
-                seq_printf(seq, "present voltage:         unknown\n");
-        else
-                seq_printf(seq, "present voltage:         %d mV\n",
-                           battery->voltage_now);
-      end:
-        if (result)
-                seq_printf(seq, "ERROR: Unable to read battery state\n");
-        return result;
-}
-static int acpi_battery_print_alarm(struct seq_file *seq, int result)
-{
-        struct acpi_battery *battery = seq->private;
-        if (result)
-                goto end;
-        if (!acpi_battery_present(battery)) {
-                seq_printf(seq, "present:                 no\n");
-                goto end;
-        }
-        seq_printf(seq, "alarm:                   ");
-        if (!battery->alarm)
-                seq_printf(seq, "unsupported\n");
-        else
-                seq_printf(seq, "%u %sh\n", battery->alarm,
-                                acpi_battery_units(battery));
-      end:
-        if (result)
-                seq_printf(seq, "ERROR: Unable to read battery alarm\n");
-        return result;
-}
-static ssize_t acpi_battery_write_alarm(struct file *file,
-                                        const char __user * buffer,
-                                        size_t count, loff_t * ppos)
-{
-        int result = 0;
-        char alarm_string[12] = { '\0' };
-        struct seq_file *m = file->private_data;
-        struct acpi_battery *battery = m->private;
-        if (!battery || (count > sizeof(alarm_string) - 1))
-                return -EINVAL;
-        if (!acpi_battery_present(battery)) {
-                result = -ENODEV;
-                goto end;
-        }
-        if (copy_from_user(alarm_string, buffer, count)) {
-                result = -EFAULT;
-                goto end;
-        }
-        alarm_string[count] = '\0';
-        battery->alarm = simple_strtol(alarm_string, NULL, 0);
-        result = acpi_battery_set_alarm(battery);
-      end:
-        if (!result)
-                return count;
-        return result;
-}
-typedef int(*print_func)(struct seq_file *seq, int result);
-static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
-        acpi_battery_print_info,
-        acpi_battery_print_state,
-        acpi_battery_print_alarm,
-};
-static int acpi_battery_read(int fid, struct seq_file *seq)
-{
-        struct acpi_battery *battery = seq->private;
-        int result = acpi_battery_update(battery);
-        return acpi_print_funcs[fid](seq, result);
-}
-#define DECLARE_FILE_FUNCTIONS(_name) \
-static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \
-{ \
-        return acpi_battery_read(_name##_tag, seq); \
-} \
-static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \
-{ \
-        return single_open(file, acpi_battery_read_##_name, PDE_DATA(inode)); \
-}
-DECLARE_FILE_FUNCTIONS(info);
-DECLARE_FILE_FUNCTIONS(state);
-DECLARE_FILE_FUNCTIONS(alarm);
-#undef DECLARE_FILE_FUNCTIONS
-#define FILE_DESCRIPTION_RO(_name) \
-        { \
-        .name = __stringify(_name), \
-        .mode = S_IRUGO, \
-        .ops = { \
-                .open = acpi_battery_##_name##_open_fs, \
-                .read = seq_read, \
-                .llseek = seq_lseek, \
-                .release = single_release, \
-                .owner = THIS_MODULE, \
-                }, \
-        }
-#define FILE_DESCRIPTION_RW(_name) \
-        { \
-        .name = __stringify(_name), \
-        .mode = S_IFREG | S_IRUGO | S_IWUSR, \
-        .ops = { \
-                .open = acpi_battery_##_name##_open_fs, \
-                .read = seq_read, \
-                .llseek = seq_lseek, \
-                .write = acpi_battery_write_##_name, \
-                .release = single_release, \
-                .owner = THIS_MODULE, \
-                }, \
-        }
-static const struct battery_file {
-        struct file_operations ops;
-        umode_t mode;
-        const char *name;
-} acpi_battery_file[] = {
-        FILE_DESCRIPTION_RO(info),
-        FILE_DESCRIPTION_RO(state),
-        FILE_DESCRIPTION_RW(alarm),
-};
-#undef FILE_DESCRIPTION_RO
-#undef FILE_DESCRIPTION_RW
-static int acpi_battery_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-        int i;
-        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
-                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_battery_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
-                entry = proc_create_data(acpi_battery_file[i].name,
-                                         acpi_battery_file[i].mode,
-                                         acpi_device_dir(device),
-                                         &acpi_battery_file[i].ops,
-                                         acpi_driver_data(device));
-                if (!entry)
-                        return -ENODEV;
-        }
-        return 0;
-}
-static void acpi_battery_remove_fs(struct acpi_device *device)
-{
-        int i;
-        if (!acpi_device_dir(device))
-                return;
-        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i)
-                remove_proc_entry(acpi_battery_file[i].name,
-                                  acpi_device_dir(device));
-        remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
-        acpi_device_dir(device) = NULL;
-}
-#endif
-/* --------------------------------------------------------------------------
                                 Driver Interface
   -------------------------------------------------------------------------- */
@@ -1075,15 +775,6 @@ static int acpi_battery_add(struct acpi_device *device)
        result = acpi_battery_update(battery);
        if (result)
                goto fail;
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        result = acpi_battery_add_fs(device);
-#endif
-        if (result) {
-#ifdef CONFIG_ACPI_PROCFS_POWER
-                acpi_battery_remove_fs(device);
-#endif
-                goto fail;
-        }
        printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
                ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
@@ -1110,9 +801,6 @@ static int acpi_battery_remove(struct acpi_device *device)
                return -EINVAL;
        battery = acpi_driver_data(device);
        unregister_pm_notifier(&battery->pm_nb);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_battery_remove_fs(device);
-#endif
        sysfs_remove_battery(battery);
        mutex_destroy(&battery->lock);
        mutex_destroy(&battery->sysfs_lock);
@@ -1158,18 +846,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
 {
        if (acpi_disabled)
                return;
-#ifdef CONFIG_ACPI_PROCFS_POWER
+        acpi_bus_register_driver(&acpi_battery_driver);
-        acpi_battery_dir = acpi_lock_battery_dir();
-        if (!acpi_battery_dir)
-                return;
-#endif
-        if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {
-#ifdef CONFIG_ACPI_PROCFS_POWER
-                acpi_unlock_battery_dir(acpi_battery_dir);
-#endif
-                return;
-        }
-        return;
 }
 static int __init acpi_battery_init(void)
@@ -1181,9 +858,6 @@ static int __init acpi_battery_init(void)
 static void __exit acpi_battery_exit(void)
 {
        acpi_bus_unregister_driver(&acpi_battery_driver);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_unlock_battery_dir(acpi_battery_dir);
-#endif
 }
 module_init(acpi_battery_init);
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 9515f18898b2..fb848378d582 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -274,6 +274,19 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                },
        },
        {
+        .callback = dmi_disable_osi_vista,
+        .ident = "Toshiba NB100",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "NB100"),
+                },
+        },
+        /*
+         * The following machines have broken backlight support when reporting
+         * the Windows 2012 OSI, so disable it until their support is fixed.
+         */
+        {
        .callback = dmi_disable_osi_win8,
        .ident = "ASUS Zenbook Prime UX31A",
        .matches = {
@@ -291,12 +304,60 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
        },
        {
        .callback = dmi_disable_osi_win8,
-        .ident = "Lenovo ThinkPad Edge E530",
+        .ident = "ThinkPad Edge E530",
        .matches = {
                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259A2G"),
                },
        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "ThinkPad Edge E530",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259CTO"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "ThinkPad Edge E530",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259HJG"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "Acer Aspire V5-573G",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "V5-573G/Dazzle_HW"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "Acer Aspire V5-572G",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "V5-572G/Dazzle_CX"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "ThinkPad T431s",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "20AACTO1WW"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "ThinkPad T430",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                     DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),
+                },
+        },
        /*
         * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index a55773801c5f..c971929d75c2 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -383,18 +383,15 @@ static int acpi_button_add(struct acpi_device *device)
        switch (button->type) {
        case ACPI_BUTTON_TYPE_POWER:
-                input->evbit[0] = BIT_MASK(EV_KEY);
+                input_set_capability(input, EV_KEY, KEY_POWER);
-                set_bit(KEY_POWER, input->keybit);
                break;
        case ACPI_BUTTON_TYPE_SLEEP:
-                input->evbit[0] = BIT_MASK(EV_KEY);
+                input_set_capability(input, EV_KEY, KEY_SLEEP);
-                set_bit(KEY_SLEEP, input->keybit);
                break;
        case ACPI_BUTTON_TYPE_LID:
-                input->evbit[0] = BIT_MASK(EV_SW);
+                input_set_capability(input, EV_SW, SW_LID);
-                set_bit(SW_LID, input->swbit);
                break;
        }
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
deleted file mode 100644
index 6c9ee68e46fb..000000000000
--- a/drivers/acpi/cm_sbs.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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/acpi.h>
-#include <linux/types.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#define PREFIX "ACPI: "
-ACPI_MODULE_NAME("cm_sbs");
-#define ACPI_AC_CLASS           "ac_adapter"
-#define ACPI_BATTERY_CLASS      "battery"
-#define _COMPONENT              ACPI_SBS_COMPONENT
-static struct proc_dir_entry *acpi_ac_dir;
-static struct proc_dir_entry *acpi_battery_dir;
-static DEFINE_MUTEX(cm_sbs_mutex);
-static int lock_ac_dir_cnt;
-static int lock_battery_dir_cnt;
-struct proc_dir_entry *acpi_lock_ac_dir(void)
-{
-        mutex_lock(&cm_sbs_mutex);
-        if (!acpi_ac_dir)
-                acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir);
-        if (acpi_ac_dir) {
-                lock_ac_dir_cnt++;
-        } else {
-                printk(KERN_ERR PREFIX
-                                  "Cannot create %s\n", ACPI_AC_CLASS);
-        }
-        mutex_unlock(&cm_sbs_mutex);
-        return acpi_ac_dir;
-}
-EXPORT_SYMBOL(acpi_lock_ac_dir);
-void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)
-{
-        mutex_lock(&cm_sbs_mutex);
-        if (acpi_ac_dir_param)
-                lock_ac_dir_cnt--;
-        if (lock_ac_dir_cnt == 0 && acpi_ac_dir_param && acpi_ac_dir) {
-                remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);
-                acpi_ac_dir = NULL;
-        }
-        mutex_unlock(&cm_sbs_mutex);
-}
-EXPORT_SYMBOL(acpi_unlock_ac_dir);
-struct proc_dir_entry *acpi_lock_battery_dir(void)
-{
-        mutex_lock(&cm_sbs_mutex);
-        if (!acpi_battery_dir) {
-                acpi_battery_dir =
-                    proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);
-        }
-        if (acpi_battery_dir) {
-                lock_battery_dir_cnt++;
-        } else {
-                printk(KERN_ERR PREFIX
-                                  "Cannot create %s\n", ACPI_BATTERY_CLASS);
-        }
-        mutex_unlock(&cm_sbs_mutex);
-        return acpi_battery_dir;
-}
-EXPORT_SYMBOL(acpi_lock_battery_dir);
-void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)
-{
-        mutex_lock(&cm_sbs_mutex);
-        if (acpi_battery_dir_param)
-                lock_battery_dir_cnt--;
-        if (lock_battery_dir_cnt == 0 && acpi_battery_dir_param
-            && acpi_battery_dir) {
-                remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
-                acpi_battery_dir = NULL;
-        }
-        mutex_unlock(&cm_sbs_mutex);
-        return;
-}
-EXPORT_SYMBOL(acpi_unlock_battery_dir);
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index a94383d1f350..d42b2fb5a7e9 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -118,9 +118,10 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
        /*
         * If we were unsure about the device parent's power state up to this
         * point, the fact that the device is in D0 implies that the parent has
-         * to be in D0 too.
+         * to be in D0 too, except if ignore_parent is set.
         */
-        if (device->parent && device->parent->power.state == ACPI_STATE_UNKNOWN
+        if (!device->power.flags.ignore_parent && device->parent
+            && device->parent->power.state == ACPI_STATE_UNKNOWN
            && result == ACPI_STATE_D0)
                device->parent->power.state = ACPI_STATE_D0;
@@ -177,7 +178,8 @@ int acpi_device_set_power(struct acpi_device *device, int state)
                         acpi_power_state_string(state));
                return -ENODEV;
        }
-        if (device->parent && (state < device->parent->power.state)) {
+        if (!device->power.flags.ignore_parent &&
+            device->parent && (state < device->parent->power.state)) {
                dev_warn(&device->dev,
                         "Cannot transition to power state %s for parent in %s\n",
                         acpi_power_state_string(state),
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 05ea4be01a83..dcd73ccb514c 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -441,7 +441,7 @@ static void handle_dock(struct dock_station *ds, int dock)
        acpi_status status;
        struct acpi_object_list arg_list;
        union acpi_object arg;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        unsigned long long value;
        acpi_handle_info(ds->handle, "%s\n", dock ? "docking" : "undocking");
@@ -450,12 +450,10 @@ static void handle_dock(struct dock_station *ds, int dock)
        arg_list.pointer = &arg;
        arg.type = ACPI_TYPE_INTEGER;
        arg.integer.value = dock;
-        status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer);
+        status = acpi_evaluate_integer(ds->handle, "_DCK", &arg_list, &value);
        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
                acpi_handle_err(ds->handle, "Failed to execute _DCK (0x%x)\n",
                                status);
-        kfree(buffer.pointer);
 }
 static inline void dock(struct dock_station *ds)
@@ -671,39 +669,20 @@ static void dock_notify(struct dock_station *ds, u32 event)
        }
 }
-struct dock_data {
+static void acpi_dock_deferred_cb(void *data, u32 event)
-        struct dock_station *ds;
-        u32 event;
-};
-static void acpi_dock_deferred_cb(void *context)
 {
-        struct dock_data *data = context;
        acpi_scan_lock_acquire();
-        dock_notify(data->ds, data->event);
+        dock_notify(data, event);
        acpi_scan_lock_release();
-        kfree(data);
 }
 static void dock_notify_handler(acpi_handle handle, u32 event, void *data)
 {
-        struct dock_data *dd;
        if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK
           && event != ACPI_NOTIFY_EJECT_REQUEST)
                return;
-        dd = kmalloc(sizeof(*dd), GFP_KERNEL);
+        acpi_hotplug_execute(acpi_dock_deferred_cb, data, event);
-        if (dd) {
-                acpi_status status;
-                dd->ds = data;
-                dd->event = event;
-                status = acpi_os_hotplug_execute(acpi_dock_deferred_cb, dd);
-                if (ACPI_FAILURE(status))
-                        kfree(dd);
-        }
 }
 /**
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a06d98374705..d5309fd49458 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -28,6 +28,7 @@
 /* Uncomment next line to get verbose printout */
 /* #define DEBUG */
+#define pr_fmt(fmt) "ACPI : EC: " fmt
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -49,9 +50,6 @@
 #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 */
@@ -131,26 +129,26 @@ static int EC_FLAGS_SKIP_DSDT_SCAN; /* Not all BIOS survive early DSDT scan */
 static inline u8 acpi_ec_read_status(struct acpi_ec *ec)
 {
        u8 x = inb(ec->command_addr);
-        pr_debug(PREFIX "---> status = 0x%2.2x\n", x);
+        pr_debug("---> status = 0x%2.2x\n", x);
        return x;
 }
 static inline u8 acpi_ec_read_data(struct acpi_ec *ec)
 {
        u8 x = inb(ec->data_addr);
-        pr_debug(PREFIX "---> data = 0x%2.2x\n", x);
+        pr_debug("---> data = 0x%2.2x\n", x);
        return x;
 }
 static inline void acpi_ec_write_cmd(struct acpi_ec *ec, u8 command)
 {
-        pr_debug(PREFIX "<--- command = 0x%2.2x\n", command);
+        pr_debug("<--- command = 0x%2.2x\n", command);
        outb(command, ec->command_addr);
 }
 static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
 {
-        pr_debug(PREFIX "<--- data = 0x%2.2x\n", data);
+        pr_debug("<--- data = 0x%2.2x\n", data);
        outb(data, ec->data_addr);
 }
@@ -241,7 +239,7 @@ static int ec_poll(struct acpi_ec *ec)
                        }
                        advance_transaction(ec, acpi_ec_read_status(ec));
                } while (time_before(jiffies, delay));
-                pr_debug(PREFIX "controller reset, restart transaction\n");
+                pr_debug("controller reset, restart transaction\n");
                spin_lock_irqsave(&ec->lock, flags);
                start_transaction(ec);
                spin_unlock_irqrestore(&ec->lock, flags);
@@ -309,12 +307,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                }
        }
        if (ec_wait_ibf0(ec)) {
-                pr_err(PREFIX "input buffer is not empty, "
+                pr_err("input buffer is not empty, "
                                "aborting transaction\n");
                status = -ETIME;
                goto end;
        }
-        pr_debug(PREFIX "transaction start (cmd=0x%02x, addr=0x%02x)\n",
+        pr_debug("transaction start (cmd=0x%02x, addr=0x%02x)\n",
                        t->command, t->wdata ? t->wdata[0] : 0);
        /* disable GPE during transaction if storm is detected */
        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
@@ -331,12 +329,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                /* It is safe to enable the GPE outside of the transaction. */
                acpi_enable_gpe(NULL, ec->gpe);
        } else if (t->irq_count > ec_storm_threshold) {
-                pr_info(PREFIX "GPE storm detected(%d GPEs), "
+                pr_info("GPE storm detected(%d GPEs), "
                        "transactions will use polling mode\n",
                        t->irq_count);
                set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
        }
-        pr_debug(PREFIX "transaction end\n");
+        pr_debug("transaction end\n");
 end:
        if (ec->global_lock)
                acpi_release_global_lock(glk);
@@ -570,12 +568,12 @@ static void acpi_ec_run(void *cxt)
        struct acpi_ec_query_handler *handler = cxt;
        if (!handler)
                return;
-        pr_debug(PREFIX "start query execution\n");
+        pr_debug("start query execution\n");
        if (handler->func)
                handler->func(handler->data);
        else if (handler->handle)
                acpi_evaluate_object(handler->handle, NULL, NULL, NULL);
-        pr_debug(PREFIX "stop query execution\n");
+        pr_debug("stop query execution\n");
        kfree(handler);
 }
@@ -593,7 +591,8 @@ static int acpi_ec_sync_query(struct acpi_ec *ec)
                        if (!copy)
                                return -ENOMEM;
                        memcpy(copy, handler, sizeof(*copy));
-                        pr_debug(PREFIX "push query execution (0x%2x) on queue\n", value);
+                        pr_debug("push query execution (0x%2x) on queue\n",
+                                value);
                        return acpi_os_execute((copy->func) ?
                                OSL_NOTIFY_HANDLER : OSL_GPE_HANDLER,
                                acpi_ec_run, copy);
@@ -616,7 +615,7 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
 {
        if (state & ACPI_EC_FLAG_SCI) {
                if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags)) {
-                        pr_debug(PREFIX "push gpe query to the queue\n");
+                        pr_debug("push gpe query to the queue\n");
                        return acpi_os_execute(OSL_NOTIFY_HANDLER,
                                acpi_ec_gpe_query, ec);
                }
@@ -630,7 +629,7 @@ static u32 acpi_ec_gpe_handler(acpi_handle gpe_device,
        struct acpi_ec *ec = data;
        u8 status = acpi_ec_read_status(ec);
-        pr_debug(PREFIX "~~~> interrupt, status:0x%02x\n", status);
+        pr_debug("~~~> interrupt, status:0x%02x\n", status);
        advance_transaction(ec, status);
        if (ec_transaction_done(ec) &&
@@ -776,7 +775,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
                         * The AE_NOT_FOUND error will be ignored and OS
                         * continue to initialize EC.
                         */
-                        printk(KERN_ERR "Fail in evaluating the _REG object"
+                        pr_err("Fail in evaluating the _REG object"
                                " of EC device. Broken bios is suspected.\n");
                } else {
                        acpi_remove_gpe_handler(NULL, ec->gpe,
@@ -795,10 +794,10 @@ static void ec_remove_handlers(struct acpi_ec *ec)
        acpi_disable_gpe(NULL, ec->gpe);
        if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
-                pr_err(PREFIX "failed to remove space handler\n");
+                pr_err("failed to remove space handler\n");
        if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
                                &acpi_ec_gpe_handler)))
-                pr_err(PREFIX "failed to remove gpe handler\n");
+                pr_err("failed to remove gpe handler\n");
        clear_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
 }
@@ -840,7 +839,7 @@ static int acpi_ec_add(struct acpi_device *device)
        ret = !!request_region(ec->command_addr, 1, "EC cmd");
        WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr);
-        pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
+        pr_info("GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                          ec->gpe, ec->command_addr, ec->data_addr);
        ret = ec_install_handlers(ec);
@@ -931,7 +930,7 @@ static int ec_validate_ecdt(const struct dmi_system_id *id)
 /* MSI EC needs special treatment, enable it */
 static int ec_flag_msi(const struct dmi_system_id *id)
 {
-        printk(KERN_DEBUG PREFIX "Detected MSI hardware, enabling workarounds.\n");
+        pr_debug("Detected MSI hardware, enabling workarounds.\n");
        EC_FLAGS_MSI = 1;
        EC_FLAGS_VALIDATE_ECDT = 1;
        return 0;
@@ -1010,7 +1009,7 @@ int __init acpi_ec_ecdt_probe(void)
        status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                (struct acpi_table_header **)&ecdt_ptr);
        if (ACPI_SUCCESS(status)) {
-                pr_info(PREFIX "EC description table is found, configuring boot EC\n");
+                pr_info("EC description table is found, configuring boot EC\n");
                boot_ec->command_addr = ecdt_ptr->control.address;
                boot_ec->data_addr = ecdt_ptr->data.address;
                boot_ec->gpe = ecdt_ptr->gpe;
@@ -1030,7 +1029,7 @@ int __init acpi_ec_ecdt_probe(void)
        /* This workaround is needed only on some broken machines,
         * which require early EC, but fail to provide ECDT */
-        printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
+        pr_debug("Look up EC in DSDT\n");
        status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                        boot_ec, NULL);
        /* Check that acpi_get_devices actually find something */
@@ -1042,7 +1041,7 @@ int __init acpi_ec_ecdt_probe(void)
                    saved_ec->data_addr != boot_ec->data_addr ||
                    saved_ec->gpe != boot_ec->gpe ||
                    saved_ec->handle != boot_ec->handle)
-                        pr_info(PREFIX "ASUSTek keeps feeding us with broken "
+                        pr_info("ASUSTek keeps feeding us with broken "
                        "ECDT tables, which are very hard to workaround. "
                        "Trying to use DSDT EC info instead. Please send "
                        "output of acpidump to linux-acpi@vger.kernel.org\n");
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 8247fcdde079..fdef416c0ff6 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -127,11 +127,6 @@ int acpi_bus_generate_netlink_event(const char *device_class,
        }
        event = nla_data(attr);
-        if (!event) {
-                nlmsg_free(skb);
-                return -EINVAL;
-        }
        memset(event, 0, sizeof(struct acpi_genl_event));
        strcpy(event->device_class, device_class);
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 41ade6570bc0..ba3da88cee45 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -168,7 +168,7 @@ static int acpi_fan_add(struct acpi_device *device)
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
-      end:
+end:
        return result;
 }
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 20f423337e1f..a29739c0ba79 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -26,11 +26,6 @@
 acpi_status acpi_os_initialize1(void);
 int init_acpi_device_notify(void);
 int acpi_scan_init(void);
-#ifdef  CONFIG_ACPI_PCI_SLOT
-void acpi_pci_slot_init(void);
-#else
-static inline void acpi_pci_slot_init(void) { }
-#endif
 void acpi_pci_root_init(void);
 void acpi_pci_link_init(void);
 void acpi_pci_root_hp_init(void);
@@ -92,6 +87,7 @@ void acpi_device_add_finalize(struct acpi_device *device);
 void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
 int acpi_bind_one(struct device *dev, acpi_handle handle);
 int acpi_unbind_one(struct device *dev);
+void acpi_bus_device_eject(void *data, u32 ost_src);
 /* --------------------------------------------------------------------------
                                  Power Resource
@@ -169,9 +165,7 @@ int acpi_create_platform_device(struct acpi_device *adev,
                                        Video
  -------------------------------------------------------------------------- */
 #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
-bool acpi_video_backlight_quirks(void);
+bool acpi_osi_is_win8(void);
-#else
-static inline bool acpi_video_backlight_quirks(void) { return false; }
 #endif
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 2e82e5d76930..a2343a1d9e0b 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -73,7 +73,7 @@ int acpi_map_pxm_to_node(int pxm)
 {
        int node = pxm_to_node_map[pxm];
-        if (node < 0) {
+        if (node == NUMA_NO_NODE) {
                if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
                        return NUMA_NO_NODE;
                node = first_unset_node(nodes_found_map);
@@ -334,7 +334,7 @@ int acpi_get_pxm(acpi_handle h)
 int acpi_get_node(acpi_handle *handle)
 {
-        int pxm, node = -1;
+        int pxm, node = NUMA_NO_NODE;
        pxm = acpi_get_pxm(handle);
        if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e5f416c7f66e..54a20ff4b864 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -61,7 +61,6 @@ struct acpi_os_dpc {
        acpi_osd_exec_callback function;
        void *context;
        struct work_struct work;
-        int wait;
 };
 #ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -569,8 +568,10 @@ static const char * const table_sigs[] = {
 #define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)
-/* Must not increase 10 or needs code modification below */
+#define ACPI_OVERRIDE_TABLES 64
-#define ACPI_OVERRIDE_TABLES 10
+static struct cpio_data __initdata acpi_initrd_files[ACPI_OVERRIDE_TABLES];
+#define MAP_CHUNK_SIZE   (NR_FIX_BTMAPS << PAGE_SHIFT)
 void __init acpi_initrd_override(void *data, size_t size)
 {
@@ -579,8 +580,6 @@ void __init acpi_initrd_override(void *data, size_t size)
        struct acpi_table_header *table;
        char cpio_path[32] = "kernel/firmware/acpi/";
        struct cpio_data file;
-        struct cpio_data early_initrd_files[ACPI_OVERRIDE_TABLES];
-        char *p;
        if (data == NULL || size == 0)
                return;
@@ -625,8 +624,8 @@ void __init acpi_initrd_override(void *data, size_t size)
                        table->signature, cpio_path, file.name, table->length);
                all_tables_size += table->length;
-                early_initrd_files[table_nr].data = file.data;
+                acpi_initrd_files[table_nr].data = file.data;
-                early_initrd_files[table_nr].size = file.size;
+                acpi_initrd_files[table_nr].size = file.size;
                table_nr++;
        }
        if (table_nr == 0)
@@ -652,14 +651,34 @@ void __init acpi_initrd_override(void *data, size_t size)
        memblock_reserve(acpi_tables_addr, all_tables_size);
        arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
-        p = early_ioremap(acpi_tables_addr, all_tables_size);
+        /*
+         * early_ioremap only can remap 256k one time. If we map all
+         * tables one time, we will hit the limit. Need to map chunks
+         * one by one during copying the same as that in relocate_initrd().
+         */
        for (no = 0; no < table_nr; no++) {
-                memcpy(p + total_offset, early_initrd_files[no].data,
+                unsigned char *src_p = acpi_initrd_files[no].data;
-                       early_initrd_files[no].size);
+                phys_addr_t size = acpi_initrd_files[no].size;
-                total_offset += early_initrd_files[no].size;
+                phys_addr_t dest_addr = acpi_tables_addr + total_offset;
+                phys_addr_t slop, clen;
+                char *dest_p;
+                total_offset += size;
+                while (size) {
+                        slop = dest_addr & ~PAGE_MASK;
+                        clen = size;
+                        if (clen > MAP_CHUNK_SIZE - slop)
+                                clen = MAP_CHUNK_SIZE - slop;
+                        dest_p = early_ioremap(dest_addr & PAGE_MASK,
+                                                 clen + slop);
+                        memcpy(dest_p + slop, src_p, clen);
+                        early_iounmap(dest_p, clen + slop);
+                        src_p += clen;
+                        dest_addr += clen;
+                        size -= clen;
+                }
        }
-        early_iounmap(p, all_tables_size);
 }
 #endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */
@@ -820,7 +839,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
 void acpi_os_sleep(u64 ms)
 {
-        schedule_timeout_interruptible(msecs_to_jiffies(ms));
+        msleep(ms);
 }
 void acpi_os_stall(u32 us)
@@ -1067,9 +1086,6 @@ static void acpi_os_execute_deferred(struct work_struct *work)
 {
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
-        if (dpc->wait)
-                acpi_os_wait_events_complete();
        dpc->function(dpc->context);
        kfree(dpc);
 }
@@ -1089,8 +1105,8 @@ static void acpi_os_execute_deferred(struct work_struct *work)
 *
 ******************************************************************************/
-static acpi_status __acpi_os_execute(acpi_execute_type type,
+acpi_status acpi_os_execute(acpi_execute_type type,
-        acpi_osd_exec_callback function, void *context, int hp)
+                            acpi_osd_exec_callback function, void *context)
 {
        acpi_status status = AE_OK;
        struct acpi_os_dpc *dpc;
@@ -1117,20 +1133,11 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
        dpc->context = context;
        /*
-         * We can't run hotplug code in keventd_wq/kacpid_wq/kacpid_notify_wq
-         * because the hotplug code may call driver .remove() functions,
-         * which invoke flush_scheduled_work/acpi_os_wait_events_complete
-         * to flush these workqueues.
-         *
         * To prevent lockdep from complaining unnecessarily, make sure that
         * there is a different static lockdep key for each workqueue by using
         * INIT_WORK() for each of them separately.
         */
-        if (hp) {
+        if (type == OSL_NOTIFY_HANDLER) {
-                queue = kacpi_hotplug_wq;
-                dpc->wait = 1;
-                INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-        } else if (type == OSL_NOTIFY_HANDLER) {
                queue = kacpi_notify_wq;
                INIT_WORK(&dpc->work, acpi_os_execute_deferred);
        } else {
@@ -1155,28 +1162,59 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
        }
        return status;
 }
+EXPORT_SYMBOL(acpi_os_execute);
-acpi_status acpi_os_execute(acpi_execute_type type,
+void acpi_os_wait_events_complete(void)
-                            acpi_osd_exec_callback function, void *context)
 {
-        return __acpi_os_execute(type, function, context, 0);
+        flush_workqueue(kacpid_wq);
+        flush_workqueue(kacpi_notify_wq);
 }
-EXPORT_SYMBOL(acpi_os_execute);
-acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function,
+struct acpi_hp_work {
-        void *context)
+        struct work_struct work;
+        acpi_hp_callback func;
+        void *data;
+        u32 src;
+};
+static void acpi_hotplug_work_fn(struct work_struct *work)
 {
-        return __acpi_os_execute(0, function, context, 1);
+        struct acpi_hp_work *hpw = container_of(work, struct acpi_hp_work, work);
+        acpi_os_wait_events_complete();
+        hpw->func(hpw->data, hpw->src);
+        kfree(hpw);
 }
-EXPORT_SYMBOL(acpi_os_hotplug_execute);
-void acpi_os_wait_events_complete(void)
+acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src)
 {
-        flush_workqueue(kacpid_wq);
+        struct acpi_hp_work *hpw;
-        flush_workqueue(kacpi_notify_wq);
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                  "Scheduling function [%p(%p, %u)] for deferred execution.\n",
+                  func, data, src));
+        hpw = kmalloc(sizeof(*hpw), GFP_KERNEL);
+        if (!hpw)
+                return AE_NO_MEMORY;
+        INIT_WORK(&hpw->work, acpi_hotplug_work_fn);
+        hpw->func = func;
+        hpw->data = data;
+        hpw->src = src;
+        /*
+         * We can't run hotplug code in kacpid_wq/kacpid_notify_wq etc., because
+         * the hotplug code may call driver .remove() functions, which may
+         * invoke flush_scheduled_work()/acpi_os_wait_events_complete() to flush
+         * these workqueues.
+         */
+        if (!queue_work(kacpi_hotplug_wq, &hpw->work)) {
+                kfree(hpw);
+                return AE_ERROR;
+        }
+        return AE_OK;
 }
-EXPORT_SYMBOL(acpi_os_wait_events_complete);
 acpi_status
 acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
@@ -1335,7 +1373,7 @@ static int __init acpi_os_name_setup(char *str)
        if (!str || !*str)
                return 0;
-        for (; count-- && str && *str; str++) {
+        for (; count-- && *str; str++) {
                if (isalnum(*str) || *str == ' ' || *str == ':')
                        *p++ = *str;
                else if (*str == '\'' || *str == '"')
@@ -1825,25 +1863,3 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,
 {
        __acpi_os_prepare_extended_sleep = func;
 }
-void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context,
-                        void (*func)(struct work_struct *work))
-{
-        struct acpi_hp_work *hp_work;
-        int ret;
-        hp_work = kmalloc(sizeof(*hp_work), GFP_KERNEL);
-        if (!hp_work)
-                return;
-        hp_work->handle = handle;
-        hp_work->type = type;
-        hp_work->context = context;
-        INIT_WORK(&hp_work->work, func);
-        ret = queue_work(kacpi_hotplug_wq, &hp_work->work);
-        if (!ret)
-                kfree(hp_work);
-}
-EXPORT_SYMBOL_GPL(alloc_acpi_hp_work);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index d3874f425653..417876bce854 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -39,6 +39,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/apei.h>
+#include "internal.h"
 #define PREFIX "ACPI: "
 #define _COMPONENT              ACPI_PCI_COMPONENT
@@ -590,39 +592,10 @@ static void handle_root_bridge_insertion(acpi_handle handle)
                acpi_handle_err(handle, "cannot add bridge to acpi list\n");
 }
-static void handle_root_bridge_removal(struct acpi_device *device)
+static void hotplug_event_root(void *data, u32 type)
-{
-        acpi_status status;
-        struct acpi_eject_event *ej_event;
-        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-        if (!ej_event) {
-                /* Inform firmware the hot-remove operation has error */
-                (void) acpi_evaluate_hotplug_ost(device->handle,
-                                        ACPI_NOTIFY_EJECT_REQUEST,
-                                        ACPI_OST_SC_NON_SPECIFIC_FAILURE,
-                                        NULL);
-                return;
-        }
-        ej_event->device = device;
-        ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-        status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);
-        if (ACPI_FAILURE(status))
-                kfree(ej_event);
-}
-static void _handle_hotplug_event_root(struct work_struct *work)
 {
+        acpi_handle handle = data;
        struct acpi_pci_root *root;
-        struct acpi_hp_work *hp_work;
-        acpi_handle handle;
-        u32 type;
-        hp_work = container_of(work, struct acpi_hp_work, work);
-        handle = hp_work->handle;
-        type = hp_work->type;
        acpi_scan_lock_acquire();
@@ -652,9 +625,15 @@ static void _handle_hotplug_event_root(struct work_struct *work)
                /* request device eject */
                acpi_handle_printk(KERN_DEBUG, handle,
                                   "Device eject notify on %s\n", __func__);
-                if (root)
+                if (!root)
-                        handle_root_bridge_removal(root->device);
+                        break;
-                break;
+                get_device(&root->device->dev);
+                acpi_scan_lock_release();
+                acpi_bus_device_eject(root->device, ACPI_NOTIFY_EJECT_REQUEST);
+                return;
        default:
                acpi_handle_warn(handle,
                                 "notify_handler: unknown event type 0x%x\n",
@@ -663,14 +642,12 @@ static void _handle_hotplug_event_root(struct work_struct *work)
        }
        acpi_scan_lock_release();
-        kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
 }
 static void handle_hotplug_event_root(acpi_handle handle, u32 type,
                                        void *context)
 {
-        alloc_acpi_hp_work(handle, type, context,
+        acpi_hotplug_execute(hotplug_event_root, handle, type);
-                                _handle_hotplug_event_root);
 }
 static acpi_status __init
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 04a13784dd20..6a5b152ad4d0 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -8,289 +8,17 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-#ifdef CONFIG_X86
-#include <linux/mc146818rtc.h>
-#endif
 #include "sleep.h"
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 /*
 * this file provides support for:
- * /proc/acpi/alarm
 * /proc/acpi/wakeup
 */
 ACPI_MODULE_NAME("sleep")
-#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
-/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
-#else
-#define HAVE_ACPI_LEGACY_ALARM
-#endif
-#ifdef  HAVE_ACPI_LEGACY_ALARM
-static u32 cmos_bcd_read(int offset, int rtc_control);
-static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
-{
-        u32 sec, min, hr;
-        u32 day, mo, yr, cent = 0;
-        u32 today = 0;
-        unsigned char rtc_control = 0;
-        unsigned long flags;
-        spin_lock_irqsave(&rtc_lock, flags);
-        rtc_control = CMOS_READ(RTC_CONTROL);
-        sec = cmos_bcd_read(RTC_SECONDS_ALARM, rtc_control);
-        min = cmos_bcd_read(RTC_MINUTES_ALARM, rtc_control);
-        hr = cmos_bcd_read(RTC_HOURS_ALARM, rtc_control);
-        /* If we ever get an FACP with proper values... */
-        if (acpi_gbl_FADT.day_alarm) {
-                /* ACPI spec: only low 6 its should be cared */
-                day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F;
-                if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                        day = bcd2bin(day);
-        } else
-                day = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
-        if (acpi_gbl_FADT.month_alarm)
-                mo = cmos_bcd_read(acpi_gbl_FADT.month_alarm, rtc_control);
-        else {
-                mo = cmos_bcd_read(RTC_MONTH, rtc_control);
-                today = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
-        }
-        if (acpi_gbl_FADT.century)
-                cent = cmos_bcd_read(acpi_gbl_FADT.century, rtc_control);
-        yr = cmos_bcd_read(RTC_YEAR, rtc_control);
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        /* we're trusting the FADT (see above) */
-        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?
-                 *
-                 * TBD:
-                 *  ASAP: find piece of code in the kernel, e.g. star tracker driver,
-                 *        which we can trust to determine the century correctly. Atom
-                 *        watch driver would be nice, too...
-                 *
-                 *  if that has not happened, change for first release in 2050:
-                 *        if (yr<50)
-                 *                yr += 2100;
-                 *        else
-                 *                yr += 2000;   // current line of code
-                 *
-                 *  if that has not happened either, please do on 2099/12/31:23:59:59
-                 *        s/2000/2100
-                 *
-                 */
-                yr += 2000;
-        else
-                yr += cent * 100;
-        /*
-         * Show correct dates for alarms up to a month into the future.
-         * This solves issues for nearly all situations with the common
-         * 30-day alarm clocks in PC hardware.
-         */
-        if (day < today) {
-                if (mo < 12) {
-                        mo += 1;
-                } else {
-                        mo = 1;
-                        yr += 1;
-                }
-        }
-        seq_printf(seq, "%4.4u-", yr);
-        (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo);
-        (day > 31) ? seq_puts(seq, "** ") : seq_printf(seq, "%2.2u ", day);
-        (hr > 23) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", hr);
-        (min > 59) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", min);
-        (sec > 59) ? seq_puts(seq, "**\n") : seq_printf(seq, "%2.2u\n", sec);
-        return 0;
-}
-static int acpi_system_alarm_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_system_alarm_seq_show, PDE_DATA(inode));
-}
-static int get_date_field(char **p, u32 * value)
-{
-        char *next = NULL;
-        char *string_end = NULL;
-        int result = -EINVAL;
-        /*
-         * Try to find delimeter, only to insert null.  The end of the
-         * string won't have one, but is still valid.
-         */
-        if (*p == NULL)
-                return result;
-        next = strpbrk(*p, "- :");
-        if (next)
-                *next++ = '\0';
-        *value = simple_strtoul(*p, &string_end, 10);
-        /* Signal success if we got a good digit */
-        if (string_end != *p)
-                result = 0;
-        if (next)
-                *p = next;
-        else
-                *p = NULL;
-        return result;
-}
-/* Read a possibly BCD register, always return binary */
-static u32 cmos_bcd_read(int offset, int rtc_control)
-{
-        u32 val = CMOS_READ(offset);
-        if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                val = bcd2bin(val);
-        return val;
-}
-/* Write binary value into possibly BCD register */
-static void cmos_bcd_write(u32 val, int offset, int rtc_control)
-{
-        if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                val = bin2bcd(val);
-        CMOS_WRITE(val, offset);
-}
-static ssize_t
-acpi_system_write_alarm(struct file *file,
-                        const char __user * buffer, size_t count, loff_t * ppos)
-{
-        int result = 0;
-        char alarm_string[30] = { '\0' };
-        char *p = alarm_string;
-        u32 sec, min, hr, day, mo, yr;
-        int adjust = 0;
-        unsigned char rtc_control = 0;
-        if (count > sizeof(alarm_string) - 1)
-                return -EINVAL;
-        if (copy_from_user(alarm_string, buffer, count))
-                return -EFAULT;
-        alarm_string[count] = '\0';
-        /* check for time adjustment */
-        if (alarm_string[0] == '+') {
-                p++;
-                adjust = 1;
-        }
-        if ((result = get_date_field(&p, &yr)))
-                goto end;
-        if ((result = get_date_field(&p, &mo)))
-                goto end;
-        if ((result = get_date_field(&p, &day)))
-                goto end;
-        if ((result = get_date_field(&p, &hr)))
-                goto end;
-        if ((result = get_date_field(&p, &min)))
-                goto end;
-        if ((result = get_date_field(&p, &sec)))
-                goto end;
-        spin_lock_irq(&rtc_lock);
-        rtc_control = CMOS_READ(RTC_CONTROL);
-        if (adjust) {
-                yr += cmos_bcd_read(RTC_YEAR, rtc_control);
-                mo += cmos_bcd_read(RTC_MONTH, rtc_control);
-                day += cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
-                hr += cmos_bcd_read(RTC_HOURS, rtc_control);
-                min += cmos_bcd_read(RTC_MINUTES, rtc_control);
-                sec += cmos_bcd_read(RTC_SECONDS, rtc_control);
-        }
-        spin_unlock_irq(&rtc_lock);
-        if (sec > 59) {
-                min += sec/60;
-                sec = sec%60;
-        }
-        if (min > 59) {
-                hr += min/60;
-                min = min%60;
-        }
-        if (hr > 23) {
-                day += hr/24;
-                hr = hr%24;
-        }
-        if (day > 31) {
-                mo += day/32;
-                day = day%32;
-        }
-        if (mo > 12) {
-                yr += mo/13;
-                mo = mo%13;
-        }
-        spin_lock_irq(&rtc_lock);
-        /*
-         * Disable alarm interrupt before setting alarm timer or else
-         * when ACPI_EVENT_RTC is enabled, a spurious ACPI interrupt occurs
-         */
-        rtc_control &= ~RTC_AIE;
-        CMOS_WRITE(rtc_control, RTC_CONTROL);
-        CMOS_READ(RTC_INTR_FLAGS);
-        /* write the fields the rtc knows about */
-        cmos_bcd_write(hr, RTC_HOURS_ALARM, rtc_control);
-        cmos_bcd_write(min, RTC_MINUTES_ALARM, rtc_control);
-        cmos_bcd_write(sec, RTC_SECONDS_ALARM, rtc_control);
-        /*
-         * If the system supports an enhanced alarm it will have non-zero
-         * offsets into the CMOS RAM here -- which for some reason are pointing
-         * to the RTC area of memory.
-         */
-        if (acpi_gbl_FADT.day_alarm)
-                cmos_bcd_write(day, acpi_gbl_FADT.day_alarm, rtc_control);
-        if (acpi_gbl_FADT.month_alarm)
-                cmos_bcd_write(mo, acpi_gbl_FADT.month_alarm, rtc_control);
-        if (acpi_gbl_FADT.century) {
-                if (adjust)
-                        yr += cmos_bcd_read(acpi_gbl_FADT.century, rtc_control) * 100;
-                cmos_bcd_write(yr / 100, acpi_gbl_FADT.century, rtc_control);
-        }
-        /* enable the rtc alarm interrupt */
-        rtc_control |= RTC_AIE;
-        CMOS_WRITE(rtc_control, RTC_CONTROL);
-        CMOS_READ(RTC_INTR_FLAGS);
-        spin_unlock_irq(&rtc_lock);
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_enable_event(ACPI_EVENT_RTC, 0);
-        *ppos += count;
-        result = 0;
-      end:
-        return result ? result : count;
-}
-#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 static int
 acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 {
@@ -417,41 +145,8 @@ static const struct file_operations acpi_system_wakeup_device_fops = {
        .release = single_release,
 };
-#ifdef  HAVE_ACPI_LEGACY_ALARM
-static const struct file_operations acpi_system_alarm_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_system_alarm_open_fs,
-        .read = seq_read,
-        .write = acpi_system_write_alarm,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-static u32 rtc_handler(void *context)
-{
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_disable_event(ACPI_EVENT_RTC, 0);
-        return ACPI_INTERRUPT_HANDLED;
-}
-#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 int __init acpi_sleep_proc_init(void)
 {
-#ifdef  HAVE_ACPI_LEGACY_ALARM
-        /* 'alarm' [R/W] */
-        proc_create("alarm", S_IFREG | S_IRUGO | S_IWUSR,
-                    acpi_root_dir, &acpi_system_alarm_fops);
-        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
-        /*
-         * Disable the RTC event after installing RTC handler.
-         * Only when RTC alarm is set will it be enabled.
-         */
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_disable_event(ACPI_EVENT_RTC, 0);
-#endif                          /* HAVE_ACPI_LEGACY_ALARM */
        /* 'wakeup device' [R/W] */
        proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR,
                    acpi_root_dir, &acpi_system_wakeup_device_fops);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index cf34d903f4fb..b3171f30b319 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -162,16 +162,23 @@ exit:
        return apic_id;
 }
-int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
+int acpi_get_apicid(acpi_handle handle, int type, u32 acpi_id)
 {
-#ifdef CONFIG_SMP
+        int apic_id;
-        int i;
-#endif
-        int apic_id = -1;
        apic_id = map_mat_entry(handle, type, acpi_id);
        if (apic_id == -1)
                apic_id = map_madt_entry(type, acpi_id);
+        return apic_id;
+}
+int acpi_map_cpuid(int apic_id, u32 acpi_id)
+{
+#ifdef CONFIG_SMP
+        int i;
+#endif
        if (apic_id == -1) {
                /*
                 * On UP processor, there is no _MAT or MADT table.
@@ -211,6 +218,15 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
 #endif
        return -1;
 }
+int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
+{
+        int apic_id;
+        apic_id = acpi_get_apicid(handle, type, acpi_id);
+        return acpi_map_cpuid(apic_id, acpi_id);
+}
 EXPORT_SYMBOL_GPL(acpi_get_cpuid);
 static bool __init processor_physically_present(acpi_handle handle)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index e534ba66d5b8..146ab7e2b81d 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -153,8 +153,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
        return NOTIFY_OK;
 }
-static struct notifier_block __refdata acpi_cpu_notifier =
+static struct notifier_block __refdata acpi_cpu_notifier = {
-{
            .notifier_call = acpi_cpu_soft_notify,
 };
@@ -172,7 +171,6 @@ static int __acpi_processor_start(struct acpi_device *device)
 #ifdef CONFIG_CPU_FREQ
        acpi_processor_ppc_has_changed(pr, 0);
-        acpi_processor_load_module(pr);
 #endif
        acpi_processor_get_throttling_info(pr);
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index c7414a545a4f..644516d9bde6 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -265,9 +265,6 @@ static void tsc_check_state(int state) { return; }
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
-        if (!pr)
-                return -EINVAL;
        if (!pr->pblk)
                return -ENODEV;
@@ -1050,12 +1047,8 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
        if (disabled_by_idle_boot_param())
                return 0;
-        if (!pr)
+        if (nocst)
-                return -EINVAL;
-        if (nocst) {
                return -ENODEV;
-        }
        if (!pr->flags.power_setup_done)
                return -ENODEV;
@@ -1082,9 +1075,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
        if (disabled_by_idle_boot_param())
                return 0;
-        if (!pr)
-                return -EINVAL;
        if (nocst)
                return -ENODEV;
@@ -1157,9 +1147,6 @@ int acpi_processor_power_init(struct acpi_processor *pr)
                first_run++;
        }
-        if (!pr)
-                return -EINVAL;
        if (acpi_gbl_FADT.cst_control && !nocst) {
                status =
                    acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8);
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 51d7948611da..60a7c28fc167 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -235,28 +235,6 @@ void acpi_processor_ppc_exit(void)
        acpi_processor_ppc_status &= ~PPC_REGISTERED;
 }
-/*
- * Do a quick check if the systems looks like it should use ACPI
- * cpufreq. We look at a _PCT method being available, but don't
- * do a whole lot of sanity checks.
- */
-void acpi_processor_load_module(struct acpi_processor *pr)
-{
-        static int requested;
-        acpi_status status = 0;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        if (!arch_has_acpi_pdc() || requested)
-                return;
-        status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
-        if (!ACPI_FAILURE(status)) {
-                printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n");
-                request_module_nowait("acpi_cpufreq");
-                requested = 1;
-        }
-        kfree(buffer.pointer);
-}
 static int acpi_processor_get_performance_control(struct acpi_processor *pr)
 {
        int result = 0;
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index aef7e1cd1e5d..d465ae6cdd00 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -30,12 +30,6 @@
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
-#ifdef CONFIG_ACPI_PROCFS_POWER
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-#endif
 #include <linux/acpi.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
@@ -67,11 +61,6 @@ static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
-extern struct proc_dir_entry *acpi_lock_ac_dir(void);
-extern struct proc_dir_entry *acpi_lock_battery_dir(void);
-extern void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);
-extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
 #define MAX_SBS_BAT                     4
 #define ACPI_SBS_BLOCK_MAX              32
@@ -84,9 +73,6 @@ MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
 struct acpi_battery {
        struct power_supply bat;
        struct acpi_sbs *sbs;
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        struct proc_dir_entry *proc_entry;
-#endif
        unsigned long update_time;
        char name[8];
        char manufacturer_name[ACPI_SBS_BLOCK_MAX];
@@ -119,9 +105,6 @@ struct acpi_sbs {
        struct acpi_device *device;
        struct acpi_smb_hc *hc;
        struct mutex lock;
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        struct proc_dir_entry *charger_entry;
-#endif
        struct acpi_battery battery[MAX_SBS_BAT];
        u8 batteries_supported:4;
        u8 manager_present:1;
@@ -482,261 +465,6 @@ static struct device_attribute alarm_attr = {
 };
 /* --------------------------------------------------------------------------
-                              FS Interface (/proc/acpi)
-   -------------------------------------------------------------------------- */
-#ifdef CONFIG_ACPI_PROCFS_POWER
-/* Generic Routines */
-static int
-acpi_sbs_add_fs(struct proc_dir_entry **dir,
-                struct proc_dir_entry *parent_dir,
-                char *dir_name,
-                const struct file_operations *info_fops,
-                const struct file_operations *state_fops,
-                const struct file_operations *alarm_fops, void *data)
-{
-        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded,"
-                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
-        if (!*dir) {
-                *dir = proc_mkdir(dir_name, parent_dir);
-                if (!*dir) {
-                        return -ENODEV;
-                }
-        }
-        /* 'info' [R] */
-        if (info_fops)
-                proc_create_data(ACPI_SBS_FILE_INFO, S_IRUGO, *dir,
-                                 info_fops, data);
-        /* 'state' [R] */
-        if (state_fops)
-                proc_create_data(ACPI_SBS_FILE_STATE, S_IRUGO, *dir,
-                                 state_fops, data);
-        /* 'alarm' [R/W] */
-        if (alarm_fops)
-                proc_create_data(ACPI_SBS_FILE_ALARM, S_IRUGO, *dir,
-                                 alarm_fops, data);
-        return 0;
-}
-/* Smart Battery Interface */
-static struct proc_dir_entry *acpi_battery_dir = NULL;
-static inline char *acpi_battery_units(struct acpi_battery *battery)
-{
-        return acpi_battery_mode(battery) ? " mW" : " mA";
-}
-static int acpi_battery_read_info(struct seq_file *seq, void *offset)
-{
-        struct acpi_battery *battery = seq->private;
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        mutex_lock(&sbs->lock);
-        seq_printf(seq, "present:                 %s\n",
-                   (battery->present) ? "yes" : "no");
-        if (!battery->present)
-                goto end;
-        seq_printf(seq, "design capacity:         %i%sh\n",
-                   battery->design_capacity * acpi_battery_scale(battery),
-                   acpi_battery_units(battery));
-        seq_printf(seq, "last full capacity:      %i%sh\n",
-                   battery->full_charge_capacity * acpi_battery_scale(battery),
-                   acpi_battery_units(battery));
-        seq_printf(seq, "battery technology:      rechargeable\n");
-        seq_printf(seq, "design voltage:          %i mV\n",
-                   battery->design_voltage * acpi_battery_vscale(battery));
-        seq_printf(seq, "design capacity warning: unknown\n");
-        seq_printf(seq, "design capacity low:     unknown\n");
-        seq_printf(seq, "cycle count:             %i\n", battery->cycle_count);
-        seq_printf(seq, "capacity granularity 1:  unknown\n");
-        seq_printf(seq, "capacity granularity 2:  unknown\n");
-        seq_printf(seq, "model number:            %s\n", battery->device_name);
-        seq_printf(seq, "serial number:           %i\n",
-                   battery->serial_number);
-        seq_printf(seq, "battery type:            %s\n",
-                   battery->device_chemistry);
-        seq_printf(seq, "OEM info:                %s\n",
-                   battery->manufacturer_name);
-      end:
-        mutex_unlock(&sbs->lock);
-        return result;
-}
-static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_info, PDE_DATA(inode));
-}
-static int acpi_battery_read_state(struct seq_file *seq, void *offset)
-{
-        struct acpi_battery *battery = seq->private;
-        struct acpi_sbs *sbs = battery->sbs;
-        int rate;
-        mutex_lock(&sbs->lock);
-        seq_printf(seq, "present:                 %s\n",
-                   (battery->present) ? "yes" : "no");
-        if (!battery->present)
-                goto end;
-        acpi_battery_get_state(battery);
-        seq_printf(seq, "capacity state:          %s\n",
-                   (battery->state & 0x0010) ? "critical" : "ok");
-        seq_printf(seq, "charging state:          %s\n",
-                   (battery->rate_now < 0) ? "discharging" :
-                   ((battery->rate_now > 0) ? "charging" : "charged"));
-        rate = abs(battery->rate_now) * acpi_battery_ipscale(battery);
-        rate *= (acpi_battery_mode(battery))?(battery->voltage_now *
-                        acpi_battery_vscale(battery)/1000):1;
-        seq_printf(seq, "present rate:            %d%s\n", rate,
-                   acpi_battery_units(battery));
-        seq_printf(seq, "remaining capacity:      %i%sh\n",
-                   battery->capacity_now * acpi_battery_scale(battery),
-                   acpi_battery_units(battery));
-        seq_printf(seq, "present voltage:         %i mV\n",
-                   battery->voltage_now * acpi_battery_vscale(battery));
-      end:
-        mutex_unlock(&sbs->lock);
-        return 0;
-}
-static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_state, PDE_DATA(inode));
-}
-static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
-{
-        struct acpi_battery *battery = seq->private;
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        mutex_lock(&sbs->lock);
-        if (!battery->present) {
-                seq_printf(seq, "present:                 no\n");
-                goto end;
-        }
-        acpi_battery_get_alarm(battery);
-        seq_printf(seq, "alarm:                   ");
-        if (battery->alarm_capacity)
-                seq_printf(seq, "%i%sh\n",
-                           battery->alarm_capacity *
-                           acpi_battery_scale(battery),
-                           acpi_battery_units(battery));
-        else
-                seq_printf(seq, "disabled\n");
-      end:
-        mutex_unlock(&sbs->lock);
-        return result;
-}
-static ssize_t
-acpi_battery_write_alarm(struct file *file, const char __user * buffer,
-                         size_t count, loff_t * ppos)
-{
-        struct seq_file *seq = file->private_data;
-        struct acpi_battery *battery = seq->private;
-        struct acpi_sbs *sbs = battery->sbs;
-        char alarm_string[12] = { '\0' };
-        int result = 0;
-        mutex_lock(&sbs->lock);
-        if (!battery->present) {
-                result = -ENODEV;
-                goto end;
-        }
-        if (count > sizeof(alarm_string) - 1) {
-                result = -EINVAL;
-                goto end;
-        }
-        if (copy_from_user(alarm_string, buffer, count)) {
-                result = -EFAULT;
-                goto end;
-        }
-        alarm_string[count] = 0;
-        battery->alarm_capacity = simple_strtoul(alarm_string, NULL, 0) /
-                                        acpi_battery_scale(battery);
-        acpi_battery_set_alarm(battery);
-      end:
-        mutex_unlock(&sbs->lock);
-        if (result)
-                return result;
-        return count;
-}
-static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_alarm, PDE_DATA(inode));
-}
-static const struct file_operations acpi_battery_info_fops = {
-        .open = acpi_battery_info_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static const struct file_operations acpi_battery_state_fops = {
-        .open = acpi_battery_state_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static const struct file_operations acpi_battery_alarm_fops = {
-        .open = acpi_battery_alarm_open_fs,
-        .read = seq_read,
-        .write = acpi_battery_write_alarm,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-/* Legacy AC Adapter Interface */
-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 = seq->private;
-        mutex_lock(&sbs->lock);
-        seq_printf(seq, "state:                   %s\n",
-                   sbs->charger_present ? "on-line" : "off-line");
-        mutex_unlock(&sbs->lock);
-        return 0;
-}
-static int acpi_ac_state_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_ac_read_state, PDE_DATA(inode));
-}
-static const struct file_operations acpi_ac_state_fops = {
-        .open = acpi_ac_state_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-#endif
-/* --------------------------------------------------------------------------
                                 Driver Interface
   -------------------------------------------------------------------------- */
 static int acpi_battery_read(struct acpi_battery *battery)
@@ -781,12 +509,6 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                return result;
        sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_sbs_add_fs(&battery->proc_entry, acpi_battery_dir,
-                        battery->name, &acpi_battery_info_fops,
-                        &acpi_battery_state_fops, &acpi_battery_alarm_fops,
-                        battery);
-#endif
        battery->bat.name = battery->name;
        battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
        if (!acpi_battery_mode(battery)) {
@@ -822,10 +544,6 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
                        device_remove_file(battery->bat.dev, &alarm_attr);
                power_supply_unregister(&battery->bat);
        }
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        proc_remove(battery->proc_entry);
-        battery->proc_entry = NULL;
-#endif
 }
 static int acpi_charger_add(struct acpi_sbs *sbs)
@@ -835,13 +553,7 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
        result = acpi_ac_get_present(sbs);
        if (result)
                goto end;
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        result = acpi_sbs_add_fs(&sbs->charger_entry, acpi_ac_dir,
-                                 ACPI_AC_DIR_NAME, NULL,
-                                 &acpi_ac_state_fops, NULL, sbs);
-        if (result)
-                goto end;
-#endif
        sbs->charger.name = "sbs-charger";
        sbs->charger.type = POWER_SUPPLY_TYPE_MAINS;
        sbs->charger.properties = sbs_ac_props;
@@ -859,10 +571,6 @@ static void acpi_charger_remove(struct acpi_sbs *sbs)
 {
        if (sbs->charger.dev)
                power_supply_unregister(&sbs->charger);
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        proc_remove(sbs->charger_entry);
-        sbs->charger_entry = NULL;
-#endif
 }
 static void acpi_sbs_callback(void *context)
@@ -950,20 +658,6 @@ static int acpi_sbs_remove(struct acpi_device *device)
        return 0;
 }
-static void acpi_sbs_rmdirs(void)
-{
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        if (acpi_ac_dir) {
-                acpi_unlock_ac_dir(acpi_ac_dir);
-                acpi_ac_dir = NULL;
-        }
-        if (acpi_battery_dir) {
-                acpi_unlock_battery_dir(acpi_battery_dir);
-                acpi_battery_dir = NULL;
-        }
-#endif
-}
 #ifdef CONFIG_PM_SLEEP
 static int acpi_sbs_resume(struct device *dev)
 {
@@ -995,28 +689,17 @@ static int __init acpi_sbs_init(void)
        if (acpi_disabled)
                return -ENODEV;
-#ifdef CONFIG_ACPI_PROCFS_POWER
-        acpi_ac_dir = acpi_lock_ac_dir();
-        if (!acpi_ac_dir)
-                return -ENODEV;
-        acpi_battery_dir = acpi_lock_battery_dir();
-        if (!acpi_battery_dir) {
-                acpi_sbs_rmdirs();
-                return -ENODEV;
-        }
-#endif
        result = acpi_bus_register_driver(&acpi_sbs_driver);
-        if (result < 0) {
+        if (result < 0)
-                acpi_sbs_rmdirs();
                return -ENODEV;
-        }
        return 0;
 }
 static void __exit acpi_sbs_exit(void)
 {
        acpi_bus_unregister_driver(&acpi_sbs_driver);
-        acpi_sbs_rmdirs();
        return;
 }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index fee8a297c7d9..55f9dedbbf9f 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -125,8 +125,8 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
-static acpi_status acpi_bus_offline_companions(acpi_handle handle, u32 lvl,
+static acpi_status acpi_bus_offline(acpi_handle handle, u32 lvl, void *data,
-                                               void *data, void **ret_p)
+                                    void **ret_p)
 {
        struct acpi_device *device = NULL;
        struct acpi_device_physical_node *pn;
@@ -136,6 +136,11 @@ static acpi_status acpi_bus_offline_companions(acpi_handle handle, u32 lvl,
        if (acpi_bus_get_device(handle, &device))
                return AE_OK;
+        if (device->handler && !device->handler->hotplug.enabled) {
+                *ret_p = &device->dev;
+                return AE_SUPPORT;
+        }
        mutex_lock(&device->physical_node_lock);
        list_for_each_entry(pn, &device->physical_node_list, node) {
@@ -168,8 +173,8 @@ static acpi_status acpi_bus_offline_companions(acpi_handle handle, u32 lvl,
        return status;
 }
-static acpi_status acpi_bus_online_companions(acpi_handle handle, u32 lvl,
+static acpi_status acpi_bus_online(acpi_handle handle, u32 lvl, void *data,
-                                              void *data, void **ret_p)
+                                   void **ret_p)
 {
        struct acpi_device *device = NULL;
        struct acpi_device_physical_node *pn;
@@ -214,26 +219,32 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
         * If the first pass is successful, the second one isn't needed, though.
         */
        errdev = NULL;
-        acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
+        status = acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
-                            NULL, acpi_bus_offline_companions,
+                                     NULL, acpi_bus_offline, (void *)false,
-                            (void *)false, (void **)&errdev);
+                                     (void **)&errdev);
-        acpi_bus_offline_companions(handle, 0, (void *)false, (void **)&errdev);
+        if (status == AE_SUPPORT) {
+                dev_warn(errdev, "Offline disabled.\n");
+                acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
+                                    acpi_bus_online, NULL, NULL, NULL);
+                put_device(&device->dev);
+                return -EPERM;
+        }
+        acpi_bus_offline(handle, 0, (void *)false, (void **)&errdev);
        if (errdev) {
                errdev = NULL;
                acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
-                                    NULL, acpi_bus_offline_companions,
+                                    NULL, acpi_bus_offline, (void *)true,
-                                    (void *)true , (void **)&errdev);
+                                    (void **)&errdev);
                if (!errdev || acpi_force_hot_remove)
-                        acpi_bus_offline_companions(handle, 0, (void *)true,
+                        acpi_bus_offline(handle, 0, (void *)true,
-                                                    (void **)&errdev);
+                                         (void **)&errdev);
                if (errdev && !acpi_force_hot_remove) {
                        dev_warn(errdev, "Offline failed.\n");
-                        acpi_bus_online_companions(handle, 0, NULL, NULL);
+                        acpi_bus_online(handle, 0, NULL, NULL);
                        acpi_walk_namespace(ACPI_TYPE_ANY, handle,
-                                            ACPI_UINT32_MAX,
+                                            ACPI_UINT32_MAX, acpi_bus_online,
-                                            acpi_bus_online_companions, NULL,
+                                            NULL, NULL, NULL);
-                                            NULL, NULL);
                        put_device(&device->dev);
                        return -EBUSY;
                }
@@ -274,10 +285,10 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
        return 0;
 }
-static void acpi_bus_device_eject(void *context)
+void acpi_bus_device_eject(void *data, u32 ost_src)
 {
-        acpi_handle handle = context;
+        struct acpi_device *device = data;
-        struct acpi_device *device = NULL;
+        acpi_handle handle = device->handle;
        struct acpi_scan_handler *handler;
        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
        int error;
@@ -285,38 +296,41 @@ static void acpi_bus_device_eject(void *context)
        lock_device_hotplug();
        mutex_lock(&acpi_scan_lock);
-        acpi_bus_get_device(handle, &device);
-        if (!device)
-                goto err_out;
        handler = device->handler;
        if (!handler || !handler->hotplug.enabled) {
-                ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
+                put_device(&device->dev);
-                goto err_out;
+                goto err_support;
        }
-        acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
-                                  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+        if (ost_src == ACPI_NOTIFY_EJECT_REQUEST)
+                acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
+                                          ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
        if (handler->hotplug.mode == AHM_CONTAINER)
                kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-        get_device(&device->dev);
        error = acpi_scan_hot_remove(device);
-        if (error)
+        if (error == -EPERM) {
+                goto err_support;
+        } else if (error) {
                goto err_out;
+        }
 out:
        mutex_unlock(&acpi_scan_lock);
        unlock_device_hotplug();
        return;
+ err_support:
+        ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
 err_out:
-        acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST, ost_code,
+        acpi_evaluate_hotplug_ost(handle, ost_src, ost_code, NULL);
-                                  NULL);
        goto out;
 }
-static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
+static void acpi_scan_bus_device_check(void *data, u32 ost_source)
 {
+        acpi_handle handle = data;
        struct acpi_device *device = NULL;
        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
        int error;
@@ -331,8 +345,6 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
                        goto out;
                }
        }
-        acpi_evaluate_hotplug_ost(handle, ost_source,
-                                  ACPI_OST_SC_INSERT_IN_PROGRESS, NULL);
        error = acpi_bus_scan(handle);
        if (error) {
                acpi_handle_warn(handle, "Namespace scan failure\n");
@@ -353,18 +365,6 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
        unlock_device_hotplug();
 }
-static void acpi_scan_bus_check(void *context)
-{
-        acpi_scan_bus_device_check((acpi_handle)context,
-                                   ACPI_NOTIFY_BUS_CHECK);
-}
-static void acpi_scan_device_check(void *context)
-{
-        acpi_scan_bus_device_check((acpi_handle)context,
-                                   ACPI_NOTIFY_DEVICE_CHECK);
-}
 static void acpi_hotplug_unsupported(acpi_handle handle, u32 type)
 {
        u32 ost_status;
@@ -395,8 +395,8 @@ static void acpi_hotplug_unsupported(acpi_handle handle, u32 type)
 static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
 {
-        acpi_osd_exec_callback callback;
        struct acpi_scan_handler *handler = data;
+        struct acpi_device *adev;
        acpi_status status;
        if (!handler->hotplug.enabled)
@@ -405,56 +405,35 @@ static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
        switch (type) {
        case ACPI_NOTIFY_BUS_CHECK:
                acpi_handle_debug(handle, "ACPI_NOTIFY_BUS_CHECK event\n");
-                callback = acpi_scan_bus_check;
                break;
        case ACPI_NOTIFY_DEVICE_CHECK:
                acpi_handle_debug(handle, "ACPI_NOTIFY_DEVICE_CHECK event\n");
-                callback = acpi_scan_device_check;
                break;
        case ACPI_NOTIFY_EJECT_REQUEST:
                acpi_handle_debug(handle, "ACPI_NOTIFY_EJECT_REQUEST event\n");
-                callback = acpi_bus_device_eject;
+                status = acpi_bus_get_device(handle, &adev);
-                break;
+                if (ACPI_FAILURE(status))
+                        goto err_out;
+                get_device(&adev->dev);
+                status = acpi_hotplug_execute(acpi_bus_device_eject, adev, type);
+                if (ACPI_SUCCESS(status))
+                        return;
+                put_device(&adev->dev);
+                goto err_out;
        default:
                /* non-hotplug event; possibly handled by other handler */
                return;
        }
-        status = acpi_os_hotplug_execute(callback, handle);
+        status = acpi_hotplug_execute(acpi_scan_bus_device_check, handle, type);
-        if (ACPI_FAILURE(status))
+        if (ACPI_SUCCESS(status))
-                acpi_evaluate_hotplug_ost(handle, type,
+                return;
-                                          ACPI_OST_SC_NON_SPECIFIC_FAILURE,
-                                          NULL);
-}
-/**
- * acpi_bus_hot_remove_device: hot-remove a device and its children
- * @context: struct acpi_eject_event pointer (freed in this func)
- *
- * Hot-remove a device and its children. This function frees up the
- * memory space passed by arg context, so that the caller may call
- * this function asynchronously through acpi_os_hotplug_execute().
- */
-void acpi_bus_hot_remove_device(void *context)
-{
-        struct acpi_eject_event *ej_event = context;
-        struct acpi_device *device = ej_event->device;
-        acpi_handle handle = device->handle;
-        int error;
-        lock_device_hotplug();
-        mutex_lock(&acpi_scan_lock);
-        error = acpi_scan_hot_remove(device);
-        if (error && handle)
-                acpi_evaluate_hotplug_ost(handle, ej_event->event,
-                                          ACPI_OST_SC_NON_SPECIFIC_FAILURE,
-                                          NULL);
-        mutex_unlock(&acpi_scan_lock);
+ err_out:
-        unlock_device_hotplug();
+        acpi_evaluate_hotplug_ost(handle, type,
-        kfree(context);
+                                  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
 }
-EXPORT_SYMBOL(acpi_bus_hot_remove_device);
 static ssize_t real_power_state_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
@@ -487,10 +466,8 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
                const char *buf, size_t count)
 {
        struct acpi_device *acpi_device = to_acpi_device(d);
-        struct acpi_eject_event *ej_event;
        acpi_object_type not_used;
        acpi_status status;
-        int ret;
        if (!count || buf[0] != '1')
                return -EINVAL;
@@ -503,28 +480,18 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
        if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable)
                return -ENODEV;
-        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-        if (!ej_event) {
-                ret = -ENOMEM;
-                goto err_out;
-        }
        acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
                                  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
-        ej_event->device = acpi_device;
-        ej_event->event = ACPI_OST_EC_OSPM_EJECT;
        get_device(&acpi_device->dev);
-        status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);
+        status = acpi_hotplug_execute(acpi_bus_device_eject, acpi_device,
+                                      ACPI_OST_EC_OSPM_EJECT);
        if (ACPI_SUCCESS(status))
                return count;
        put_device(&acpi_device->dev);
-        kfree(ej_event);
-        ret = status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
- err_out:
        acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
                                  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
-        return ret;
+        return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
 }
 static DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
@@ -1676,7 +1643,6 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
 void acpi_device_add_finalize(struct acpi_device *device)
 {
-        device->flags.match_driver = true;
        dev_set_uevent_suppress(&device->dev, false);
        kobject_uevent(&device->dev.kobj, KOBJ_ADD);
 }
@@ -1915,8 +1881,12 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
                return AE_OK;
        ret = acpi_scan_attach_handler(device);
-        if (ret)
+        if (ret < 0)
-                return ret > 0 ? AE_OK : AE_CTRL_DEPTH;
+                return AE_CTRL_DEPTH;
+        device->flags.match_driver = true;
+        if (ret > 0)
+                return AE_OK;
        ret = device_attach(&device->dev);
        return ret >= 0 ? AE_OK : AE_CTRL_DEPTH;
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 05306a59aedc..db5293650f62 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -564,6 +564,7 @@ static ssize_t counter_set(struct kobject *kobj,
        acpi_event_status status;
        acpi_handle handle;
        int result = 0;
+        unsigned long tmp;
        if (index == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI) {
                int i;
@@ -596,8 +597,10 @@ static ssize_t counter_set(struct kobject *kobj,
                else if (!strcmp(buf, "clear\n") &&
                         (status & ACPI_EVENT_FLAG_SET))
                        result = acpi_clear_gpe(handle, index);
+                else if (!kstrtoul(buf, 0, &tmp))
+                        all_counters[index].count = tmp;
                else
-                        all_counters[index].count = strtoul(buf, NULL, 0);
+                        result = -EINVAL;
        } else if (index < num_gpes + ACPI_NUM_FIXED_EVENTS) {
                int event = index - num_gpes;
                if (!strcmp(buf, "disable\n") &&
@@ -609,8 +612,10 @@ static ssize_t counter_set(struct kobject *kobj,
                else if (!strcmp(buf, "clear\n") &&
                         (status & ACPI_EVENT_FLAG_SET))
                        result = acpi_clear_event(event);
+                else if (!kstrtoul(buf, 0, &tmp))
+                        all_counters[index].count = tmp;
                else
-                        all_counters[index].count = strtoul(buf, NULL, 0);
+                        result = -EINVAL;
        } else
                all_counters[index].count = strtoul(buf, NULL, 0);
@@ -762,13 +767,8 @@ void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
        if (!hotplug_kobj)
                goto err_out;
-        kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype);
+        error = kobject_init_and_add(&hotplug->kobj,
-        error = kobject_set_name(&hotplug->kobj, "%s", name);
+                &acpi_hotplug_profile_ktype, hotplug_kobj, "%s", name);
-        if (error)
-                goto err_out;
-        hotplug->kobj.parent = hotplug_kobj;
-        error = kobject_add(&hotplug->kobj, hotplug_kobj, NULL);
        if (error)
                goto err_out;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 6a0329340b42..e600b5dbfcb6 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -299,8 +299,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                          "No critical threshold\n"));
                } else if (tmp <= 2732) {
-                        printk(KERN_WARNING FW_BUG "Invalid critical threshold "
+                        pr_warn(FW_BUG "Invalid critical threshold (%llu)\n",
-                               "(%llu)\n", tmp);
+                                tmp);
                        tz->trips.critical.flags.valid = 0;
                } else {
                        tz->trips.critical.flags.valid = 1;
@@ -317,8 +317,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                 * Allow override critical threshold
                                 */
                                if (crt_k > tz->trips.critical.temperature)
-                                        printk(KERN_WARNING PREFIX
+                                        pr_warn(PREFIX "Critical threshold %d C\n",
-                                                "Critical threshold %d C\n", crt);
+                                                crt);
                                tz->trips.critical.temperature = crt_k;
                        }
                }
@@ -390,8 +390,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                status = acpi_evaluate_reference(tz->device->handle, "_PSL",
                                                        NULL, &devices);
                if (ACPI_FAILURE(status)) {
-                        printk(KERN_WARNING PREFIX
+                        pr_warn(PREFIX "Invalid passive threshold\n");
-                                "Invalid passive threshold\n");
                        tz->trips.passive.flags.valid = 0;
                }
                else
@@ -453,8 +452,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                        status = acpi_evaluate_reference(tz->device->handle,
                                                name, NULL, &devices);
                        if (ACPI_FAILURE(status)) {
-                                printk(KERN_WARNING PREFIX
+                                pr_warn(PREFIX "Invalid active%d threshold\n",
-                                        "Invalid active%d threshold\n", i);
+                                        i);
                                tz->trips.active[i].flags.valid = 0;
                        }
                        else
@@ -505,7 +504,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
                valid |= tz->trips.active[i].flags.valid;
        if (!valid) {
-                printk(KERN_WARNING FW_BUG "No valid trip found\n");
+                pr_warn(FW_BUG "No valid trip found\n");
                return -ENODEV;
        }
        return 0;
@@ -923,8 +922,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
                                  acpi_bus_private_data_handler,
                                  tz->thermal_zone);
        if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR PREFIX
+                pr_err(PREFIX "Error attaching device data\n");
-                                "Error attaching device data\n");
                return -ENODEV;
        }
@@ -1094,9 +1092,8 @@ static int acpi_thermal_add(struct acpi_device *device)
        if (result)
                goto free_memory;
-        printk(KERN_INFO PREFIX "%s [%s] (%ld C)\n",
+        pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device),
-               acpi_device_name(device), acpi_device_bid(device),
+                acpi_device_bid(device), KELVIN_TO_CELSIUS(tz->temperature));
-               KELVIN_TO_CELSIUS(tz->temperature));
        goto end;
 free_memory:
@@ -1159,24 +1156,24 @@ static int acpi_thermal_resume(struct device *dev)
 static int thermal_act(const struct dmi_system_id *d) {
        if (act == 0) {
-                printk(KERN_NOTICE "ACPI: %s detected: "
+                pr_notice(PREFIX "%s detected: "
-                        "disabling all active thermal trip points\n", d->ident);
+                          "disabling all active thermal trip points\n", d->ident);
                act = -1;
        }
        return 0;
 }
 static int thermal_nocrt(const struct dmi_system_id *d) {
-        printk(KERN_NOTICE "ACPI: %s detected: "
+        pr_notice(PREFIX "%s detected: "
-                "disabling all critical thermal trip point actions.\n", d->ident);
+                  "disabling all critical thermal trip point actions.\n", d->ident);
        nocrt = 1;
        return 0;
 }
 static int thermal_tzp(const struct dmi_system_id *d) {
        if (tzp == 0) {
-                printk(KERN_NOTICE "ACPI: %s detected: "
+                pr_notice(PREFIX "%s detected: "
-                        "enabling thermal zone polling\n", d->ident);
+                          "enabling thermal zone polling\n", d->ident);
                tzp = 300;      /* 300 dS = 30 Seconds */
        }
        return 0;
@@ -1184,8 +1181,8 @@ static int thermal_tzp(const struct dmi_system_id *d) {
 static int thermal_psv(const struct dmi_system_id *d) {
        if (psv == 0) {
-                printk(KERN_NOTICE "ACPI: %s detected: "
+                pr_notice(PREFIX "%s detected: "
-                        "disabling all passive thermal trip points\n", d->ident);
+                          "disabling all passive thermal trip points\n", d->ident);
                psv = -1;
        }
        return 0;
@@ -1238,7 +1235,7 @@ static int __init acpi_thermal_init(void)
        dmi_check_system(thermal_dmi_table);
        if (off) {
-                printk(KERN_NOTICE "ACPI: thermal control disabled\n");
+                pr_notice(PREFIX "thermal control disabled\n");
                return -ENODEV;
        }
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 552248b0005b..6d408bfbbb1d 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -121,7 +121,7 @@ acpi_extract_package(union acpi_object *package,
                                break;
                        default:
                                printk(KERN_WARNING PREFIX "Invalid package element"
-                                              " [%d]: got number, expecing"
+                                              " [%d]: got number, expecting"
                                              " [%c]\n",
                                              i, format_string[i]);
                                return AE_BAD_DATA;
@@ -148,7 +148,7 @@ acpi_extract_package(union acpi_object *package,
                        default:
                                printk(KERN_WARNING PREFIX "Invalid package element"
                                              " [%d] got string/buffer,"
-                                              " expecing [%c]\n",
+                                              " expecting [%c]\n",
                                              i, format_string[i]);
                                return AE_BAD_DATA;
                                break;
@@ -169,11 +169,20 @@ acpi_extract_package(union acpi_object *package,
        /*
         * Validate output buffer.
         */
-        if (buffer->length < size_required) {
+        if (buffer->length == ACPI_ALLOCATE_BUFFER) {
+                buffer->pointer = ACPI_ALLOCATE(size_required);
+                if (!buffer->pointer)
+                        return AE_NO_MEMORY;
                buffer->length = size_required;
-                return AE_BUFFER_OVERFLOW;
+                memset(buffer->pointer, 0, size_required);
-        } else if (buffer->length != size_required || !buffer->pointer) {
+        } else {
-                return AE_BAD_PARAMETER;
+                if (buffer->length < size_required) {
+                        buffer->length = size_required;
+                        return AE_BUFFER_OVERFLOW;
+                } else if (buffer->length != size_required ||
+                           !buffer->pointer) {
+                        return AE_BAD_PARAMETER;
+                }
        }
        head = buffer->pointer;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index aebcf6355df4..18dbdff4656e 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -88,7 +88,16 @@ module_param(allow_duplicates, bool, 0644);
 static bool use_bios_initial_backlight = 1;
 module_param(use_bios_initial_backlight, bool, 0644);
+/*
+ * For Windows 8 systems: if set ture and the GPU driver has
+ * registered a backlight interface, skip registering ACPI video's.
+ */
+static bool use_native_backlight = false;
+module_param(use_native_backlight, bool, 0644);
 static int register_count;
+static struct mutex video_list_lock;
+static struct list_head video_bus_head;
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device);
 static void acpi_video_bus_notify(struct acpi_device *device, u32 event);
@@ -157,6 +166,7 @@ struct acpi_video_bus {
        struct acpi_video_bus_flags flags;
        struct list_head video_device_list;
        struct mutex device_list_lock;  /* protects video_device_list */
+        struct list_head entry;
        struct input_dev *input;
        char phys[32];  /* for input device */
        struct notifier_block pm_nb;
@@ -229,6 +239,14 @@ static int acpi_video_get_next_level(struct acpi_video_device *device,
 static int acpi_video_switch_brightness(struct acpi_video_device *device,
                                         int event);
+static bool acpi_video_verify_backlight_support(void)
+{
+        if (acpi_osi_is_win8() && use_native_backlight &&
+            backlight_device_registered(BACKLIGHT_RAW))
+                return false;
+        return acpi_video_backlight_support();
+}
 /* backlight device sysfs support */
 static int acpi_video_get_brightness(struct backlight_device *bd)
 {
@@ -830,9 +848,9 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                 * or an index). Set the backlight to max_level in this case.
                 */
                for (i = 2; i < br->count; i++)
-                        if (level_old == br->levels[i])
+                        if (level == br->levels[i])
                                break;
-                if (i == br->count)
+                if (i == br->count || !level)
                        level = max_level;
        }
@@ -884,79 +902,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        if (acpi_has_method(device->dev->handle, "_DDC"))
                device->cap._DDC = 1;
-        if (acpi_video_backlight_support()) {
-                struct backlight_properties props;
-                struct pci_dev *pdev;
-                acpi_handle acpi_parent;
-                struct device *parent = NULL;
-                int result;
-                static int count;
-                char *name;
-                result = acpi_video_init_brightness(device);
-                if (result)
-                        return;
-                name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
-                if (!name)
-                        return;
-                count++;
-                acpi_get_parent(device->dev->handle, &acpi_parent);
-                pdev = acpi_get_pci_dev(acpi_parent);
-                if (pdev) {
-                        parent = &pdev->dev;
-                        pci_dev_put(pdev);
-                }
-                memset(&props, 0, sizeof(struct backlight_properties));
-                props.type = BACKLIGHT_FIRMWARE;
-                props.max_brightness = device->brightness->count - 3;
-                device->backlight = backlight_device_register(name,
-                                                              parent,
-                                                              device,
-                                                              &acpi_backlight_ops,
-                                                              &props);
-                kfree(name);
-                if (IS_ERR(device->backlight))
-                        return;
-                /*
-                 * Save current brightness level in case we have to restore it
-                 * before acpi_video_device_lcd_set_level() is called next time.
-                 */
-                device->backlight->props.brightness =
-                                acpi_video_get_brightness(device->backlight);
-                device->cooling_dev = thermal_cooling_device_register("LCD",
-                                        device->dev, &video_cooling_ops);
-                if (IS_ERR(device->cooling_dev)) {
-                        /*
-                         * Set cooling_dev to NULL so we don't crash trying to
-                         * free it.
-                         * Also, why the hell we are returning early and
-                         * not attempt to register video output if cooling
-                         * device registration failed?
-                         * -- dtor
-                         */
-                        device->cooling_dev = NULL;
-                        return;
-                }
-                dev_info(&device->dev->dev, "registered as cooling_device%d\n",
-                         device->cooling_dev->id);
-                result = sysfs_create_link(&device->dev->dev.kobj,
-                                &device->cooling_dev->device.kobj,
-                                "thermal_cooling");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-                result = sysfs_create_link(&device->cooling_dev->device.kobj,
-                                &device->dev->dev.kobj, "device");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-        }
 }
 /*
@@ -1143,13 +1088,6 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
        acpi_video_device_bind(video, data);
        acpi_video_device_find_cap(data);
-        status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
-                                             acpi_video_device_notify, data);
-        if (ACPI_FAILURE(status))
-                dev_err(&device->dev, "Error installing notify handler\n");
-        else
-                data->flags.notify = 1;
        mutex_lock(&video->device_list_lock);
        list_add_tail(&data->entry, &video->video_device_list);
        mutex_unlock(&video->device_list_lock);
@@ -1333,8 +1271,8 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event)
        unsigned long long level_current, level_next;
        int result = -EINVAL;
-        /* no warning message if acpi_backlight=vendor is used */
+        /* no warning message if acpi_backlight=vendor or a quirk is used */
-        if (!acpi_video_backlight_support())
+        if (!acpi_video_verify_backlight_support())
                return 0;
        if (!device->brightness)
@@ -1454,64 +1392,6 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
        return status;
 }
-static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
-{
-        acpi_status status;
-        if (!device || !device->video)
-                return -ENOENT;
-        if (device->flags.notify) {
-                status = acpi_remove_notify_handler(device->dev->handle,
-                                ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
-                if (ACPI_FAILURE(status))
-                        dev_err(&device->dev->dev,
-                                        "Can't remove video notify handler\n");
-        }
-        if (device->backlight) {
-                backlight_device_unregister(device->backlight);
-                device->backlight = NULL;
-        }
-        if (device->cooling_dev) {
-                sysfs_remove_link(&device->dev->dev.kobj,
-                                  "thermal_cooling");
-                sysfs_remove_link(&device->cooling_dev->device.kobj,
-                                  "device");
-                thermal_cooling_device_unregister(device->cooling_dev);
-                device->cooling_dev = NULL;
-        }
-        return 0;
-}
-static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
-{
-        int status;
-        struct acpi_video_device *dev, *next;
-        mutex_lock(&video->device_list_lock);
-        list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {
-                status = acpi_video_bus_put_one_device(dev);
-                if (ACPI_FAILURE(status))
-                        printk(KERN_WARNING PREFIX
-                               "hhuuhhuu bug in acpi video driver.\n");
-                if (dev->brightness) {
-                        kfree(dev->brightness->levels);
-                        kfree(dev->brightness);
-                }
-                list_del(&dev->entry);
-                kfree(dev);
-        }
-        mutex_unlock(&video->device_list_lock);
-        return 0;
-}
 /* acpi_video interface */
 /*
@@ -1521,13 +1401,13 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
        return acpi_video_bus_DOS(video, 0,
-                                  acpi_video_backlight_quirks() ? 1 : 0);
+                                  acpi_osi_is_win8() ? 1 : 0);
 }
 static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 {
        return acpi_video_bus_DOS(video, 0,
-                                  acpi_video_backlight_quirks() ? 0 : 1);
+                                  acpi_osi_is_win8() ? 0 : 1);
 }
 static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
@@ -1536,7 +1416,7 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
        struct input_dev *input;
        int keycode = 0;
-        if (!video)
+        if (!video || !video->input)
                return;
        input = video->input;
@@ -1691,12 +1571,236 @@ acpi_video_bus_match(acpi_handle handle, u32 level, void *context,
        return AE_OK;
 }
+static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
+{
+        if (acpi_video_verify_backlight_support()) {
+                struct backlight_properties props;
+                struct pci_dev *pdev;
+                acpi_handle acpi_parent;
+                struct device *parent = NULL;
+                int result;
+                static int count;
+                char *name;
+                result = acpi_video_init_brightness(device);
+                if (result)
+                        return;
+                name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
+                if (!name)
+                        return;
+                count++;
+                acpi_get_parent(device->dev->handle, &acpi_parent);
+                pdev = acpi_get_pci_dev(acpi_parent);
+                if (pdev) {
+                        parent = &pdev->dev;
+                        pci_dev_put(pdev);
+                }
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.type = BACKLIGHT_FIRMWARE;
+                props.max_brightness = device->brightness->count - 3;
+                device->backlight = backlight_device_register(name,
+                                                              parent,
+                                                              device,
+                                                              &acpi_backlight_ops,
+                                                              &props);
+                kfree(name);
+                if (IS_ERR(device->backlight))
+                        return;
+                /*
+                 * Save current brightness level in case we have to restore it
+                 * before acpi_video_device_lcd_set_level() is called next time.
+                 */
+                device->backlight->props.brightness =
+                                acpi_video_get_brightness(device->backlight);
+                device->cooling_dev = thermal_cooling_device_register("LCD",
+                                        device->dev, &video_cooling_ops);
+                if (IS_ERR(device->cooling_dev)) {
+                        /*
+                         * Set cooling_dev to NULL so we don't crash trying to
+                         * free it.
+                         * Also, why the hell we are returning early and
+                         * not attempt to register video output if cooling
+                         * device registration failed?
+                         * -- dtor
+                         */
+                        device->cooling_dev = NULL;
+                        return;
+                }
+                dev_info(&device->dev->dev, "registered as cooling_device%d\n",
+                         device->cooling_dev->id);
+                result = sysfs_create_link(&device->dev->dev.kobj,
+                                &device->cooling_dev->device.kobj,
+                                "thermal_cooling");
+                if (result)
+                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+                result = sysfs_create_link(&device->cooling_dev->device.kobj,
+                                &device->dev->dev.kobj, "device");
+                if (result)
+                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+        }
+}
+static int acpi_video_bus_register_backlight(struct acpi_video_bus *video)
+{
+        struct acpi_video_device *dev;
+        mutex_lock(&video->device_list_lock);
+        list_for_each_entry(dev, &video->video_device_list, entry)
+                acpi_video_dev_register_backlight(dev);
+        mutex_unlock(&video->device_list_lock);
+        video->pm_nb.notifier_call = acpi_video_resume;
+        video->pm_nb.priority = 0;
+        return register_pm_notifier(&video->pm_nb);
+}
+static void acpi_video_dev_unregister_backlight(struct acpi_video_device *device)
+{
+        if (device->backlight) {
+                backlight_device_unregister(device->backlight);
+                device->backlight = NULL;
+        }
+        if (device->brightness) {
+                kfree(device->brightness->levels);
+                kfree(device->brightness);
+                device->brightness = NULL;
+        }
+        if (device->cooling_dev) {
+                sysfs_remove_link(&device->dev->dev.kobj, "thermal_cooling");
+                sysfs_remove_link(&device->cooling_dev->device.kobj, "device");
+                thermal_cooling_device_unregister(device->cooling_dev);
+                device->cooling_dev = NULL;
+        }
+}
+static int acpi_video_bus_unregister_backlight(struct acpi_video_bus *video)
+{
+        struct acpi_video_device *dev;
+        int error = unregister_pm_notifier(&video->pm_nb);
+        mutex_lock(&video->device_list_lock);
+        list_for_each_entry(dev, &video->video_device_list, entry)
+                acpi_video_dev_unregister_backlight(dev);
+        mutex_unlock(&video->device_list_lock);
+        return error;
+}
+static void acpi_video_dev_add_notify_handler(struct acpi_video_device *device)
+{
+        acpi_status status;
+        struct acpi_device *adev = device->dev;
+        status = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY,
+                                             acpi_video_device_notify, device);
+        if (ACPI_FAILURE(status))
+                dev_err(&adev->dev, "Error installing notify handler\n");
+        else
+                device->flags.notify = 1;
+}
+static int acpi_video_bus_add_notify_handler(struct acpi_video_bus *video)
+{
+        struct input_dev *input;
+        struct acpi_video_device *dev;
+        int error;
+        video->input = input = input_allocate_device();
+        if (!input) {
+                error = -ENOMEM;
+                goto out;
+        }
+        error = acpi_video_bus_start_devices(video);
+        if (error)
+                goto err_free_input;
+        snprintf(video->phys, sizeof(video->phys),
+                        "%s/video/input0", acpi_device_hid(video->device));
+        input->name = acpi_device_name(video->device);
+        input->phys = video->phys;
+        input->id.bustype = BUS_HOST;
+        input->id.product = 0x06;
+        input->dev.parent = &video->device->dev;
+        input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
+        set_bit(KEY_VIDEO_NEXT, input->keybit);
+        set_bit(KEY_VIDEO_PREV, input->keybit);
+        set_bit(KEY_BRIGHTNESS_CYCLE, input->keybit);
+        set_bit(KEY_BRIGHTNESSUP, input->keybit);
+        set_bit(KEY_BRIGHTNESSDOWN, input->keybit);
+        set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
+        set_bit(KEY_DISPLAY_OFF, input->keybit);
+        error = input_register_device(input);
+        if (error)
+                goto err_stop_dev;
+        mutex_lock(&video->device_list_lock);
+        list_for_each_entry(dev, &video->video_device_list, entry)
+                acpi_video_dev_add_notify_handler(dev);
+        mutex_unlock(&video->device_list_lock);
+        return 0;
+err_stop_dev:
+        acpi_video_bus_stop_devices(video);
+err_free_input:
+        input_free_device(input);
+        video->input = NULL;
+out:
+        return error;
+}
+static void acpi_video_dev_remove_notify_handler(struct acpi_video_device *dev)
+{
+        if (dev->flags.notify) {
+                acpi_remove_notify_handler(dev->dev->handle, ACPI_DEVICE_NOTIFY,
+                                           acpi_video_device_notify);
+                dev->flags.notify = 0;
+        }
+}
+static void acpi_video_bus_remove_notify_handler(struct acpi_video_bus *video)
+{
+        struct acpi_video_device *dev;
+        mutex_lock(&video->device_list_lock);
+        list_for_each_entry(dev, &video->video_device_list, entry)
+                acpi_video_dev_remove_notify_handler(dev);
+        mutex_unlock(&video->device_list_lock);
+        acpi_video_bus_stop_devices(video);
+        input_unregister_device(video->input);
+        video->input = NULL;
+}
+static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
+{
+        struct acpi_video_device *dev, *next;
+        mutex_lock(&video->device_list_lock);
+        list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {
+                list_del(&dev->entry);
+                kfree(dev);
+        }
+        mutex_unlock(&video->device_list_lock);
+        return 0;
+}
 static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
        struct acpi_video_bus *video;
-        struct input_dev *input;
        int error;
        acpi_status status;
@@ -1748,62 +1852,24 @@ static int acpi_video_bus_add(struct acpi_device *device)
        if (error)
                goto err_put_video;
-        video->input = input = input_allocate_device();
-        if (!input) {
-                error = -ENOMEM;
-                goto err_put_video;
-        }
-        error = acpi_video_bus_start_devices(video);
-        if (error)
-                goto err_free_input_dev;
-        snprintf(video->phys, sizeof(video->phys),
-                "%s/video/input0", acpi_device_hid(video->device));
-        input->name = acpi_device_name(video->device);
-        input->phys = video->phys;
-        input->id.bustype = BUS_HOST;
-        input->id.product = 0x06;
-        input->dev.parent = &device->dev;
-        input->evbit[0] = BIT(EV_KEY);
-        set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
-        set_bit(KEY_VIDEO_NEXT, input->keybit);
-        set_bit(KEY_VIDEO_PREV, input->keybit);
-        set_bit(KEY_BRIGHTNESS_CYCLE, input->keybit);
-        set_bit(KEY_BRIGHTNESSUP, input->keybit);
-        set_bit(KEY_BRIGHTNESSDOWN, input->keybit);
-        set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
-        set_bit(KEY_DISPLAY_OFF, input->keybit);
        printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
               ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
               video->flags.multihead ? "yes" : "no",
               video->flags.rom ? "yes" : "no",
               video->flags.post ? "yes" : "no");
+        mutex_lock(&video_list_lock);
+        list_add_tail(&video->entry, &video_bus_head);
+        mutex_unlock(&video_list_lock);
-        video->pm_nb.notifier_call = acpi_video_resume;
+        acpi_video_bus_register_backlight(video);
-        video->pm_nb.priority = 0;
+        acpi_video_bus_add_notify_handler(video);
-        error = register_pm_notifier(&video->pm_nb);
-        if (error)
-                goto err_stop_video;
-        error = input_register_device(input);
-        if (error)
-                goto err_unregister_pm_notifier;
        return 0;
- err_unregister_pm_notifier:
+err_put_video:
-        unregister_pm_notifier(&video->pm_nb);
- err_stop_video:
-        acpi_video_bus_stop_devices(video);
- err_free_input_dev:
-        input_free_device(input);
- err_put_video:
        acpi_video_bus_put_devices(video);
        kfree(video->attached_array);
- err_free_video:
+err_free_video:
        kfree(video);
        device->driver_data = NULL;
@@ -1820,12 +1886,14 @@ static int acpi_video_bus_remove(struct acpi_device *device)
        video = acpi_driver_data(device);
-        unregister_pm_notifier(&video->pm_nb);
+        acpi_video_bus_remove_notify_handler(video);
+        acpi_video_bus_unregister_backlight(video);
-        acpi_video_bus_stop_devices(video);
        acpi_video_bus_put_devices(video);
-        input_unregister_device(video->input);
+        mutex_lock(&video_list_lock);
+        list_del(&video->entry);
+        mutex_unlock(&video_list_lock);
        kfree(video->attached_array);
        kfree(video);
@@ -1874,6 +1942,9 @@ int acpi_video_register(void)
                return 0;
        }
+        mutex_init(&video_list_lock);
+        INIT_LIST_HEAD(&video_bus_head);
        result = acpi_bus_register_driver(&acpi_video_bus);
        if (result < 0)
                return -ENODEV;
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 940edbf2fe8f..84875fd4c74f 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -168,6 +168,14 @@ static struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),
                },
        },
+        {
+        .callback = video_detect_force_vendor,
+        .ident = "Lenovo Yoga 13",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Yoga 13"),
+                },
+        },
        { },
 };
@@ -233,11 +241,11 @@ static void acpi_video_caps_check(void)
                acpi_video_get_capabilities(NULL);
 }
-bool acpi_video_backlight_quirks(void)
+bool acpi_osi_is_win8(void)
 {
        return acpi_gbl_osi_data >= ACPI_OSI_WIN_8;
 }
-EXPORT_SYMBOL(acpi_video_backlight_quirks);
+EXPORT_SYMBOL(acpi_osi_is_win8);
 /* Promote the vendor interface instead of the generic video module.
 * This function allow DMI blacklists to be implemented by externals
author	Linus Torvalds <torvalds@linux-foundation.org>	2013-11-13 23:41:48 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2013-11-13 23:41:48 -0500
commit	f9300eaaac1ca300083ad41937923a90cc3a2394 (patch)
tree	724b72ad729a8b85c09d2d54f8ca7d8ba22d774f /drivers/acpi
parent	7f2dc5c4bcbff035b0d03f7aa78a182664b21e47 (diff)
parent	faddf2f5d278f1656e9444961bdd8d9db4deb5bf (diff)