253 files changed, 6938 insertions, 4145 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-lpss_ltr b/Documentation/ABI/testing/sysfs-devices-lpss_ltr
new file mode 100644
index 000000000000..ea9298d9bbaf
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-lpss_ltr
@@ -0,0 +1,44 @@
+What:           /sys/devices/.../lpss_ltr/
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/ directory is only present for
+                devices included into the Intel Lynxpoint Low Power Subsystem
+                (LPSS).  If present, it contains attributes containing the LTR
+                mode and the values of LTR registers of the device.
+
+What:           /sys/devices/.../lpss_ltr/ltr_mode
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/ltr_mode attribute contains an
+                integer number (0 or 1) indicating whether or not the devices'
+                LTR functionality is working in the software mode (1).
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
+
+What:           /sys/devices/.../lpss_ltr/auto_ltr
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
+                current value of the device's AUTO_LTR register (raw)
+                represented as an 8-digit hexadecimal number.
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
+
+What:           /sys/devices/.../lpss_ltr/sw_ltr
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
+                current value of the device's SW_LTR register (raw) represented
+                as an 8-digit hexadecimal number.
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
diff --git a/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
new file mode 100644
index 000000000000..e0588feeb6e1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
@@ -0,0 +1,13 @@
+What:           /sys/devices/.../power_resources_wakeup/
+Date:           April 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../power_resources_wakeup/ directory is only
+                present for device objects representing ACPI device nodes that
+                require ACPI power resources for wakeup signaling.
+
+                If present, it contains symbolic links to device directories
+                representing ACPI power resources that need to be turned on for
+                the given device node to be able to signal wakeup.  The names of
+                the links are the same as the names of the directories they
+                point to.
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
index dd930c8db41f..ce9bee98b43b 100644
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -18,6 +18,32 @@ Description:
                 yoffset: The number of pixels between the top of the screen
                          and the top edge of the image.
 
+What:           /sys/firmware/acpi/hotplug/
+Date:           February 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                There are separate hotplug profiles for different classes of
+                devices supported by ACPI, such as containers, memory modules,
+                processors, PCI root bridges etc.  A hotplug profile for a given
+                class of devices is a collection of settings defining the way
+                that class of devices will be handled by the ACPI core hotplug
+                code.  Those profiles are represented in sysfs as subdirectories
+                of /sys/firmware/acpi/hotplug/.
+
+                The following setting is available to user space for each
+                hotplug profile:
+
+                enabled: If set, the ACPI core will handle notifications of
+                        hotplug events associated with the given class of
+                        devices and will allow those devices to be ejected with
+                        the help of the _EJ0 control method.  Unsetting it
+                        effectively disables hotplug for the correspoinding
+                        class of devices.
+
+                The value of the above attribute is an integer number: 1 (set)
+                or 0 (unset).  Attempts to write any other values to it will
+                cause -EINVAL to be returned.
+
 What:           /sys/firmware/acpi/interrupts/
 Date:           February 2008
 Contact:        Len Brown <lenb@kernel.org>
diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt
index 72f70b16d299..a3585eac83b6 100644
--- a/Documentation/cpu-freq/cpu-drivers.txt
+++ b/Documentation/cpu-freq/cpu-drivers.txt
@@ -108,8 +108,9 @@ policy->governor		must contain the "default policy" for
                                 cpufreq_driver.target is called with
                                 these values.
 
-For setting some of these values, the frequency table helpers might be
-helpful. See the section 2 for more information on them.
+For setting some of these values (cpuinfo.min[max]_freq, policy->min[max]), the
+frequency table helpers might be helpful. See the section 2 for more information
+on them.
 
 SMP systems normally have same clock source for a group of cpus. For these the
 .init() would be called only once for the first online cpu. Here the .init()
@@ -184,10 +185,10 @@ the reference implementation in drivers/cpufreq/longrun.c
 As most cpufreq processors only allow for being set to a few specific
 frequencies, a "frequency table" with some functions might assist in
 some work of the processor driver. Such a "frequency table" consists
-of an array of struct cpufreq_freq_table entries, with any value in
+of an array of struct cpufreq_frequency_table entries, with any value in
 "index" you want to use, and the corresponding frequency in
 "frequency". At the end of the table, you need to add a
-cpufreq_freq_table entry with frequency set to CPUFREQ_TABLE_END. And
+cpufreq_frequency_table entry with frequency set to CPUFREQ_TABLE_END. And
 if you want to skip one entry in the table, set the frequency to 
 CPUFREQ_ENTRY_INVALID. The entries don't need to be in ascending
 order.
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index c7a2eb8450c2..66f9cc310686 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -167,6 +167,27 @@ of load evaluation and helping the CPU stay at its top speed when truly
 busy, rather than shifting back and forth in speed. This tunable has no
 effect on behavior at lower speeds/lower CPU loads.
 
+powersave_bias: this parameter takes a value between 0 to 1000. It
+defines the percentage (times 10) value of the target frequency that
+will be shaved off of the target. For example, when set to 100 -- 10%,
+when ondemand governor would have targeted 1000 MHz, it will target
+1000 MHz - (10% of 1000 MHz) = 900 MHz instead. This is set to 0
+(disabled) by default.
+When AMD frequency sensitivity powersave bias driver --
+drivers/cpufreq/amd_freq_sensitivity.c is loaded, this parameter
+defines the workload frequency sensitivity threshold in which a lower
+frequency is chosen instead of ondemand governor's original target.
+The frequency sensitivity is a hardware reported (on AMD Family 16h
+Processors and above) value between 0 to 100% that tells software how
+the performance of the workload running on a CPU will change when
+frequency changes. A workload with sensitivity of 0% (memory/IO-bound)
+will not perform any better on higher core frequency, whereas a
+workload with sensitivity of 100% (CPU-bound) will perform better
+higher the frequency. When the driver is loaded, this is set to 400
+by default -- for CPUs running workloads with sensitivity value below
+40%, a lower frequency is chosen. Unloading the driver or writing 0
+will disable this feature.
+
 
 2.5 Conservative
 ----------------
@@ -191,6 +212,12 @@ governor but for the opposite direction.  For example when set to its
 default value of '20' it means that if the CPU usage needs to be below
 20% between samples to have the frequency decreased.
 
+sampling_down_factor: similar functionality as in "ondemand" governor.
+But in "conservative", it controls the rate at which the kernel makes
+a decision on when to decrease the frequency while running in any
+speed. Load for frequency increase is still evaluated every
+sampling rate.
+
 3. The Governor Interface in the CPUfreq Core
 =============================================
 
diff --git a/Documentation/cpuidle/driver.txt b/Documentation/cpuidle/driver.txt
index 7a9e09ece931..1b0d81d92583 100644
--- a/Documentation/cpuidle/driver.txt
+++ b/Documentation/cpuidle/driver.txt
@@ -15,11 +15,17 @@ has mechanisms in place to support actual entry-exit into CPU idle states.
 cpuidle driver initializes the cpuidle_device structure for each CPU device
 and registers with cpuidle using cpuidle_register_device.
 
+If all the idle states are the same, the wrapper function cpuidle_register
+could be used instead.
+
 It can also support the dynamic changes (like battery <-> AC), by using
 cpuidle_pause_and_lock, cpuidle_disable_device and cpuidle_enable_device,
 cpuidle_resume_and_unlock.
 
 Interfaces:
+extern int cpuidle_register(struct cpuidle_driver *drv,
+                            const struct cpumask *const coupled_cpus);
+extern int cpuidle_unregister(struct cpuidle_driver *drv);
 extern int cpuidle_register_driver(struct cpuidle_driver *drv);
 extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);
 extern int cpuidle_register_device(struct cpuidle_device *dev);
diff --git a/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
new file mode 100644
index 000000000000..0715695e94a9
--- /dev/null
+++ b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
@@ -0,0 +1,65 @@
+Generic ARM big LITTLE cpufreq driver's DT glue
+-----------------------------------------------
+
+This is DT specific glue layer for generic cpufreq driver for big LITTLE
+systems.
+
+Both required and optional properties listed below must be defined
+under node /cpus/cpu@x. Where x is the first cpu inside a cluster.
+
+FIXME: Cpus should boot in the order specified in DT and all cpus for a cluster
+must be present contiguously. Generic DT driver will check only node 'x' for
+cpu:x.
+
+Required properties:
+- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt
+  for details
+
+Optional properties:
+- clock-latency: Specify the possible maximum transition latency for clock,
+  in unit of nanoseconds.
+
+Examples:
+
+cpus {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        cpu@0 {
+                compatible = "arm,cortex-a15";
+                reg = <0>;
+                next-level-cache = <&L2>;
+                operating-points = <
+                        /* kHz    uV */
+                        792000  1100000
+                        396000  950000
+                        198000  850000
+                >;
+                clock-latency = <61036>; /* two CLK32 periods */
+        };
+
+        cpu@1 {
+                compatible = "arm,cortex-a15";
+                reg = <1>;
+                next-level-cache = <&L2>;
+        };
+
+        cpu@100 {
+                compatible = "arm,cortex-a7";
+                reg = <100>;
+                next-level-cache = <&L2>;
+                operating-points = <
+                        /* kHz    uV */
+                        792000  950000
+                        396000  750000
+                        198000  450000
+                >;
+                clock-latency = <61036>; /* two CLK32 periods */
+        };
+
+        cpu@101 {
+                compatible = "arm,cortex-a7";
+                reg = <101>;
+                next-level-cache = <&L2>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
index 4416ccc33472..051f764bedb8 100644
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
@@ -32,7 +32,7 @@ cpus {
                         396000  950000
                         198000  850000
                 >;
-                transition-latency = <61036>; /* two CLK32 periods */
+                clock-latency = <61036>; /* two CLK32 periods */
         };
 
         cpu@1 {
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt
new file mode 100644
index 000000000000..caff1a57436f
--- /dev/null
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt
@@ -0,0 +1,28 @@
+
+Exynos5440 cpufreq driver
+-------------------
+
+Exynos5440 SoC cpufreq driver for CPU frequency scaling.
+
+Required properties:
+- interrupts: Interrupt to know the completion of cpu frequency change.
+- operating-points: Table of frequencies and voltage CPU could be transitioned into,
+        in the decreasing order. Frequency should be in KHz units and voltage
+        should be in microvolts.
+
+Optional properties:
+- clock-latency: Clock monitor latency in microsecond.
+
+All the required listed above must be defined under node cpufreq.
+
+Example:
+--------
+        cpufreq@160000 {
+                compatible = "samsung,exynos5440-cpufreq";
+                reg = <0x160000 0x1000>;
+                interrupts = <0 57 0>;
+                operating-points = <
+                                1000000 975000
+                                800000  925000>;
+                clock-latency = <100000>;
+        };
diff --git a/MAINTAINERS b/MAINTAINERS
index ea8f65fc6fa3..75f6282d342b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2203,12 +2203,34 @@ F:	drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
 M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Viresh Kumar <viresh.kumar@linaro.org>
 L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 S:      Maintained
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 F:      drivers/cpufreq/
 F:      include/linux/cpufreq.h
 
+CPU FREQUENCY DRIVERS - ARM BIG LITTLE
+M:      Viresh Kumar <viresh.kumar@linaro.org>
+M:      Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
+L:      cpufreq@vger.kernel.org
+L:      linux-pm@vger.kernel.org
+W:      http://www.arm.com/products/processors/technologies/biglittleprocessing.php
+S:      Maintained
+F:      drivers/cpufreq/arm_big_little.h
+F:      drivers/cpufreq/arm_big_little.c
+F:      drivers/cpufreq/arm_big_little_dt.c
+
+CPUIDLE DRIVERS
+M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Daniel Lezcano <daniel.lezcano@linaro.org>
+L:      linux-pm@vger.kernel.org
+S:      Maintained
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+F:      drivers/cpuidle/*
+F:      include/linux/cpuidle.h
+
 CPUID/MSR DRIVER
 M:      "H. Peter Anvin" <hpa@zytor.com>
 S:      Maintained
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a39e3214ea3d..006f9838dd43 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2163,7 +2163,6 @@ endmenu
 menu "CPU Power Management"
 
 if ARCH_HAS_CPUFREQ
-
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_IMX
@@ -2173,30 +2172,6 @@ config CPU_FREQ_IMX
         help
           This enables the CPUfreq driver for i.MX CPUs.
 
-config CPU_FREQ_SA1100
-        bool
-
-config CPU_FREQ_SA1110
-        bool
-
-config CPU_FREQ_INTEGRATOR
-        tristate "CPUfreq driver for ARM Integrator CPUs"
-        depends on ARCH_INTEGRATOR && CPU_FREQ
-        default y
-        help
-          This enables the CPUfreq driver for ARM Integrator CPUs.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say Y.
-
-config CPU_FREQ_PXA
-        bool
-        depends on CPU_FREQ && ARCH_PXA && PXA25x
-        default y
-        select CPU_FREQ_DEFAULT_GOV_USERSPACE
-        select CPU_FREQ_TABLE
-
 config CPU_FREQ_S3C
         bool
         help
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 13482ea58b09..93f3794ba5cb 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -56,7 +56,6 @@ CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_KIRKWOOD=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index 0c6381516a5a..48f1228c611c 100644
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -27,8 +27,6 @@
 
 #define AT91_MAX_STATES 2
 
-static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);
-
 /* Actual code that puts the SoC in different idle states */
 static int at91_enter_idle(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
@@ -47,7 +45,6 @@ static int at91_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver at91_idle_driver = {
         .name                   = "at91_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = at91_enter_idle,
@@ -61,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int at91_init_cpuidle(void)
+static int __init at91_init_cpuidle(void)
 {
-        struct cpuidle_device *device;
-
-        device = &per_cpu(at91_cpuidle_device, smp_processor_id());
-        device->state_count = AT91_MAX_STATES;
-
-        cpuidle_register_driver(&at91_idle_driver);
-
-        if (cpuidle_register_device(device)) {
-                printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");
-                return -EIO;
-        }
-        return 0;
+        return cpuidle_register(&at91_idle_driver, NULL);
 }
 
 device_initcall(at91_init_cpuidle);
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index fb5c1aa98a63..dd1ffccc75e9 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_MITYOMAPL138)		+= board-mityomapl138.o
 obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD)   += board-omapl138-hawk.o
 
 # Power Management
-obj-$(CONFIG_CPU_FREQ)                  += cpufreq.o
 obj-$(CONFIG_CPU_IDLE)                  += cpuidle.o
 obj-$(CONFIG_SUSPEND)                   += pm.o sleep.o
 obj-$(CONFIG_HAVE_CLK)                  += pm_domain.o
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 5ac9e9384b15..36aef3a7dedb 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -25,7 +25,6 @@
 
 #define DAVINCI_CPUIDLE_MAX_STATES      2
 
-static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
 static void __iomem *ddr2_reg_base;
 static bool ddr2_pdown;
 
@@ -50,14 +49,10 @@ static void davinci_save_ddr_power(int enter, bool pdown)
 
 /* Actual code that puts the SoC in different idle states */
 static int davinci_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                                int index)
+                              struct cpuidle_driver *drv, int index)
 {
         davinci_save_ddr_power(1, ddr2_pdown);
-
-        index = cpuidle_wrap_enter(dev, drv, index,
-                                arm_cpuidle_simple_enter);
-
+        cpu_do_idle();
         davinci_save_ddr_power(0, ddr2_pdown);
 
         return index;
@@ -66,7 +61,6 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver davinci_idle_driver = {
         .name                   = "cpuidle-davinci",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = davinci_enter_idle,
@@ -81,12 +75,8 @@ static struct cpuidle_driver davinci_idle_driver = {
 
 static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 {
-        int ret;
-        struct cpuidle_device *device;
         struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;
 
-        device = &per_cpu(davinci_cpuidle_device, smp_processor_id());
-
         if (!pdata) {
                 dev_err(&pdev->dev, "cannot get platform data\n");
                 return -ENOENT;
@@ -96,20 +86,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 
         ddr2_pdown = pdata->ddr2_pdown;
 
-        ret = cpuidle_register_driver(&davinci_idle_driver);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register driver\n");
-                return ret;
-        }
-
-        ret = cpuidle_register_device(device);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register device\n");
-                cpuidle_unregister_driver(&davinci_idle_driver);
-                return ret;
-        }
-
-        return 0;
+        return cpuidle_register(&davinci_idle_driver, NULL);
 }
 
 static struct platform_driver davinci_cpuidle_driver = {
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 70f94c87479d..d5dde0727339 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -72,10 +72,12 @@ config SOC_EXYNOS5440
         bool "SAMSUNG EXYNOS5440"
         default y
         depends on ARCH_EXYNOS5
+        select ARCH_HAS_OPP
         select ARM_ARCH_TIMER
         select AUTO_ZRELADDR
         select PINCTRL
         select PINCTRL_EXYNOS5440
+        select PM_OPP
         help
           Enable EXYNOS5440 SoC support
 
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index fcfe0251aa3e..498a7a23e260 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -58,7 +58,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device);
 static struct cpuidle_driver exynos4_idle_driver = {
         .name                   = "exynos4_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
 };
 
 /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index c4ce0906d76a..cb70961b6239 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
 obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 
 ifeq ($(CONFIG_CPU_IDLE),y)
-obj-y += cpuidle.o
+obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 endif
 
diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c
index d8c75c3c925d..387dc4cceca2 100644
--- a/arch/arm/mach-imx/cpufreq.c
+++ b/arch/arm/mach-imx/cpufreq.c
@@ -87,13 +87,12 @@ static int mxc_set_target(struct cpufreq_policy *policy,
 
         freqs.old = clk_get_rate(cpu_clk) / 1000;
         freqs.new = freq_Hz / 1000;
-        freqs.cpu = 0;
         freqs.flags = 0;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         ret = set_cpu_freq(freq_Hz);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
@@ -145,14 +144,11 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy)
         imx_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
         policy->cur = clk_get_rate(cpu_clk) / 1000;
-        policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;
-        policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;
 
         /* Manual states, that PLL stabilizes in two CLK32 periods */
         policy->cpuinfo.transition_latency = 2 * NANOSECOND / CLK32_FREQ;
 
         ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
-
         if (ret < 0) {
                 printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",
                        __func__, ret);
diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c
new file mode 100644
index 000000000000..5a47e3c6172f
--- /dev/null
+++ b/arch/arm/mach-imx/cpuidle-imx5.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/cpuidle.h>
+#include <linux/module.h>
+#include <asm/system_misc.h>
+
+static int imx5_cpuidle_enter(struct cpuidle_device *dev,
+                              struct cpuidle_driver *drv, int index)
+{
+        arm_pm_idle();
+        return index;
+}
+
+static struct cpuidle_driver imx5_cpuidle_driver = {
+        .name             = "imx5_cpuidle",
+        .owner            = THIS_MODULE,
+        .states[0] = {
+                .enter            = imx5_cpuidle_enter,
+                .exit_latency     = 2,
+                .target_residency = 1,
+                .flags            = CPUIDLE_FLAG_TIME_VALID,
+                .name             = "IMX5 SRPG",
+                .desc             = "CPU state retained,powered off",
+        },
+        .state_count = 1,
+};
+
+int __init imx5_cpuidle_init(void)
+{
+        return cpuidle_register(&imx5_cpuidle_driver, NULL);
+}
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index d533e2695f0e..23ddfb693b2d 100644
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -6,7 +6,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/module.h>
 #include <asm/cpuidle.h>
@@ -21,10 +20,6 @@ static DEFINE_SPINLOCK(master_lock);
 static int imx6q_enter_wait(struct cpuidle_device *dev,
                             struct cpuidle_driver *drv, int index)
 {
-        int cpu = dev->cpu;
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
-
         if (atomic_inc_return(&master) == num_online_cpus()) {
                 /*
                  * With this lock, we prevent other cpu to exit and enter
@@ -43,26 +38,13 @@ idle:
         cpu_do_idle();
 done:
         atomic_dec(&master);
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
 
         return index;
 }
 
-/*
- * For each cpu, setup the broadcast timer because local timer
- * stops for the states other than WFI.
- */
-static void imx6q_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
 static struct cpuidle_driver imx6q_cpuidle_driver = {
         .name = "imx6q_cpuidle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 /* WFI */
                 ARM_CPUIDLE_WFI_STATE,
@@ -70,7 +52,8 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {
                 {
                         .exit_latency = 50,
                         .target_residency = 75,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .flags = CPUIDLE_FLAG_TIME_VALID |
+                                 CPUIDLE_FLAG_TIMER_STOP,
                         .enter = imx6q_enter_wait,
                         .name = "WAIT",
                         .desc = "Clock off",
@@ -88,8 +71,5 @@ int __init imx6q_cpuidle_init(void)
         /* Set chicken bit to get a reliable WAIT mode support */
         imx6q_set_chicken_bit();
 
-        /* Configure the broadcast timer on each cpu */
-        on_each_cpu(imx6q_setup_broadcast_timer, NULL, 1);
-
-        return imx_cpuidle_init(&imx6q_cpuidle_driver);
+        return cpuidle_register(&imx6q_cpuidle_driver, NULL);
 }
diff --git a/arch/arm/mach-imx/cpuidle.c b/arch/arm/mach-imx/cpuidle.c
deleted file mode 100644
index d4cb511a44a8..000000000000
--- a/arch/arm/mach-imx/cpuidle.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
- * Copyright 2012 Linaro Ltd.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/cpuidle.h>
-#include <linux/err.h>
-#include <linux/hrtimer.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-static struct cpuidle_device __percpu * imx_cpuidle_devices;
-
-static void __init imx_cpuidle_devices_uninit(void)
-{
-        int cpu_id;
-        struct cpuidle_device *dev;
-
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                cpuidle_unregister_device(dev);
-        }
-
-        free_percpu(imx_cpuidle_devices);
-}
-
-int __init imx_cpuidle_init(struct cpuidle_driver *drv)
-{
-        struct cpuidle_device *dev;
-        int cpu_id, ret;
-
-        if (drv->state_count > CPUIDLE_STATE_MAX) {
-                pr_err("%s: state_count exceeds maximum\n", __func__);
-                return -EINVAL;
-        }
-
-        ret = cpuidle_register_driver(drv);
-        if (ret) {
-                pr_err("%s: Failed to register cpuidle driver with error: %d\n",
-                         __func__, ret);
-                return ret;
-        }
-
-        imx_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (imx_cpuidle_devices == NULL) {
-                ret = -ENOMEM;
-                goto unregister_drv;
-        }
-
-        /* initialize state data for each cpuidle_device */
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                dev->cpu = cpu_id;
-                dev->state_count = drv->state_count;
-
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("%s: Failed to register cpu %u, error: %d\n",
-                                __func__, cpu_id, ret);
-                        goto uninit;
-                }
-        }
-
-        return 0;
-
-uninit:
-        imx_cpuidle_devices_uninit();
-
-unregister_drv:
-        cpuidle_unregister_driver(drv);
-        return ret;
-}
diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h
index e092d1359d94..786f98ecc145 100644
--- a/arch/arm/mach-imx/cpuidle.h
+++ b/arch/arm/mach-imx/cpuidle.h
@@ -10,18 +10,16 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include <linux/cpuidle.h>
-
 #ifdef CONFIG_CPU_IDLE
-extern int imx_cpuidle_init(struct cpuidle_driver *drv);
+extern int imx5_cpuidle_init(void);
 extern int imx6q_cpuidle_init(void);
 #else
-static inline int imx_cpuidle_init(struct cpuidle_driver *drv)
+static inline int imx5_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 static inline int imx6q_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 #endif
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index f67fd7ee8127..82e79c658eb2 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -149,33 +149,6 @@ static void imx5_pm_idle(void)
         imx5_cpu_do_idle();
 }
 
-static int imx5_cpuidle_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int idx)
-{
-        int ret;
-
-        ret = imx5_cpu_do_idle();
-        if (ret < 0)
-                return ret;
-
-        return idx;
-}
-
-static struct cpuidle_driver imx5_cpuidle_driver = {
-        .name                   = "imx5_cpuidle",
-        .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
-        .states[0]      = {
-                .enter                  = imx5_cpuidle_enter,
-                .exit_latency           = 2,
-                .target_residency       = 1,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                .name                   = "IMX5 SRPG",
-                .desc                   = "CPU state retained,powered off",
-        },
-        .state_count            = 1,
-};
-
 static int __init imx5_pm_common_init(void)
 {
         int ret;
@@ -193,8 +166,7 @@ static int __init imx5_pm_common_init(void)
         /* Set the registers to the default cpu idle state. */
         mx5_cpu_lp_set(IMX5_DEFAULT_CPU_IDLE_STATE);
 
-        imx_cpuidle_init(&imx5_cpuidle_driver);
-        return 0;
+        return imx5_cpuidle_init();
 }
 
 void __init imx51_pm_init(void)
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile
index 5521d18bf19a..d14d6b76f4c2 100644
--- a/arch/arm/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
@@ -9,5 +9,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o
 obj-$(CONFIG_ARCH_INTEGRATOR_CP)        += integrator_cp.o
 
 obj-$(CONFIG_PCI)                       += pci_v3.o pci.o
-obj-$(CONFIG_CPU_FREQ_INTEGRATOR)       += cpu.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)          += impd1.o
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index d6ba13e1c540..14522d077c88 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -249,7 +249,6 @@ extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);
 extern int omap4_finish_suspend(unsigned long cpu_state);
 extern void omap4_cpu_resume(void);
 extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);
-extern u32 omap4_mpuss_read_prev_context_state(void);
 #else
 static inline int omap4_enter_lowpower(unsigned int cpu,
                                         unsigned int power_state)
@@ -277,10 +276,6 @@ static inline int omap4_finish_suspend(unsigned long cpu_state)
 static inline void omap4_cpu_resume(void)
 {}
 
-static inline u32 omap4_mpuss_read_prev_context_state(void)
-{
-        return 0;
-}
 #endif
 
 struct omap_sdrc_params;
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 80392fca86c6..cca045c95fbf 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -26,6 +26,7 @@
 #include <linux/cpuidle.h>
 #include <linux/export.h>
 #include <linux/cpu_pm.h>
+#include <asm/cpuidle.h>
 
 #include "powerdomain.h"
 #include "clockdomain.h"
@@ -99,11 +100,15 @@ static struct omap3_idle_statedata omap3_idle_data[] = {
         },
 };
 
-/* Private functions */
-
-static int __omap3_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                int index)
+/**
+ * omap3_enter_idle - Programs OMAP3 to enter the specified state
+ * @dev: cpuidle device
+ * @drv: cpuidle driver
+ * @index: the index of state to be entered
+ */
+static int omap3_enter_idle(struct cpuidle_device *dev,
+                            struct cpuidle_driver *drv,
+                            int index)
 {
         struct omap3_idle_statedata *cx = &omap3_idle_data[index];
 
@@ -149,22 +154,6 @@ return_sleep_time:
 }
 
 /**
- * omap3_enter_idle - Programs OMAP3 to enter the specified state
- * @dev: cpuidle device
- * @drv: cpuidle driver
- * @index: the index of state to be entered
- *
- * Called from the CPUidle framework to program the device to the
- * specified target state selected by the governor.
- */
-static inline int omap3_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                int index)
-{
-        return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle);
-}
-
-/**
  * next_valid_state - Find next valid C-state
  * @dev: cpuidle device
  * @drv: cpuidle driver
@@ -271,11 +260,9 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
         return ret;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
-
 static struct cpuidle_driver omap3_idle_driver = {
-        .name =         "omap3_idle",
-        .owner =        THIS_MODULE,
+        .name             = "omap3_idle",
+        .owner            = THIS_MODULE,
         .states = {
                 {
                         .enter            = omap3_enter_idle_bm,
@@ -348,8 +335,6 @@ static struct cpuidle_driver omap3_idle_driver = {
  */
 int __init omap3_idle_init(void)
 {
-        struct cpuidle_device *dev;
-
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
         core_pd = pwrdm_lookup("core_pwrdm");
         per_pd = pwrdm_lookup("per_pwrdm");
@@ -358,16 +343,5 @@ int __init omap3_idle_init(void)
         if (!mpu_pd || !core_pd || !per_pd || !cam_pd)
                 return -ENODEV;
 
-        cpuidle_register_driver(&omap3_idle_driver);
-
-        dev = &per_cpu(omap3_idle_dev, smp_processor_id());
-        dev->cpu = 0;
-
-        if (cpuidle_register_device(dev)) {
-                printk(KERN_ERR "%s: CPUidle register device failed\n",
-                       __func__);
-                return -EIO;
-        }
-
-        return 0;
+        return cpuidle_register(&omap3_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index d639aef0deda..5a286b56205e 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -1,7 +1,7 @@
 /*
- * OMAP4 CPU idle Routines
+ * OMAP4+ CPU idle Routines
  *
- * Copyright (C) 2011 Texas Instruments, Inc.
+ * Copyright (C) 2011-2013 Texas Instruments, Inc.
  * Santosh Shilimkar <santosh.shilimkar@ti.com>
  * Rajendra Nayak <rnayak@ti.com>
  *
@@ -14,8 +14,8 @@
 #include <linux/cpuidle.h>
 #include <linux/cpu_pm.h>
 #include <linux/export.h>
-#include <linux/clockchips.h>
 
+#include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
 
 #include "common.h"
@@ -24,13 +24,13 @@
 #include "clockdomain.h"
 
 /* Machine specific information */
-struct omap4_idle_statedata {
+struct idle_statedata {
         u32 cpu_state;
         u32 mpu_logic_state;
         u32 mpu_state;
 };
 
-static struct omap4_idle_statedata omap4_idle_data[] = {
+static struct idle_statedata omap4_idle_data[] = {
         {
                 .cpu_state = PWRDM_POWER_ON,
                 .mpu_state = PWRDM_POWER_ON,
@@ -53,11 +53,12 @@ static struct clockdomain *cpu_clkdm[NR_CPUS];
 
 static atomic_t abort_barrier;
 static bool cpu_done[NR_CPUS];
+static struct idle_statedata *state_ptr = &omap4_idle_data[0];
 
 /* Private functions */
 
 /**
- * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions
+ * omap_enter_idle_[simple/coupled] - OMAP4PLUS cpuidle entry functions
  * @dev: cpuidle device
  * @drv: cpuidle driver
  * @index: the index of state to be entered
@@ -66,7 +67,7 @@ static bool cpu_done[NR_CPUS];
  * specified low power state selected by the governor.
  * Returns the amount of time spent in the low power state.
  */
-static int omap4_enter_idle_simple(struct cpuidle_device *dev,
+static int omap_enter_idle_simple(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
@@ -77,12 +78,11 @@ static int omap4_enter_idle_simple(struct cpuidle_device *dev,
         return index;
 }
 
-static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
+static int omap_enter_idle_coupled(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
-        struct omap4_idle_statedata *cx = &omap4_idle_data[index];
-        int cpu_id = smp_processor_id();
+        struct idle_statedata *cx = state_ptr + index;
 
         local_fiq_disable();
 
@@ -109,8 +109,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
                 }
         }
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
-
         /*
          * Call idle CPU PM enter notifier chain so that
          * VFP and per CPU interrupt context is saved.
@@ -149,11 +147,10 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
          * Call idle CPU cluster PM exit notifier chain
          * to restore GIC and wakeupgen context.
          */
-        if (omap4_mpuss_read_prev_context_state())
+        if ((cx->mpu_state == PWRDM_POWER_RET) &&
+                (cx->mpu_logic_state == PWRDM_POWER_OFF))
                 cpu_cluster_pm_exit();
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
-
 fail:
         cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
         cpu_done[dev->cpu] = false;
@@ -163,49 +160,38 @@ fail:
         return index;
 }
 
-/*
- * For each cpu, setup the broadcast timer because local timers
- * stops for the states above C1.
- */
-static void omap_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
-static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
-
 static struct cpuidle_driver omap4_idle_driver = {
         .name                           = "omap4_idle",
         .owner                          = THIS_MODULE,
-        .en_core_tk_irqen               = 1,
         .states = {
                 {
                         /* C1 - CPU0 ON + CPU1 ON + MPU ON */
                         .exit_latency = 2 + 2,
                         .target_residency = 5,
                         .flags = CPUIDLE_FLAG_TIME_VALID,
-                        .enter = omap4_enter_idle_simple,
+                        .enter = omap_enter_idle_simple,
                         .name = "C1",
-                        .desc = "MPUSS ON"
+                        .desc = "CPUx ON, MPUSS ON"
                 },
                 {
                         /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
                         .exit_latency = 328 + 440,
                         .target_residency = 960,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
-                        .enter = omap4_enter_idle_coupled,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
+                                 CPUIDLE_FLAG_TIMER_STOP,
+                        .enter = omap_enter_idle_coupled,
                         .name = "C2",
-                        .desc = "MPUSS CSWR",
+                        .desc = "CPUx OFF, MPUSS CSWR",
                 },
                 {
                         /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
                         .exit_latency = 460 + 518,
                         .target_residency = 1100,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
-                        .enter = omap4_enter_idle_coupled,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
+                                 CPUIDLE_FLAG_TIMER_STOP,
+                        .enter = omap_enter_idle_coupled,
                         .name = "C3",
-                        .desc = "MPUSS OSWR",
+                        .desc = "CPUx OFF, MPUSS OSWR",
                 },
         },
         .state_count = ARRAY_SIZE(omap4_idle_data),
@@ -215,16 +201,13 @@ static struct cpuidle_driver omap4_idle_driver = {
 /* Public functions */
 
 /**
- * omap4_idle_init - Init routine for OMAP4 idle
+ * omap4_idle_init - Init routine for OMAP4+ idle
  *
- * Registers the OMAP4 specific cpuidle driver to the cpuidle
+ * Registers the OMAP4+ specific cpuidle driver to the cpuidle
  * framework with the valid set of states.
  */
 int __init omap4_idle_init(void)
 {
-        struct cpuidle_device *dev;
-        unsigned int cpu_id = 0;
-
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
         cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm");
         cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm");
@@ -236,22 +219,5 @@ int __init omap4_idle_init(void)
         if (!cpu_clkdm[0] || !cpu_clkdm[1])
                 return -ENODEV;
 
-        /* Configure the broadcast timer on each cpu */
-        on_each_cpu(omap_setup_broadcast_timer, NULL, 1);
-
-        for_each_cpu(cpu_id, cpu_online_mask) {
-                dev = &per_cpu(omap4_idle_dev, cpu_id);
-                dev->cpu = cpu_id;
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-                dev->coupled_cpus = *cpu_online_mask;
-#endif
-                cpuidle_register_driver(&omap4_idle_driver);
-
-                if (cpuidle_register_device(dev)) {
-                        pr_err("%s: CPUidle register failed\n", __func__);
-                        return -EIO;
-                }
-        }
-
-        return 0;
+        return cpuidle_register(&omap4_idle_driver, cpu_online_mask);
 }
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index 8bcb64bcdcdb..e80327b6c81f 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -139,20 +139,6 @@ static inline void cpu_clear_prev_logic_pwrst(unsigned int cpu_id)
         }
 }
 
-/**
- * omap4_mpuss_read_prev_context_state:
- * Function returns the MPUSS previous context state
- */
-u32 omap4_mpuss_read_prev_context_state(void)
-{
-        u32 reg;
-
-        reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
-                OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);
-        reg &= OMAP4430_LOSTCONTEXT_DFF_MASK;
-        return reg;
-}
-
 /*
  * Store the CPU cluster state for L2X0 low power operations.
  */
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index dec553349ae2..e742118fcfd2 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -264,6 +264,12 @@ static void __init omap4_init_voltages(void)
         omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
 }
 
+static inline void omap_init_cpufreq(void)
+{
+        struct platform_device_info devinfo = { .name = "omap-cpufreq", };
+        platform_device_register_full(&devinfo);
+}
+
 static int __init omap2_common_pm_init(void)
 {
         if (!of_have_populated_dt())
@@ -293,6 +299,9 @@ int __init omap2_common_pm_late_init(void)
 
                 /* Smartreflex device init */
                 omap_devinit_smartreflex();
+
+                /* cpufreq dummy device instantiation */
+                omap_init_cpufreq();
         }
 
 #ifdef CONFIG_SUSPEND
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 12c500558387..648867a8caa8 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -7,12 +7,6 @@ obj-y				+= clock.o devices.o generic.o irq.o \
                                    time.o reset.o
 obj-$(CONFIG_PM)                += pm.o sleep.o standby.o
 
-ifeq ($(CONFIG_CPU_FREQ),y)
-obj-$(CONFIG_PXA25x)            += cpufreq-pxa2xx.o
-obj-$(CONFIG_PXA27x)            += cpufreq-pxa2xx.o
-obj-$(CONFIG_PXA3xx)            += cpufreq-pxa3xx.o
-endif
-
 # Generic drivers that other drivers may depend upon
 
 # SoC-specific code
diff --git a/arch/arm/mach-pxa/include/mach/generic.h b/arch/arm/mach-pxa/include/mach/generic.h
new file mode 100644
index 000000000000..665542e0c9e2
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/generic.h
@@ -0,0 +1 @@
+#include "../../generic.h"
diff --git a/arch/arm/mach-s3c24xx/cpufreq.c b/arch/arm/mach-s3c24xx/cpufreq.c
index 5f181e733eee..3c0e78ede0da 100644
--- a/arch/arm/mach-s3c24xx/cpufreq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq.c
@@ -204,7 +204,6 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         freqs.old = cpu_cur.freq;
         freqs.new = cpu_new.freq;
 
-        freqs.freqs.cpu = 0;
         freqs.freqs.old = cpu_cur.freq.armclk / 1000;
         freqs.freqs.new = cpu_new.freq.armclk / 1000;
 
@@ -218,9 +217,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         s3c_cpufreq_updateclk(clk_pclk, cpu_new.freq.pclk);
 
         /* start the frequency change */
-
-        if (policy)
-                cpufreq_notify_transition(&freqs.freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_PRECHANGE);
 
         /* If hclk is staying the same, then we do not need to
          * re-write the IO or the refresh timings whilst we are changing
@@ -264,8 +261,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         local_irq_restore(flags);
 
         /* notify everyone we've done this */
-        if (policy)
-                cpufreq_notify_transition(&freqs.freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_POSTCHANGE);
 
         s3c_freq_dbg("%s: finished\n", __func__);
         return 0;
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index ead5fab0dbb5..3c8ab07c2012 100644
--- a/arch/arm/mach-s3c64xx/cpuidle.c
+++ b/arch/arm/mach-s3c64xx/cpuidle.c
@@ -40,12 +40,9 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
         return index;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
-
 static struct cpuidle_driver s3c64xx_cpuidle_driver = {
         .name   = "s3c64xx_cpuidle",
         .owner  = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 {
                         .enter            = s3c64xx_enter_idle,
@@ -61,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 
 static int __init s3c64xx_init_cpuidle(void)
 {
-        int ret;
-
-        cpuidle_register_driver(&s3c64xx_cpuidle_driver);
-
-        ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
-        if (ret) {
-                pr_err("Failed to register cpuidle device: %d\n", ret);
-                return ret;
-        }
-
-        return 0;
+        return cpuidle_register(&s3c64xx_cpuidle_driver, NULL);
 }
 device_initcall(s3c64xx_init_cpuidle);
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index ca14dbdcfb22..04f9784ff0ed 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -4,7 +4,7 @@ menu "SA11x0 Implementations"
 
 config SA1100_ASSABET
         bool "Assabet"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
           Microprocessor Development Board (also known as the Assabet).
@@ -20,7 +20,7 @@ config ASSABET_NEPONSET
 
 config SA1100_CERF
         bool "CerfBoard"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
           More information is available at:
@@ -47,7 +47,7 @@ endchoice
 
 config SA1100_COLLIE
         bool "Sharp Zaurus SL5500"
-        # FIXME: select CPU_FREQ_SA11x0
+        # FIXME: select ARM_SA11x0_CPUFREQ
         select SHARP_LOCOMO
         select SHARP_PARAM
         select SHARP_SCOOP
@@ -56,7 +56,7 @@ config SA1100_COLLIE
 
 config SA1100_H3100
         bool "Compaq iPAQ H3100"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -67,7 +67,7 @@ config SA1100_H3100
 
 config SA1100_H3600
         bool "Compaq iPAQ H3600/H3700"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -78,7 +78,7 @@ config SA1100_H3600
 
 config SA1100_BADGE4
         bool "HP Labs BadgePAD 4"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         select SA1111
         help
           Say Y here if you want to build a kernel for the HP Laboratories
@@ -86,7 +86,7 @@ config SA1100_BADGE4
 
 config SA1100_JORNADA720
         bool "HP Jornada 720"
-        # FIXME: select CPU_FREQ_SA11x0
+        # FIXME: select ARM_SA11x0_CPUFREQ
         select SA1111
         help
           Say Y here if you want to build a kernel for the HP Jornada 720
@@ -105,14 +105,14 @@ config SA1100_JORNADA720_SSP
 
 config SA1100_HACKKIT
         bool "HackKit Core CPU Board"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here to support the HackKit Core CPU Board
           <http://hackkit.eletztrick.de>;
 
 config SA1100_LART
         bool "LART"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here if you are using the Linux Advanced Radio Terminal
           (also known as the LART).  See <http://www.lartmaker.nl/> for
@@ -120,7 +120,7 @@ config SA1100_LART
 
 config SA1100_NANOENGINE
         bool "nanoEngine"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select PCI
         select PCI_NANOENGINE
         help
@@ -130,7 +130,7 @@ config SA1100_NANOENGINE
 
 config SA1100_PLEB
         bool "PLEB"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here if you are using version 1 of the Portable Linux
           Embedded Board (also known as PLEB).
@@ -139,7 +139,7 @@ config SA1100_PLEB
 
 config SA1100_SHANNON
         bool "Shannon"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
           limited edition webphone produced by Philips. The Shannon is a SA1100
@@ -148,7 +148,7 @@ config SA1100_SHANNON
 
 config SA1100_SIMPAD
         bool "Simpad"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
           are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 1aed9e70465d..2732eef48966 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -8,9 +8,6 @@ obj-m :=
 obj-n :=
 obj-  :=
 
-obj-$(CONFIG_CPU_FREQ_SA1100)           += cpu-sa1100.o
-obj-$(CONFIG_CPU_FREQ_SA1110)           += cpu-sa1110.o
-
 # Specific board support
 obj-$(CONFIG_SA1100_ASSABET)            += assabet.o
 obj-$(CONFIG_ASSABET_NEPONSET)          += neponset.o
diff --git a/arch/arm/mach-sa1100/include/mach/generic.h b/arch/arm/mach-sa1100/include/mach/generic.h
new file mode 100644
index 000000000000..665542e0c9e2
--- /dev/null
+++ b/arch/arm/mach-sa1100/include/mach/generic.h
@@ -0,0 +1 @@
+#include "../../generic.h"
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
index 9e050268cde4..0afeb5c7061c 100644
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -16,39 +16,22 @@
 #include <asm/cpuidle.h>
 #include <asm/io.h>
 
-int shmobile_enter_wfi(struct cpuidle_device *dev, struct cpuidle_driver *drv,
-                       int index)
-{
-        cpu_do_idle();
-        return 0;
-}
-
-static struct cpuidle_device shmobile_cpuidle_dev;
 static struct cpuidle_driver shmobile_cpuidle_default_driver = {
         .name                   = "shmobile_cpuidle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
-        .states[0].enter        = shmobile_enter_wfi,
         .safe_state_index       = 0, /* C1 */
         .state_count            = 1,
 };
 
 static struct cpuidle_driver *cpuidle_drv = &shmobile_cpuidle_default_driver;
 
-void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
+void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
 {
         cpuidle_drv = drv;
 }
 
-int shmobile_cpuidle_init(void)
+int __init shmobile_cpuidle_init(void)
 {
-        struct cpuidle_device *dev = &shmobile_cpuidle_dev;
-
-        cpuidle_register_driver(cpuidle_drv);
-
-        dev->state_count = cpuidle_drv->state_count;
-        cpuidle_register_device(dev);
-
-        return 0;
+        return cpuidle_register(cpuidle_drv, NULL);
 }
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e48606d8a2be..362f9b2d2c02 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -13,9 +13,6 @@ extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
 struct cpuidle_driver;
-struct cpuidle_device;
-extern int shmobile_enter_wfi(struct cpuidle_device *dev,
-                              struct cpuidle_driver *drv, int index);
 extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
 
 extern void sh7372_init_irq(void);
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index a0826a48dd08..dec9293bb90d 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -410,11 +410,9 @@ static int sh7372_enter_a4s(struct cpuidle_device *dev,
 static struct cpuidle_driver sh7372_cpuidle_driver = {
         .name                   = "sh7372_cpuidle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .state_count            = 5,
         .safe_state_index       = 0, /* C1 */
         .states[0] = ARM_CPUIDLE_WFI_STATE,
-        .states[0].enter = shmobile_enter_wfi,
         .states[1] = {
                 .name = "C2",
                 .desc = "Core Standby Mode",
@@ -450,12 +448,12 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
         },
 };
 
-static void sh7372_cpuidle_init(void)
+static void __init sh7372_cpuidle_init(void)
 {
         shmobile_cpuidle_set_driver(&sh7372_cpuidle_driver);
 }
 #else
-static void sh7372_cpuidle_init(void) {}
+static void __init sh7372_cpuidle_init(void) {}
 #endif
 
 #ifdef CONFIG_SUSPEND
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index f6b46ae2b7f8..09b578f9eb84 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= cpuidle-tegra30.o
 endif
 obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
-obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
 obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
 
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += board-dt-tegra20.o
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index 0f4e8c483b34..1d1c6023f4a2 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -23,39 +23,13 @@
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .state_count = 1,
         .states = {
                 [0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
         },
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 int __init tegra114_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index 825ced4f7a40..590ec25855dd 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -43,32 +43,33 @@ static atomic_t abort_barrier;
 static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
                                     struct cpuidle_driver *drv,
                                     int index);
+#define TEGRA20_MAX_STATES 2
+#else
+#define TEGRA20_MAX_STATES 1
 #endif
 
-static struct cpuidle_state tegra_idle_states[] = {
-        [0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
-#ifdef CONFIG_PM_SLEEP
-        [1] = {
-                .enter                  = tegra20_idle_lp2_coupled,
-                .exit_latency           = 5000,
-                .target_residency       = 10000,
-                .power_usage            = 0,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                          CPUIDLE_FLAG_COUPLED,
-                .name                   = "powered-down",
-                .desc                   = "CPU power gated",
-        },
-#endif
-};
-
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
+        .states = {
+                ARM_CPUIDLE_WFI_STATE_PWR(600),
+#ifdef CONFIG_PM_SLEEP
+                {
+                        .enter            = tegra20_idle_lp2_coupled,
+                        .exit_latency     = 5000,
+                        .target_residency = 10000,
+                        .power_usage      = 0,
+                        .flags            = CPUIDLE_FLAG_TIME_VALID |
+                        CPUIDLE_FLAG_COUPLED,
+                        .name             = "powered-down",
+                        .desc             = "CPU power gated",
+                },
+#endif
+        },
+        .state_count = TEGRA20_MAX_STATES,
+        .safe_state_index = 0,
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 #ifdef CONFIG_PM_SLEEP
 #ifdef CONFIG_SMP
 static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
@@ -217,39 +218,8 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
 
 int __init tegra20_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
 #ifdef CONFIG_PM_SLEEP
         tegra_tear_down_cpu = tegra20_tear_down_cpu;
 #endif
-
-        drv->state_count = ARRAY_SIZE(tegra_idle_states);
-        memcpy(drv->states, tegra_idle_states,
-                        drv->state_count * sizeof(drv->states[0]));
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-                dev->coupled_cpus = *cpu_possible_mask;
-#endif
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, cpu_possible_mask);
 }
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
index 8b50cf4ddd6f..36dc2befa9d8 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -43,7 +43,6 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
 #ifdef CONFIG_PM_SLEEP
         .state_count = 2,
 #else
@@ -65,8 +64,6 @@ static struct cpuidle_driver tegra_idle_driver = {
         },
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 #ifdef CONFIG_PM_SLEEP
 static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
                                            struct cpuidle_driver *drv,
@@ -157,32 +154,8 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,
 
 int __init tegra30_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
 #ifdef CONFIG_PM_SLEEP
         tegra_tear_down_cpu = tegra30_tear_down_cpu;
 #endif
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index ce9149302cc3..488e07472d98 100644
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -11,7 +11,6 @@
 
 #include <linux/module.h>
 #include <linux/cpuidle.h>
-#include <linux/clockchips.h>
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
 #include <linux/smp.h>
@@ -22,7 +21,6 @@
 
 static atomic_t master = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(master_lock);
-static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device);
 
 static inline int ux500_enter_idle(struct cpuidle_device *dev,
                                    struct cpuidle_driver *drv, int index)
@@ -30,8 +28,6 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
         int this_cpu = smp_processor_id();
         bool recouple = false;
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &this_cpu);
-
         if (atomic_inc_return(&master) == num_online_cpus()) {
 
                 /* With this lock, we prevent the other cpu to exit and enter
@@ -91,22 +87,20 @@ out:
                 spin_unlock(&master_lock);
         }
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &this_cpu);
-
         return index;
 }
 
 static struct cpuidle_driver ux500_idle_driver = {
         .name = "ux500_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 ARM_CPUIDLE_WFI_STATE,
                 {
                         .enter            = ux500_enter_idle,
                         .exit_latency     = 70,
                         .target_residency = 260,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
+                        .flags            = CPUIDLE_FLAG_TIME_VALID |
+                                            CPUIDLE_FLAG_TIMER_STOP,
                         .name             = "ApIdle",
                         .desc             = "ARM Retention",
                 },
@@ -115,59 +109,13 @@ static struct cpuidle_driver ux500_idle_driver = {
         .state_count = 2,
 };
 
-/*
- * For each cpu, setup the broadcast timer because we will
- * need to migrate the timers for the states >= ApIdle.
- */
-static void ux500_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
 int __init ux500_idle_init(void)
 {
-        int ret, cpu;
-        struct cpuidle_device *device;
-
         /* Configure wake up reasons */
         prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
                              PRCMU_WAKEUP(ABB));
 
-        /*
-         * Configure the timer broadcast for each cpu, that must
-         * be done from the cpu context, so we use a smp cross
-         * call with 'on_each_cpu'.
-         */
-        on_each_cpu(ux500_setup_broadcast_timer, NULL, 1);
-
-        ret = cpuidle_register_driver(&ux500_idle_driver);
-        if (ret) {
-                printk(KERN_ERR "failed to register ux500 idle driver\n");
-                return ret;
-        }
-
-        for_each_online_cpu(cpu) {
-                device = &per_cpu(ux500_cpuidle_device, cpu);
-                device->cpu = cpu;
-                ret = cpuidle_register_device(device);
-                if (ret) {
-                        printk(KERN_ERR "Failed to register cpuidle "
-                               "device for cpu%d\n", cpu);
-                        goto out_unregister;
-                }
-        }
-out:
-        return ret;
-
-out_unregister:
-        for_each_online_cpu(cpu) {
-                device = &per_cpu(ux500_cpuidle_device, cpu);
-                cpuidle_unregister_device(device);
-        }
-
-        cpuidle_unregister_driver(&ux500_idle_driver);
-        goto out;
+        return cpuidle_register(&ux500_idle_driver, NULL);
 }
 
 device_initcall(ux500_idle_init);
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index c1a868d398bd..22c40308360b 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -250,20 +250,7 @@ config ARCH_SUSPEND_POSSIBLE
         def_bool y
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config CPU_FREQ_AT32AP
-        bool "CPU frequency driver for AT32AP"
-        depends on CPU_FREQ && PLATFORM_AT32AP
-        default n
-        help
-          This enables the CPU frequency driver for AT32AP processors.
-
-          For details, take a look in <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
 endmenu
 
 endmenu
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index f4025db184ff..d5aff36ade92 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index c76a49b9e9d0..4abcf435d599 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index 2d8ab089a64e..18f3fa0470ff 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig
index b189e0cab04b..06e389cfcd12 100644
--- a/arch/avr32/configs/atngw100_mrmt_defconfig
+++ b/arch/avr32/configs/atngw100_mrmt_defconfig
@@ -23,7 +23,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig
index 2e4de42a53c4..2518a1368d7c 100644
--- a/arch/avr32/configs/atngw100mkii_defconfig
+++ b/arch/avr32/configs/atngw100mkii_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
index fad3cd22dfd3..245ef6bd0fa6 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
@@ -29,7 +29,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
index 29986230aaa5..fa6cbac6e418 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index a582465e1cef..bbd5131021a5 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -25,7 +25,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index 57a79df2ce5d..c1cd726f9012 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 1a49bd8c6340..754ae56b2767 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index 206a1b67f763..58589d8cc0ac 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
index 0421498d666b..57788a42ff83 100644
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
index 82f24eb251bd..ba7c31e269cb 100644
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
@@ -31,7 +31,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig
index 1bee51f22154..0a8bfdc420e0 100644
--- a/arch/avr32/configs/mimc200_defconfig
+++ b/arch/avr32/configs/mimc200_defconfig
@@ -24,7 +24,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/mach-at32ap/Makefile b/arch/avr32/mach-at32ap/Makefile
index 514c9a9b009a..fc09ec4bc725 100644
--- a/arch/avr32/mach-at32ap/Makefile
+++ b/arch/avr32/mach-at32ap/Makefile
@@ -1,7 +1,6 @@
 obj-y                           += pdc.o clock.o intc.o extint.o pio.o hsmc.o
 obj-y                           += hmatrix.o
 obj-$(CONFIG_CPU_AT32AP700X)    += at32ap700x.o pm-at32ap700x.o
-obj-$(CONFIG_CPU_FREQ_AT32AP)   += cpufreq.o
 obj-$(CONFIG_PM)                += pm.o
 
 ifeq ($(CONFIG_PM_DEBUG),y)
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 75f0ba29ebb9..675466d490d4 100644
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_PM)          += pm.o
 ifneq ($(CONFIG_BF60x),y)
 obj-$(CONFIG_PM)          += dpmc_modes.o
 endif
-obj-$(CONFIG_CPU_FREQ)    += cpufreq.o
 obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
 obj-$(CONFIG_SMP)         += smp.o
 obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
diff --git a/arch/cris/arch-v32/mach-a3/Makefile b/arch/cris/arch-v32/mach-a3/Makefile
index d366e0891988..18a227196a41 100644
--- a/arch/cris/arch-v32/mach-a3/Makefile
+++ b/arch/cris/arch-v32/mach-a3/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean:
 
diff --git a/arch/cris/arch-v32/mach-fs/Makefile b/arch/cris/arch-v32/mach-fs/Makefile
index d366e0891988..18a227196a41 100644
--- a/arch/cris/arch-v32/mach-fs/Makefile
+++ b/arch/cris/arch-v32/mach-fs/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean:
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e7e55a00f94f..e725ea01569e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -591,9 +591,9 @@ source "kernel/power/Kconfig"
 source "drivers/acpi/Kconfig"
 
 if PM
-
-source "arch/ia64/kernel/cpufreq/Kconfig"
-
+menu "CPU Frequency scaling"
+source "drivers/cpufreq/Kconfig"
+endmenu
 endif
 
 endmenu
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index d959c84904be..20678a9ed11a 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_SMP)		+= smp.o smpboot.o
 obj-$(CONFIG_NUMA)              += numa.o
 obj-$(CONFIG_PERFMON)           += perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)      += cyclone.o
-obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
 obj-$(CONFIG_KPROBES)           += kprobes.o jprobes.o
 obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
diff --git a/arch/ia64/kernel/cpufreq/Kconfig b/arch/ia64/kernel/cpufreq/Kconfig
deleted file mode 100644
index 2d9d5279b981..000000000000
--- a/arch/ia64/kernel/cpufreq/Kconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#
-# CPU Frequency scaling
-#
-
-menu "CPU Frequency scaling"
-
-source "drivers/cpufreq/Kconfig"
-
-if CPU_FREQ
-
-comment "CPUFreq processor drivers"
-
-config IA64_ACPI_CPUFREQ
-        tristate "ACPI Processor P-States driver"
-        select CPU_FREQ_TABLE
-        depends on ACPI_PROCESSOR
-        help
-        This driver adds a CPUFreq driver which utilizes the ACPI
-        Processor Performance States.
-
-        For details, take a look at <file:Documentation/cpu-freq/>.
-
-        If in doubt, say N.
-
-endif   # CPU_FREQ
-
-endmenu
-
diff --git a/arch/ia64/kernel/cpufreq/Makefile b/arch/ia64/kernel/cpufreq/Makefile
deleted file mode 100644
index 4838f2a57c7a..000000000000
--- a/arch/ia64/kernel/cpufreq/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_IA64_ACPI_CPUFREQ)         += acpi-cpufreq.o
-
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3a7b3954ce1b..007a917a980d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2541,7 +2541,14 @@ source "kernel/power/Kconfig"
 
 endmenu
 
-source "arch/mips/kernel/cpufreq/Kconfig"
+config MIPS_EXTERNAL_TIMER
+        bool
+
+if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
+menu "CPU Power Management"
+source "drivers/cpufreq/Kconfig"
+endmenu
+endif
 
 source "net/Kconfig"
 
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index de75fb50562b..520a908d45d6 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -92,8 +92,6 @@ CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/n
 
 obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)   += 8250-platform.o
 
-obj-$(CONFIG_MIPS_CPUFREQ)      += cpufreq/
-
 obj-$(CONFIG_PERF_EVENTS)       += perf_event.o
 obj-$(CONFIG_HW_PERF_EVENTS)    += perf_event_mipsxx.o
 
diff --git a/arch/mips/kernel/cpufreq/Kconfig b/arch/mips/kernel/cpufreq/Kconfig
deleted file mode 100644
index 58c601eee6fd..000000000000
--- a/arch/mips/kernel/cpufreq/Kconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# CPU Frequency scaling
-#
-
-config MIPS_EXTERNAL_TIMER
-        bool
-
-config MIPS_CPUFREQ
-        bool
-        default y
-        depends on CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
-
-if MIPS_CPUFREQ
-
-menu "CPU Frequency scaling"
-
-source "drivers/cpufreq/Kconfig"
-
-if CPU_FREQ
-
-comment "CPUFreq processor drivers"
-
-config LOONGSON2_CPUFREQ
-        tristate "Loongson2 CPUFreq Driver"
-        select CPU_FREQ_TABLE
-        depends on MIPS_CPUFREQ
-        help
-          This option adds a CPUFreq driver for loongson processors which
-          support software configurable cpu frequency.
-
-          Loongson2F and it's successors support this feature.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-endif   # CPU_FREQ
-
-endmenu
-
-endif   # MIPS_CPUFREQ
diff --git a/arch/mips/kernel/cpufreq/Makefile b/arch/mips/kernel/cpufreq/Makefile
deleted file mode 100644
index 05a5715ee38c..000000000000
--- a/arch/mips/kernel/cpufreq/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the Linux/MIPS cpufreq.
-#
-
-obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 53aaefeb3386..9978f594cac0 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -113,34 +113,10 @@ config CBE_THERM
         default m
         depends on CBE_RAS && SPU_BASE
 
-config CBE_CPUFREQ
-        tristate "CBE frequency scaling"
-        depends on CBE_RAS && CPU_FREQ
-        default m
-        help
-          This adds the cpufreq driver for Cell BE processors.
-          For details, take a look at <file:Documentation/cpu-freq/>.
-          If you don't have such processor, say N
-
-config CBE_CPUFREQ_PMI_ENABLE
-        bool "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ
-        default n
-        help
-          Select this, if you want to use the PMI interface
-          to switch frequencies. Using PMI, the
-          processor will not only be able to run at lower speed,
-          but also at lower core voltage.
-
-config CBE_CPUFREQ_PMI
-        tristate
-        depends on CBE_CPUFREQ_PMI_ENABLE
-        default CBE_CPUFREQ
-
 config PPC_PMI
         tristate
         default y
-        depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON
+        depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON
         help
           PMI (Platform Management Interrupt) is a way to
           communicate with the BMC (Baseboard Management Controller).
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index a4a89350bcfc..fe053e7c73ee 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -5,9 +5,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE)		+= iommu.o setup.o spider-pic.o \
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
 obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
-obj-$(CONFIG_CBE_CPUFREQ_PMI)           += cbe_cpufreq_pmi.o
-obj-$(CONFIG_CBE_CPUFREQ)               += cbe-cpufreq.o
-cbe-cpufreq-y                           += cbe_cpufreq_pervasive.o cbe_cpufreq.o
 obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR)  += cpufreq_spudemand.o
 
 obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)  += cbe_powerbutton.o
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index 890f30e70f98..be1e7958909e 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -273,10 +273,9 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = policy->cur;
         freqs.new = pas_freqs[pas_astate_new].frequency;
-        freqs.cpu = policy->cpu;
 
         mutex_lock(&pas_switch_mutex);
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n",
                  policy->cpu,
@@ -288,7 +287,7 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,
         for_each_online_cpu(i)
                 set_astate(i, pas_astate_new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         mutex_unlock(&pas_switch_mutex);
 
         ppc_proc_freq = freqs.new * 1000ul;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 311b804353b1..3104fad82480 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -335,7 +335,8 @@ static int pmu_set_cpu_speed(int low_speed)
         return 0;
 }
 
-static int do_set_cpu_speed(int speed_mode, int notify)
+static int do_set_cpu_speed(struct cpufreq_policy *policy, int speed_mode,
+                int notify)
 {
         struct cpufreq_freqs freqs;
         unsigned long l3cr;
@@ -343,13 +344,12 @@ static int do_set_cpu_speed(int speed_mode, int notify)
 
         freqs.old = cur_freq;
         freqs.new = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
-        freqs.cpu = smp_processor_id();
 
         if (freqs.old == freqs.new)
                 return 0;
 
         if (notify)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         if (speed_mode == CPUFREQ_LOW &&
             cpu_has_feature(CPU_FTR_L3CR)) {
                 l3cr = _get_L3CR();
@@ -366,7 +366,7 @@ static int do_set_cpu_speed(int speed_mode, int notify)
                         _set_L3CR(prev_l3cr);
         }
         if (notify)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         cur_freq = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
 
         return 0;
@@ -393,7 +393,7 @@ static int pmac_cpufreq_target(	struct cpufreq_policy *policy,
                         target_freq, relation, &newstate))
                 return -EINVAL;
 
-        rc = do_set_cpu_speed(newstate, 1);
+        rc = do_set_cpu_speed(policy, newstate, 1);
 
         ppc_proc_freq = cur_freq * 1000ul;
         return rc;
@@ -442,7 +442,7 @@ static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)
         no_schedule = 1;
         sleep_freq = cur_freq;
         if (cur_freq == low_freq && !is_pmu_based)
-                do_set_cpu_speed(CPUFREQ_HIGH, 0);
+                do_set_cpu_speed(policy, CPUFREQ_HIGH, 0);
         return 0;
 }
 
@@ -458,7 +458,7 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)
          * is that we force a switch to whatever it was, which is
          * probably high speed due to our suspend() routine
          */
-        do_set_cpu_speed(sleep_freq == low_freq ?
+        do_set_cpu_speed(policy, sleep_freq == low_freq ?
                          CPUFREQ_LOW : CPUFREQ_HIGH, 0);
 
         ppc_proc_freq = cur_freq * 1000ul;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 9650c6029c82..7ba423431cfe 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -339,11 +339,10 @@ static int g5_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency;
         freqs.new = g5_cpu_freqs[newstate].frequency;
-        freqs.cpu = 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         rc = g5_switch_freq(newstate);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         mutex_unlock(&g5_switch_mutex);
 
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index 4d806b419606..4644efa06941 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -23,8 +23,8 @@
 #include "pseries.h"
 
 struct cpuidle_driver pseries_idle_driver = {
-        .name =         "pseries_idle",
-        .owner =        THIS_MODULE,
+        .name             = "pseries_idle",
+        .owner            = THIS_MODULE,
 };
 
 #define MAX_IDLE_STATE_COUNT    2
@@ -33,10 +33,8 @@ static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
 static struct cpuidle_device __percpu *pseries_cpuidle_devices;
 static struct cpuidle_state *cpuidle_state_table;
 
-static inline void idle_loop_prolog(unsigned long *in_purr, ktime_t *kt_before)
+static inline void idle_loop_prolog(unsigned long *in_purr)
 {
-
-        *kt_before = ktime_get();
         *in_purr = mfspr(SPRN_PURR);
         /*
          * Indicate to the HV that we are idle. Now would be
@@ -45,12 +43,10 @@ static inline void idle_loop_prolog(unsigned long *in_purr, ktime_t *kt_before)
         get_lppaca()->idle = 1;
 }
 
-static inline  s64 idle_loop_epilog(unsigned long in_purr, ktime_t kt_before)
+static inline void idle_loop_epilog(unsigned long in_purr)
 {
         get_lppaca()->wait_state_cycles += mfspr(SPRN_PURR) - in_purr;
         get_lppaca()->idle = 0;
-
-        return ktime_to_us(ktime_sub(ktime_get(), kt_before));
 }
 
 static int snooze_loop(struct cpuidle_device *dev,
@@ -58,10 +54,9 @@ static int snooze_loop(struct cpuidle_device *dev,
                         int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
         int cpu = dev->cpu;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
         local_irq_enable();
         set_thread_flag(TIF_POLLING_NRFLAG);
 
@@ -75,8 +70,8 @@ static int snooze_loop(struct cpuidle_device *dev,
         clear_thread_flag(TIF_POLLING_NRFLAG);
         smp_mb();
 
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
@@ -102,9 +97,8 @@ static int dedicated_cede_loop(struct cpuidle_device *dev,
                                 int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
         get_lppaca()->donate_dedicated_cpu = 1;
 
         ppc64_runlatch_off();
@@ -112,8 +106,9 @@ static int dedicated_cede_loop(struct cpuidle_device *dev,
         check_and_cede_processor();
 
         get_lppaca()->donate_dedicated_cpu = 0;
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
@@ -122,9 +117,8 @@ static int shared_cede_loop(struct cpuidle_device *dev,
                         int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
 
         /*
          * Yield the processor to the hypervisor.  We return if
@@ -135,8 +129,8 @@ static int shared_cede_loop(struct cpuidle_device *dev,
          */
         check_and_cede_processor();
 
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1ea597c6497a..78d8ace57272 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -622,25 +622,7 @@ config SH_CLK_CPG_LEGACY
 endmenu
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config SH_CPU_FREQ
-        tristate "SuperH CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the cpufreq driver for SuperH. Any CPU that supports
-          clock rate rounding through the clock framework can use this
-          driver. While it will make the kernel slightly larger, this is
-          harmless for CPUs that don't support rate rounding. The driver
-          will also generate a notice in the boot log before disabling
-          itself if the CPU in question is not capable of rate rounding.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If unsure, say N.
-
 endmenu
 
 source "arch/sh/drivers/Kconfig"
diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h
index e14567a7e9a1..70ae0b2888ab 100644
--- a/arch/sh/include/asm/suspend.h
+++ b/arch/sh/include/asm/suspend.h
@@ -14,9 +14,9 @@ struct swsusp_arch_regs {
 void sh_mobile_call_standby(unsigned long mode);
 
 #ifdef CONFIG_CPU_IDLE
-void sh_mobile_setup_cpuidle(void);
+int sh_mobile_setup_cpuidle(void);
 #else
-static inline void sh_mobile_setup_cpuidle(void) {}
+static inline int sh_mobile_setup_cpuidle(void) { return 0; }
 #endif
 
 /* notifier chains for pre/post sleep hooks */
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index f259b37874e9..261c8bfd75ce 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL)		+= vsyscall/
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
 obj-$(CONFIG_KGDB)              += kgdb.o
-obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
 obj-$(CONFIG_MODULES)           += sh_ksyms_$(BITS).o module.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index 1ddc876d3b26..d30622592116 100644
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -51,70 +51,53 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
         return k;
 }
 
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
-        .name                   = "sh_idle",
-        .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
+        .name   = "sh_idle",
+        .owner  = THIS_MODULE,
+        .states = {
+                {
+                        .exit_latency = 1,
+                        .target_residency = 1 * 2,
+                        .power_usage = 3,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C1",
+                        .desc = "SuperH Sleep Mode",
+                },
+                {
+                        .exit_latency = 100,
+                        .target_residency = 1 * 2,
+                        .power_usage = 1,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C2",
+                        .desc = "SuperH Sleep Mode [SF]",
+                        .disabled = true,
+                },
+                {
+                        .exit_latency = 2300,
+                        .target_residency = 1 * 2,
+                        .power_usage = 1,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C3",
+                        .desc = "SuperH Mobile Standby Mode [SF]",
+                        .disabled = true,
+                },
+        },
+        .safe_state_index = 0,
+        .state_count = 3,
 };
 
-void sh_mobile_setup_cpuidle(void)
+int __init sh_mobile_setup_cpuidle(void)
 {
-        struct cpuidle_device *dev = &cpuidle_dev;
-        struct cpuidle_driver *drv = &cpuidle_driver;
-        struct cpuidle_state *state;
-        int i;
+        int ret;
 
+        if (sh_mobile_sleep_supported & SUSP_SH_SF)
+                cpuidle_driver.states[1].disabled = false;
 
-        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                drv->states[i].name[0] = '\0';
-                drv->states[i].desc[0] = '\0';
-        }
+        if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
+                cpuidle_driver.states[2].disabled = false;
 
-        i = CPUIDLE_DRIVER_STATE_START;
-
-        state = &drv->states[i++];
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
-        strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN);
-        state->exit_latency = 1;
-        state->target_residency = 1 * 2;
-        state->power_usage = 3;
-        state->flags = 0;
-        state->flags |= CPUIDLE_FLAG_TIME_VALID;
-        state->enter = cpuidle_sleep_enter;
-
-        drv->safe_state_index = i-1;
-
-        if (sh_mobile_sleep_supported & SUSP_SH_SF) {
-                state = &drv->states[i++];
-                snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
-                strncpy(state->desc, "SuperH Sleep Mode [SF]",
-                        CPUIDLE_DESC_LEN);
-                state->exit_latency = 100;
-                state->target_residency = 1 * 2;
-                state->power_usage = 1;
-                state->flags = 0;
-                state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                state->enter = cpuidle_sleep_enter;
-        }
-
-        if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) {
-                state = &drv->states[i++];
-                snprintf(state->name, CPUIDLE_NAME_LEN, "C3");
-                strncpy(state->desc, "SuperH Mobile Standby Mode [SF]",
-                        CPUIDLE_DESC_LEN);
-                state->exit_latency = 2300;
-                state->target_residency = 1 * 2;
-                state->power_usage = 1;
-                state->flags = 0;
-                state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                state->enter = cpuidle_sleep_enter;
-        }
-
-        drv->state_count = i;
-        dev->state_count = i;
-
-        cpuidle_register_driver(&cpuidle_driver);
-
-        cpuidle_register_device(dev);
+        return cpuidle_register(&cpuidle_driver);
 }
diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c
index 08d27fac8d08..ac37b7234f85 100644
--- a/arch/sh/kernel/cpu/shmobile/pm.c
+++ b/arch/sh/kernel/cpu/shmobile/pm.c
@@ -150,8 +150,7 @@ static const struct platform_suspend_ops sh_pm_ops = {
 static int __init sh_pm_init(void)
 {
         suspend_set_ops(&sh_pm_ops);
-        sh_mobile_setup_cpuidle();
-        return 0;
+        return sh_mobile_setup_cpuidle();
 }
 
 late_initcall(sh_pm_init);
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 66dc562950ae..e5641157464f 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -254,29 +254,6 @@ config HOTPLUG_CPU
 
 if SPARC64
 source "drivers/cpufreq/Kconfig"
-
-config US3_FREQ
-        tristate "UltraSPARC-III CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the CPUFreq driver for UltraSPARC-III processors.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
-config US2E_FREQ
-        tristate "UltraSPARC-IIe CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the CPUFreq driver for UltraSPARC-IIe processors.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
 endif
 
 config US3_MC
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 6cf591b7e1c6..5276fd4e9d03 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -102,9 +102,6 @@ obj-$(CONFIG_PCI_MSI)        += pci_msi.o
 
 obj-$(CONFIG_COMPAT)         += sys32.o sys_sparc32.o signal32.o
 
-# sparc64 cpufreq
-obj-$(CONFIG_US3_FREQ)  += us3_cpufreq.o
-obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
 obj-$(CONFIG_US3_MC)    += chmc.o
 
 obj-$(CONFIG_KPROBES)   += kprobes.o
diff --git a/arch/unicore32/kernel/Makefile b/arch/unicore32/kernel/Makefile
index fa497e0efe5a..607a72f2ae35 100644
--- a/arch/unicore32/kernel/Makefile
+++ b/arch/unicore32/kernel/Makefile
@@ -9,7 +9,6 @@ obj-y				+= setup.o signal.o sys.o stacktrace.o traps.o
 obj-$(CONFIG_MODULES)           += ksyms.o module.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 
-obj-$(CONFIG_CPU_FREQ)          += cpu-ucv2.o
 obj-$(CONFIG_UNICORE_FPU_F64)   += fpu-ucf64.o
 
 # obj-y for architecture PKUnity v3
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 398f7cb1353d..8010ebc5705f 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -185,6 +185,7 @@
 #define X86_FEATURE_PTS         (7*32+ 6) /* Intel Package Thermal Status */
 #define X86_FEATURE_DTHERM      (7*32+ 7) /* Digital Thermal Sensor */
 #define X86_FEATURE_HW_PSTATE   (7*32+ 8) /* AMD HW-PState */
+#define X86_FEATURE_PROC_FEEDBACK (7*32+ 9) /* AMD ProcFeedbackInterface */
 
 /* Virtualization flags: Linux defined, word 8 */
 #define X86_FEATURE_TPR_SHADOW  (8*32+ 0) /* Intel TPR Shadow */
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 66b5faffe14a..53a4e2744846 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -373,7 +373,6 @@ static int apm_cpu_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver apm_idle_driver = {
         .name = "apm_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 { /* entry 0 is for polling */ },
                 { /* entry 1 is for APM idle */
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index ee8e9abc859f..d92b5dad15dd 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -39,8 +39,9 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
                 { X86_FEATURE_APERFMPERF,       CR_ECX, 0, 0x00000006, 0 },
                 { X86_FEATURE_EPB,              CR_ECX, 3, 0x00000006, 0 },
                 { X86_FEATURE_XSAVEOPT,         CR_EAX, 0, 0x0000000d, 1 },
-                { X86_FEATURE_CPB,              CR_EDX, 9, 0x80000007, 0 },
                 { X86_FEATURE_HW_PSTATE,        CR_EDX, 7, 0x80000007, 0 },
+                { X86_FEATURE_CPB,              CR_EDX, 9, 0x80000007, 0 },
+                { X86_FEATURE_PROC_FEEDBACK,    CR_EDX,11, 0x80000007, 0 },
                 { X86_FEATURE_NPT,              CR_EDX, 0, 0x8000000a, 0 },
                 { X86_FEATURE_LBRV,             CR_EDX, 1, 0x8000000a, 0 },
                 { X86_FEATURE_SVML,             CR_EDX, 2, 0x8000000a, 0 },
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 4bf68c8d4797..100bd724f648 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -298,14 +298,6 @@ config ACPI_DEBUG
           Documentation/kernel-parameters.txt to control the type and
           amount of debug output.
 
-config ACPI_DEBUG_FUNC_TRACE
-        bool "Additionally enable ACPI function tracing"
-        default n
-        depends on ACPI_DEBUG
-        help
-          ACPI Debug Statements slow down ACPI processing. Function trace
-          is about half of the penalty and is rarely useful.
-
 config ACPI_PCI_SLOT
         bool "PCI slot detection driver"
         depends on SYSFS
@@ -334,7 +326,7 @@ config X86_PM_TIMER
 
 config ACPI_CONTAINER
         bool "Container and Module Devices"
-        default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
+        default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU)
         help
           This driver supports ACPI Container and Module devices (IDs
           ACPI0004, PNP0A05, and PNP0A06).
@@ -345,9 +337,8 @@ config ACPI_CONTAINER
           the module will be called container.
 
 config ACPI_HOTPLUG_MEMORY
-        tristate "Memory Hotplug"
+        bool "Memory Hotplug"
         depends on MEMORY_HOTPLUG
-        default n
         help
           This driver supports ACPI memory hotplug.  The driver
           fields notifications on ACPI memory devices (PNP0C80),
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 474fcfeba66c..ecb743bf05a5 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -39,6 +39,7 @@ acpi-y				+= ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
 acpi-y                          += pci_root.o pci_link.o pci_irq.o
 acpi-y                          += csrt.o
+acpi-$(CONFIG_X86_INTEL_LPSS)   += acpi_lpss.o
 acpi-y                          += acpi_platform.o
 acpi-y                          += power.o
 acpi-y                          += event.o
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
new file mode 100644
index 000000000000..b1c95422ce74
--- /dev/null
+++ b/drivers/acpi/acpi_lpss.c
@@ -0,0 +1,292 @@
+/*
+ * ACPI support for Intel Lynxpoint LPSS.
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/clk-lpss.h>
+#include <linux/pm_runtime.h>
+
+#include "internal.h"
+
+ACPI_MODULE_NAME("acpi_lpss");
+
+#define LPSS_CLK_SIZE   0x04
+#define LPSS_LTR_SIZE   0x18
+
+/* Offsets relative to LPSS_PRIVATE_OFFSET */
+#define LPSS_GENERAL                    0x08
+#define LPSS_GENERAL_LTR_MODE_SW        BIT(2)
+#define LPSS_SW_LTR                     0x10
+#define LPSS_AUTO_LTR                   0x14
+
+struct lpss_device_desc {
+        bool clk_required;
+        const char *clk_parent;
+        bool ltr_required;
+        unsigned int prv_offset;
+};
+
+struct lpss_private_data {
+        void __iomem *mmio_base;
+        resource_size_t mmio_size;
+        struct clk *clk;
+        const struct lpss_device_desc *dev_desc;
+};
+
+static struct lpss_device_desc lpt_dev_desc = {
+        .clk_required = true,
+        .clk_parent = "lpss_clk",
+        .prv_offset = 0x800,
+        .ltr_required = true,
+};
+
+static struct lpss_device_desc lpt_sdio_dev_desc = {
+        .prv_offset = 0x1000,
+        .ltr_required = true,
+};
+
+static const struct acpi_device_id acpi_lpss_device_ids[] = {
+        /* Lynxpoint LPSS devices */
+        { "INT33C0", (unsigned long)&lpt_dev_desc },
+        { "INT33C1", (unsigned long)&lpt_dev_desc },
+        { "INT33C2", (unsigned long)&lpt_dev_desc },
+        { "INT33C3", (unsigned long)&lpt_dev_desc },
+        { "INT33C4", (unsigned long)&lpt_dev_desc },
+        { "INT33C5", (unsigned long)&lpt_dev_desc },
+        { "INT33C6", (unsigned long)&lpt_sdio_dev_desc },
+        { "INT33C7", },
+
+        { }
+};
+
+static int is_memory(struct acpi_resource *res, void *not_used)
+{
+        struct resource r;
+        return !acpi_dev_resource_memory(res, &r);
+}
+
+/* LPSS main clock device. */
+static struct platform_device *lpss_clk_dev;
+
+static inline void lpt_register_clock_device(void)
+{
+        lpss_clk_dev = platform_device_register_simple("clk-lpt", -1, NULL, 0);
+}
+
+static int register_device_clock(struct acpi_device *adev,
+                                 struct lpss_private_data *pdata)
+{
+        const struct lpss_device_desc *dev_desc = pdata->dev_desc;
+
+        if (!lpss_clk_dev)
+                lpt_register_clock_device();
+
+        if (!dev_desc->clk_parent || !pdata->mmio_base
+            || pdata->mmio_size < dev_desc->prv_offset + LPSS_CLK_SIZE)
+                return -ENODATA;
+
+        pdata->clk = clk_register_gate(NULL, dev_name(&adev->dev),
+                                       dev_desc->clk_parent, 0,
+                                       pdata->mmio_base + dev_desc->prv_offset,
+                                       0, 0, NULL);
+        if (IS_ERR(pdata->clk))
+                return PTR_ERR(pdata->clk);
+
+        clk_register_clkdev(pdata->clk, NULL, dev_name(&adev->dev));
+        return 0;
+}
+
+static int acpi_lpss_create_device(struct acpi_device *adev,
+                                   const struct acpi_device_id *id)
+{
+        struct lpss_device_desc *dev_desc;
+        struct lpss_private_data *pdata;
+        struct resource_list_entry *rentry;
+        struct list_head resource_list;
+        int ret;
+
+        dev_desc = (struct lpss_device_desc *)id->driver_data;
+        if (!dev_desc)
+                return acpi_create_platform_device(adev, id);
+
+        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&resource_list);
+        ret = acpi_dev_get_resources(adev, &resource_list, is_memory, NULL);
+        if (ret < 0)
+                goto err_out;
+
+        list_for_each_entry(rentry, &resource_list, node)
+                if (resource_type(&rentry->res) == IORESOURCE_MEM) {
+                        pdata->mmio_size = resource_size(&rentry->res);
+                        pdata->mmio_base = ioremap(rentry->res.start,
+                                                   pdata->mmio_size);
+                        pdata->dev_desc = dev_desc;
+                        break;
+                }
+
+        acpi_dev_free_resource_list(&resource_list);
+
+        if (dev_desc->clk_required) {
+                ret = register_device_clock(adev, pdata);
+                if (ret) {
+                        /*
+                         * Skip the device, but don't terminate the namespace
+                         * scan.
+                         */
+                        kfree(pdata);
+                        return 0;
+                }
+        }
+
+        adev->driver_data = pdata;
+        ret = acpi_create_platform_device(adev, id);
+        if (ret > 0)
+                return ret;
+
+        adev->driver_data = NULL;
+
+ err_out:
+        kfree(pdata);
+        return ret;
+}
+
+static int lpss_reg_read(struct device *dev, unsigned int reg, u32 *val)
+{
+        struct acpi_device *adev;
+        struct lpss_private_data *pdata;
+        unsigned long flags;
+        int ret;
+
+        ret = acpi_bus_get_device(ACPI_HANDLE(dev), &adev);
+        if (WARN_ON(ret))
+                return ret;
+
+        spin_lock_irqsave(&dev->power.lock, flags);
+        if (pm_runtime_suspended(dev)) {
+                ret = -EAGAIN;
+                goto out;
+        }
+        pdata = acpi_driver_data(adev);
+        if (WARN_ON(!pdata || !pdata->mmio_base)) {
+                ret = -ENODEV;
+                goto out;
+        }
+        *val = readl(pdata->mmio_base + pdata->dev_desc->prv_offset + reg);
+
+ out:
+        spin_unlock_irqrestore(&dev->power.lock, flags);
+        return ret;
+}
+
+static ssize_t lpss_ltr_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        u32 ltr_value = 0;
+        unsigned int reg;
+        int ret;
+
+        reg = strcmp(attr->attr.name, "auto_ltr") ? LPSS_SW_LTR : LPSS_AUTO_LTR;
+        ret = lpss_reg_read(dev, reg, &ltr_value);
+        if (ret)
+                return ret;
+
+        return snprintf(buf, PAGE_SIZE, "%08x\n", ltr_value);
+}
+
+static ssize_t lpss_ltr_mode_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+        u32 ltr_mode = 0;
+        char *outstr;
+        int ret;
+
+        ret = lpss_reg_read(dev, LPSS_GENERAL, &ltr_mode);
+        if (ret)
+                return ret;
+
+        outstr = (ltr_mode & LPSS_GENERAL_LTR_MODE_SW) ? "sw" : "auto";
+        return sprintf(buf, "%s\n", outstr);
+}
+
+static DEVICE_ATTR(auto_ltr, S_IRUSR, lpss_ltr_show, NULL);
+static DEVICE_ATTR(sw_ltr, S_IRUSR, lpss_ltr_show, NULL);
+static DEVICE_ATTR(ltr_mode, S_IRUSR, lpss_ltr_mode_show, NULL);
+
+static struct attribute *lpss_attrs[] = {
+        &dev_attr_auto_ltr.attr,
+        &dev_attr_sw_ltr.attr,
+        &dev_attr_ltr_mode.attr,
+        NULL,
+};
+
+static struct attribute_group lpss_attr_group = {
+        .attrs = lpss_attrs,
+        .name = "lpss_ltr",
+};
+
+static int acpi_lpss_platform_notify(struct notifier_block *nb,
+                                     unsigned long action, void *data)
+{
+        struct platform_device *pdev = to_platform_device(data);
+        struct lpss_private_data *pdata;
+        struct acpi_device *adev;
+        const struct acpi_device_id *id;
+        int ret = 0;
+
+        id = acpi_match_device(acpi_lpss_device_ids, &pdev->dev);
+        if (!id || !id->driver_data)
+                return 0;
+
+        if (acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev))
+                return 0;
+
+        pdata = acpi_driver_data(adev);
+        if (!pdata || !pdata->mmio_base || !pdata->dev_desc->ltr_required)
+                return 0;
+
+        if (pdata->mmio_size < pdata->dev_desc->prv_offset + LPSS_LTR_SIZE) {
+                dev_err(&pdev->dev, "MMIO size insufficient to access LTR\n");
+                return 0;
+        }
+
+        if (action == BUS_NOTIFY_ADD_DEVICE)
+                ret = sysfs_create_group(&pdev->dev.kobj, &lpss_attr_group);
+        else if (action == BUS_NOTIFY_DEL_DEVICE)
+                sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
+
+        return ret;
+}
+
+static struct notifier_block acpi_lpss_nb = {
+        .notifier_call = acpi_lpss_platform_notify,
+};
+
+static struct acpi_scan_handler lpss_handler = {
+        .ids = acpi_lpss_device_ids,
+        .attach = acpi_lpss_create_device,
+};
+
+void __init acpi_lpss_init(void)
+{
+        if (!lpt_clk_init()) {
+                bus_register_notifier(&platform_bus_type, &acpi_lpss_nb);
+                acpi_scan_add_handler(&lpss_handler);
+        }
+}
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index da1f82b445e0..5e6301e94920 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2004 Intel Corporation <naveen.b.s@intel.com>
+ * Copyright (C) 2004, 2013 Intel Corporation
+ * Author: Naveen B S <naveen.b.s@intel.com>
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  *
  * All rights reserved.
  *
@@ -25,14 +27,10 @@
  * ranges.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/memory_hotplug.h>
-#include <linux/slab.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/memory_hotplug.h>
+
+#include "internal.h"
 
 #define ACPI_MEMORY_DEVICE_CLASS                "memory"
 #define ACPI_MEMORY_DEVICE_HID                  "PNP0C80"
@@ -44,32 +42,28 @@
 #define         PREFIX          "ACPI:memory_hp:"
 
 ACPI_MODULE_NAME("acpi_memhotplug");
-MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
-MODULE_DESCRIPTION("Hotplug Mem Driver");
-MODULE_LICENSE("GPL");
 
 /* Memory Device States */
 #define MEMORY_INVALID_STATE    0
 #define MEMORY_POWER_ON_STATE   1
 #define MEMORY_POWER_OFF_STATE  2
 
-static int acpi_memory_device_add(struct acpi_device *device);
-static int acpi_memory_device_remove(struct acpi_device *device);
+static int acpi_memory_device_add(struct acpi_device *device,
+                                  const struct acpi_device_id *not_used);
+static void acpi_memory_device_remove(struct acpi_device *device);
 
 static const struct acpi_device_id memory_device_ids[] = {
         {ACPI_MEMORY_DEVICE_HID, 0},
         {"", 0},
 };
-MODULE_DEVICE_TABLE(acpi, memory_device_ids);
 
-static struct acpi_driver acpi_memory_device_driver = {
-        .name = "acpi_memhotplug",
-        .class = ACPI_MEMORY_DEVICE_CLASS,
+static struct acpi_scan_handler memory_device_handler = {
         .ids = memory_device_ids,
-        .ops = {
-                .add = acpi_memory_device_add,
-                .remove = acpi_memory_device_remove,
-                },
+        .attach = acpi_memory_device_add,
+        .detach = acpi_memory_device_remove,
+        .hotplug = {
+                .enabled = true,
+        },
 };
 
 struct acpi_memory_info {
@@ -79,7 +73,6 @@ struct acpi_memory_info {
         unsigned short caching; /* memory cache attribute */
         unsigned short write_protect;   /* memory read/write attribute */
         unsigned int enabled:1;
-        unsigned int failed:1;
 };
 
 struct acpi_memory_device {
@@ -153,48 +146,6 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
         return 0;
 }
 
-static int acpi_memory_get_device(acpi_handle handle,
-                                  struct acpi_memory_device **mem_device)
-{
-        struct acpi_device *device = NULL;
-        int result = 0;
-
-        acpi_scan_lock_acquire();
-
-        acpi_bus_get_device(handle, &device);
-        if (device)
-                goto end;
-
-        /*
-         * Now add the notified device.  This creates the acpi_device
-         * and invokes .add function
-         */
-        result = acpi_bus_scan(handle);
-        if (result) {
-                acpi_handle_warn(handle, "ACPI namespace scan failed\n");
-                result = -EINVAL;
-                goto out;
-        }
-        result = acpi_bus_get_device(handle, &device);
-        if (result) {
-                acpi_handle_warn(handle, "Missing device object\n");
-                result = -EINVAL;
-                goto out;
-        }
-
- end:
-        *mem_device = acpi_driver_data(device);
-        if (!(*mem_device)) {
-                dev_err(&device->dev, "driver data not found\n");
-                result = -ENODEV;
-                goto out;
-        }
-
- out:
-        acpi_scan_lock_release();
-        return result;
-}
-
 static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
 {
         unsigned long long current_status;
@@ -249,13 +200,11 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
                  * returns -EEXIST. If add_memory() returns the other error, it
                  * means that this memory block is not used by the kernel.
                  */
-                if (result && result != -EEXIST) {
-                        info->failed = 1;
+                if (result && result != -EEXIST)
                         continue;
-                }
 
-                if (!result)
-                        info->enabled = 1;
+                info->enabled = 1;
+
                 /*
                  * Add num_enable even if add_memory() returns -EEXIST, so the
                  * device is bound to this driver.
@@ -286,16 +235,8 @@ static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
         nid = acpi_get_node(mem_device->device->handle);
 
         list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
-                if (info->failed)
-                        /* The kernel does not use this memory block */
-                        continue;
-
                 if (!info->enabled)
-                        /*
-                         * The kernel uses this memory block, but it may be not
-                         * managed by us.
-                         */
-                        return -EBUSY;
+                        continue;
 
                 if (nid < 0)
                         nid = memory_add_physaddr_to_nid(info->start_addr);
@@ -310,95 +251,21 @@ static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
         return result;
 }
 
-static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
-{
-        struct acpi_memory_device *mem_device;
-        struct acpi_device *device;
-        struct acpi_eject_event *ej_event = NULL;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
-        acpi_status status;
-
-        switch (event) {
-        case ACPI_NOTIFY_BUS_CHECK:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "\nReceived BUS CHECK notification for device\n"));
-                /* Fall Through */
-        case ACPI_NOTIFY_DEVICE_CHECK:
-                if (event == ACPI_NOTIFY_DEVICE_CHECK)
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "\nReceived DEVICE CHECK notification for device\n"));
-                if (acpi_memory_get_device(handle, &mem_device)) {
-                        acpi_handle_err(handle, "Cannot find driver data\n");
-                        break;
-                }
-
-                ost_code = ACPI_OST_SC_SUCCESS;
-                break;
-
-        case ACPI_NOTIFY_EJECT_REQUEST:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "\nReceived EJECT REQUEST notification for device\n"));
-
-                status = AE_ERROR;
-                acpi_scan_lock_acquire();
-
-                if (acpi_bus_get_device(handle, &device)) {
-                        acpi_handle_err(handle, "Device doesn't exist\n");
-                        goto unlock;
-                }
-                mem_device = acpi_driver_data(device);
-                if (!mem_device) {
-                        acpi_handle_err(handle, "Driver Data is NULL\n");
-                        goto unlock;
-                }
-
-                ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-                if (!ej_event) {
-                        pr_err(PREFIX "No memory, dropping EJECT\n");
-                        goto unlock;
-                }
-
-                get_device(&device->dev);
-                ej_event->device = device;
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-                /* The eject is carried out asynchronously. */
-                status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
-                                                 ej_event);
-                if (ACPI_FAILURE(status)) {
-                        put_device(&device->dev);
-                        kfree(ej_event);
-                }
-
- unlock:
-                acpi_scan_lock_release();
-                if (ACPI_SUCCESS(status))
-                        return;
-        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Unsupported event [0x%x]\n", event));
-
-                /* non-hotplug event; possibly handled by other handler */
-                return;
-        }
-
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
-}
-
 static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
 {
         if (!mem_device)
                 return;
 
         acpi_memory_free_device_resources(mem_device);
+        mem_device->device->driver_data = NULL;
         kfree(mem_device);
 }
 
-static int acpi_memory_device_add(struct acpi_device *device)
+static int acpi_memory_device_add(struct acpi_device *device,
+                                  const struct acpi_device_id *not_used)
 {
+        struct acpi_memory_device *mem_device;
         int result;
-        struct acpi_memory_device *mem_device = NULL;
-
 
         if (!device)
                 return -EINVAL;
@@ -423,147 +290,36 @@ static int acpi_memory_device_add(struct acpi_device *device)
         /* Set the device state */
         mem_device->state = MEMORY_POWER_ON_STATE;
 
-        pr_debug("%s\n", acpi_device_name(device));
+        result = acpi_memory_check_device(mem_device);
+        if (result) {
+                acpi_memory_device_free(mem_device);
+                return 0;
+        }
 
-        if (!acpi_memory_check_device(mem_device)) {
-                /* call add_memory func */
-                result = acpi_memory_enable_device(mem_device);
-                if (result) {
-                        dev_err(&device->dev,
-                                "Error in acpi_memory_enable_device\n");
-                        acpi_memory_device_free(mem_device);
-                }
+        result = acpi_memory_enable_device(mem_device);
+        if (result) {
+                dev_err(&device->dev, "acpi_memory_enable_device() error\n");
+                acpi_memory_device_free(mem_device);
+                return -ENODEV;
         }
-        return result;
+
+        dev_dbg(&device->dev, "Memory device configured by ACPI\n");
+        return 1;
 }
 
-static int acpi_memory_device_remove(struct acpi_device *device)
+static void acpi_memory_device_remove(struct acpi_device *device)
 {
-        struct acpi_memory_device *mem_device = NULL;
-        int result;
+        struct acpi_memory_device *mem_device;
 
         if (!device || !acpi_driver_data(device))
-                return -EINVAL;
+                return;
 
         mem_device = acpi_driver_data(device);
-
-        result = acpi_memory_remove_memory(mem_device);
-        if (result)
-                return result;
-
+        acpi_memory_remove_memory(mem_device);
         acpi_memory_device_free(mem_device);
-
-        return 0;
-}
-
-/*
- * Helper function to check for memory device
- */
-static acpi_status is_memory_device(acpi_handle handle)
-{
-        char *hardware_id;
-        acpi_status status;
-        struct acpi_device_info *info;
-
-        status = acpi_get_object_info(handle, &info);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        if (!(info->valid & ACPI_VALID_HID)) {
-                kfree(info);
-                return AE_ERROR;
-        }
-
-        hardware_id = info->hardware_id.string;
-        if ((hardware_id == NULL) ||
-            (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
-                status = AE_ERROR;
-
-        kfree(info);
-        return status;
-}
-
-static acpi_status
-acpi_memory_register_notify_handler(acpi_handle handle,
-                                    u32 level, void *ctxt, void **retv)
-{
-        acpi_status status;
-
-
-        status = is_memory_device(handle);
-        if (ACPI_FAILURE(status))
-                return AE_OK;   /* continue */
-
-        status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
-                                             acpi_memory_device_notify, NULL);
-        /* continue */
-        return AE_OK;
-}
-
-static acpi_status
-acpi_memory_deregister_notify_handler(acpi_handle handle,
-                                      u32 level, void *ctxt, void **retv)
-{
-        acpi_status status;
-
-
-        status = is_memory_device(handle);
-        if (ACPI_FAILURE(status))
-                return AE_OK;   /* continue */
-
-        status = acpi_remove_notify_handler(handle,
-                                            ACPI_SYSTEM_NOTIFY,
-                                            acpi_memory_device_notify);
-
-        return AE_OK;   /* continue */
-}
-
-static int __init acpi_memory_device_init(void)
-{
-        int result;
-        acpi_status status;
-
-
-        result = acpi_bus_register_driver(&acpi_memory_device_driver);
-
-        if (result < 0)
-                return -ENODEV;
-
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX,
-                                     acpi_memory_register_notify_handler, NULL,
-                                     NULL, NULL);
-
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "walk_namespace failed"));
-                acpi_bus_unregister_driver(&acpi_memory_device_driver);
-                return -ENODEV;
-        }
-
-        return 0;
 }
 
-static void __exit acpi_memory_device_exit(void)
+void __init acpi_memory_hotplug_init(void)
 {
-        acpi_status status;
-
-
-        /*
-         * Adding this to un-install notification handlers for all the device
-         * handles.
-         */
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX,
-                                     acpi_memory_deregister_notify_handler, NULL,
-                                     NULL, NULL);
-
-        if (ACPI_FAILURE(status))
-                ACPI_EXCEPTION((AE_INFO, status, "walk_namespace failed"));
-
-        acpi_bus_unregister_driver(&acpi_memory_device_driver);
-
-        return;
+        acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
 }
-
-module_init(acpi_memory_device_init);
-module_exit(acpi_memory_device_exit);
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 31de1043eea0..27bb6a91de5f 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -236,7 +236,7 @@ static int create_power_saving_task(void)
         ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
                 (void *)(unsigned long)ps_tsk_num,
                 "acpi_pad/%d", ps_tsk_num);
-        rc = IS_ERR(ps_tsks[ps_tsk_num]) ? PTR_ERR(ps_tsks[ps_tsk_num]) : 0;
+        rc = PTR_RET(ps_tsks[ps_tsk_num]);
         if (!rc)
                 ps_tsk_num++;
         else
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 26fce4b8a632..fafec5ddf17f 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,9 +22,6 @@
 
 ACPI_MODULE_NAME("platform");
 
-/* Flags for acpi_create_platform_device */
-#define ACPI_PLATFORM_CLK       BIT(0)
-
 /*
  * The following ACPI IDs are known to be suitable for representing as
  * platform devices.
@@ -33,33 +30,9 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
 
         { "PNP0D40" },
 
-        /* Haswell LPSS devices */
-        { "INT33C0", ACPI_PLATFORM_CLK },
-        { "INT33C1", ACPI_PLATFORM_CLK },
-        { "INT33C2", ACPI_PLATFORM_CLK },
-        { "INT33C3", ACPI_PLATFORM_CLK },
-        { "INT33C4", ACPI_PLATFORM_CLK },
-        { "INT33C5", ACPI_PLATFORM_CLK },
-        { "INT33C6", ACPI_PLATFORM_CLK },
-        { "INT33C7", ACPI_PLATFORM_CLK },
-
         { }
 };
 
-static int acpi_create_platform_clks(struct acpi_device *adev)
-{
-        static struct platform_device *pdev;
-
-        /* Create Lynxpoint LPSS clocks */
-        if (!pdev && !strncmp(acpi_device_hid(adev), "INT33C", 6)) {
-                pdev = platform_device_register_simple("clk-lpt", -1, NULL, 0);
-                if (IS_ERR(pdev))
-                        return PTR_ERR(pdev);
-        }
-
-        return 0;
-}
-
 /**
  * acpi_create_platform_device - Create platform device for ACPI device node
  * @adev: ACPI device node to create a platform device for.
@@ -71,10 +44,9 @@ static int acpi_create_platform_clks(struct acpi_device *adev)
  *
  * Name of the platform device will be the same as @adev's.
  */
-static int acpi_create_platform_device(struct acpi_device *adev,
-                                       const struct acpi_device_id *id)
+int acpi_create_platform_device(struct acpi_device *adev,
+                                const struct acpi_device_id *id)
 {
-        unsigned long flags = id->driver_data;
         struct platform_device *pdev = NULL;
         struct acpi_device *acpi_parent;
         struct platform_device_info pdevinfo;
@@ -83,14 +55,6 @@ static int acpi_create_platform_device(struct acpi_device *adev,
         struct resource *resources;
         int count;
 
-        if (flags & ACPI_PLATFORM_CLK) {
-                int ret = acpi_create_platform_clks(adev);
-                if (ret) {
-                        dev_err(&adev->dev, "failed to create clocks\n");
-                        return ret;
-                }
-        }
-
         /* If the ACPI node already has a physical device attached, skip it. */
         if (adev->physical_node_count)
                 return 0;
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index a1b9bf5085a2..7ddf29eca9f5 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 acpi-y +=               \
         nsaccess.o      \
         nsalloc.o       \
+        nsconvert.o     \
         nsdump.o        \
         nseval.o        \
         nsinit.o        \
@@ -160,6 +161,7 @@ acpi-y +=		\
         utobject.o      \
         utosi.o         \
         utownerid.o     \
+        utpredef.o      \
         utresrc.o       \
         utstate.o       \
         utstring.o      \
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index ecb49927b817..07160928ca25 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -224,6 +224,7 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pending;
  */
 ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock;    /* For GPE data structs and registers */
 ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock;       /* For ACPI H/W except GPE registers */
+ACPI_EXTERN acpi_spinlock acpi_gbl_reference_count_lock;
 
 /* Mutex for _OSI support */
 
@@ -413,10 +414,12 @@ ACPI_EXTERN u8 acpi_gbl_db_output_flags;
 
 #ifdef ACPI_DISASSEMBLER
 
-u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);
 
 ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;
 ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;
+ACPI_EXTERN u8 acpi_gbl_num_external_methods;
+ACPI_EXTERN u32 acpi_gbl_resolved_external_methods;
 ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list;
 ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list;
 #endif
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 805f419086ab..d5bfbd331bfd 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -294,6 +294,8 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
 #define ACPI_BTYPE_OBJECTS_AND_REFS     0x0001FFFF      /* ARG or LOCAL */
 #define ACPI_BTYPE_ALL_OBJECTS          0x0000FFFF
 
+#pragma pack(1)
+
 /*
  * Information structure for ACPI predefined names.
  * Each entry in the table contains the following items:
@@ -304,7 +306,7 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
  */
 struct acpi_name_info {
         char name[ACPI_NAME_SIZE];
-        u8 param_count;
+        u16 argument_list;
         u8 expected_btypes;
 };
 
@@ -327,7 +329,7 @@ struct acpi_package_info {
         u8 count1;
         u8 object_type2;
         u8 count2;
-        u8 reserved;
+        u16 reserved;
 };
 
 /* Used for ACPI_PTYPE2_FIXED */
@@ -336,6 +338,7 @@ struct acpi_package_info2 {
         u8 type;
         u8 count;
         u8 object_type[4];
+        u8 reserved;
 };
 
 /* Used for ACPI_PTYPE1_OPTION */
@@ -345,7 +348,7 @@ struct acpi_package_info3 {
         u8 count;
         u8 object_type[2];
         u8 tail_object_type;
-        u8 reserved;
+        u16 reserved;
 };
 
 union acpi_predefined_info {
@@ -355,6 +358,10 @@ union acpi_predefined_info {
         struct acpi_package_info3 ret_info3;
 };
 
+/* Reset to default packing */
+
+#pragma pack()
+
 /* Data block used during object validation */
 
 struct acpi_predefined_data {
@@ -363,6 +370,7 @@ struct acpi_predefined_data {
         union acpi_operand_object *parent_package;
         struct acpi_namespace_node *node;
         u32 flags;
+        u32 return_btype;
         u8 node_flags;
 };
 
@@ -371,6 +379,20 @@ struct acpi_predefined_data {
 #define ACPI_OBJECT_REPAIRED    1
 #define ACPI_OBJECT_WRAPPED     2
 
+/* Return object auto-repair info */
+
+typedef acpi_status(*acpi_object_converter) (union acpi_operand_object
+                                             *original_object,
+                                             union acpi_operand_object
+                                             **converted_object);
+
+struct acpi_simple_repair_info {
+        char name[ACPI_NAME_SIZE];
+        u32 unexpected_btypes;
+        u32 package_index;
+        acpi_object_converter object_converter;
+};
+
 /*
  * Bitmapped return value types
  * Note: the actual data types must be contiguous, a loop in nspredef.c
@@ -1037,6 +1059,7 @@ struct acpi_external_list {
         u16 length;
         u8 type;
         u8 flags;
+        u8 resolved;
 };
 
 /* Values for Flags field above */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index ed7943b9044f..53666bd9193d 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -322,10 +322,12 @@
  * where a pointer to an object of type union acpi_operand_object can also
  * appear. This macro is used to distinguish them.
  *
- * The "Descriptor" field is the first field in both structures.
+ * The "DescriptorType" field is the second field in both structures.
  */
+#define ACPI_GET_DESCRIPTOR_PTR(d)      (((union acpi_descriptor *)(void *)(d))->common.common_pointer)
+#define ACPI_SET_DESCRIPTOR_PTR(d, p)   (((union acpi_descriptor *)(void *)(d))->common.common_pointer = (p))
 #define ACPI_GET_DESCRIPTOR_TYPE(d)     (((union acpi_descriptor *)(void *)(d))->common.descriptor_type)
-#define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t)
+#define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = (t))
 
 /*
  * Macros for the master AML opcode table
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 02cd5482ff8b..d2e491876bc0 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -167,6 +167,29 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent);
 int acpi_ns_compare_names(char *name1, char *name2);
 
 /*
+ * nsconvert - Dynamic object conversion routines
+ */
+acpi_status
+acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object);
+
+acpi_status
+acpi_ns_convert_to_string(union acpi_operand_object *original_object,
+                          union acpi_operand_object **return_object);
+
+acpi_status
+acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
+                          union acpi_operand_object **return_object);
+
+acpi_status
+acpi_ns_convert_to_unicode(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object);
+
+acpi_status
+acpi_ns_convert_to_resource(union acpi_operand_object *original_object,
+                            union acpi_operand_object **return_object);
+
+/*
  * nsdump - Namespace dump/print utilities
  */
 #ifdef  ACPI_FUTURE_USAGE
@@ -208,10 +231,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
                                acpi_status return_status,
                                union acpi_operand_object **return_object);
 
-const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
-                                                                    acpi_namespace_node
-                                                                    *node);
-
 void
 acpi_ns_check_parameter_count(char *pathname,
                               struct acpi_namespace_node *node,
@@ -289,7 +308,7 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node,
  * predefined methods/objects
  */
 acpi_status
-acpi_ns_repair_object(struct acpi_predefined_data *data,
+acpi_ns_simple_repair(struct acpi_predefined_data *data,
                       u32 expected_btypes,
                       u32 package_index,
                       union acpi_operand_object **return_object_ptr);
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 752cc40cdc1e..b22b70944fd6 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -56,7 +56,7 @@
  *      object type
  *      count
  *
- * ACPI_PTYPE1_VAR: Variable-length length:
+ * ACPI_PTYPE1_VAR: Variable-length length. Zero-length package is allowed:
  *      object type (Int/Buf/Ref)
  *
  * ACPI_PTYPE1_OPTION: Package has some required and some optional elements
@@ -66,14 +66,16 @@
  * 2) PTYPE2 packages contain a Variable-length number of sub-packages. Each
  *    of the different types describe the contents of each of the sub-packages.
  *
- * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types:
+ * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types. Zero-length
+ *      parent package is allowed:
  *      object type
  *      count
  *      object type
  *      count
  *      (Used for _ALR,_MLS,_PSS,_TRT,_TSS)
  *
- * ACPI_PTYPE2_COUNT: Each subpackage has a count as first element:
+ * ACPI_PTYPE2_COUNT: Each subpackage has a count as first element.
+ *      Zero-length parent package is allowed:
  *      object type
  *      (Used for _CSD,_PSD,_TSD)
  *
@@ -84,17 +86,19 @@
  *      count
  *      (Used for _CST)
  *
- * ACPI_PTYPE2_FIXED: Each subpackage is of Fixed-length
+ * ACPI_PTYPE2_FIXED: Each subpackage is of Fixed-length. Zero-length
+ *      parent package is allowed.
  *      (Used for _PRT)
  *
- * ACPI_PTYPE2_MIN: Each subpackage has a Variable-length but minimum length
+ * ACPI_PTYPE2_MIN: Each subpackage has a Variable-length but minimum length.
+ *      Zero-length parent package is allowed:
  *      (Used for _HPX)
  *
  * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
  *      (Used for _ART, _FPS)
  *
  * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements
- *      followed by an optional element
+ *      followed by an optional element. Zero-length parent package is allowed.
  *      object type
  *      count
  *      object type
@@ -116,8 +120,47 @@ enum acpi_return_package_types {
         ACPI_PTYPE2_FIX_VAR = 10
 };
 
+/* Support macros for users of the predefined info table */
+
+#define METHOD_PREDEF_ARGS_MAX          4
+#define METHOD_ARG_BIT_WIDTH            3
+#define METHOD_ARG_MASK                 0x0007
+#define ARG_COUNT_IS_MINIMUM            0x8000
+#define METHOD_MAX_ARG_TYPE             ACPI_TYPE_PACKAGE
+
+#define METHOD_GET_COUNT(arg_list)      (arg_list & METHOD_ARG_MASK)
+#define METHOD_GET_NEXT_ARG(arg_list)   (arg_list >> METHOD_ARG_BIT_WIDTH)
+
+/* Macros used to build the predefined info table */
+
+#define METHOD_0ARGS                    0
+#define METHOD_1ARGS(a1)                (1 | (a1 << 3))
+#define METHOD_2ARGS(a1,a2)             (2 | (a1 << 3) | (a2 << 6))
+#define METHOD_3ARGS(a1,a2,a3)          (3 | (a1 << 3) | (a2 << 6) | (a3 << 9))
+#define METHOD_4ARGS(a1,a2,a3,a4)       (4 | (a1 << 3) | (a2 << 6) | (a3 << 9) | (a4 << 12))
+
+#define METHOD_RETURNS(type)            (type)
+#define METHOD_NO_RETURN_VALUE          0
+
+#define PACKAGE_INFO(a,b,c,d,e,f)       {{{(a),(b),(c),(d)}, ((((u16)(f)) << 8) | (e)), 0}}
+
+/* Support macros for the resource descriptor info table */
+
+#define WIDTH_1                         0x0001
+#define WIDTH_2                         0x0002
+#define WIDTH_3                         0x0004
+#define WIDTH_8                         0x0008
+#define WIDTH_16                        0x0010
+#define WIDTH_32                        0x0020
+#define WIDTH_64                        0x0040
+#define VARIABLE_DATA                   0x0080
+#define NUM_RESOURCE_WIDTHS             8
+
+#define WIDTH_ADDRESS                   WIDTH_16 | WIDTH_32 | WIDTH_64
+
 #ifdef ACPI_CREATE_PREDEFINED_TABLE
-/*
+/******************************************************************************
+ *
  * Predefined method/object information table.
  *
  * These are the names that can actually be evaluated via acpi_evaluate_object.
@@ -125,23 +168,24 @@ enum acpi_return_package_types {
  *
  *      1) Predefined/Reserved names that are never evaluated via
  *         acpi_evaluate_object:
- *          _Lxx and _Exx GPE methods
- *          _Qxx EC methods
- *          _T_x compiler temporary variables
+ *              _Lxx and _Exx GPE methods
+ *              _Qxx EC methods
+ *              _T_x compiler temporary variables
+ *              _Wxx wake events
  *
  *      2) Predefined names that never actually exist within the AML code:
- *          Predefined resource descriptor field names
+ *              Predefined resource descriptor field names
  *
  *      3) Predefined names that are implemented within ACPICA:
- *          _OSI
- *
- *      4) Some predefined names that are not documented within the ACPI spec.
- *          _WDG, _WED
+ *              _OSI
  *
  * The main entries in the table each contain the following items:
  *
  * name                 - The ACPI reserved name
- * param_count          - Number of arguments to the method
+ * argument_list        - Contains (in 16 bits), the number of required
+ *                        arguments to the method (3 bits), and a 3-bit type
+ *                        field for each argument (up to 4 arguments). The
+ *                        METHOD_?ARGS macros generate the correct packed data.
  * expected_btypes      - Allowed type(s) for the return value.
  *                        0 means that no return value is expected.
  *
@@ -151,256 +195,511 @@ enum acpi_return_package_types {
  * overall size of the stored data.
  *
  * Note: The additional braces are intended to promote portability.
- */
-static const union acpi_predefined_info predefined_names[] = {
-        {{"_AC0", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC1", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC2", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC3", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC4", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC5", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC6", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC7", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC8", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AC9", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ADR", 0, ACPI_RTYPE_INTEGER}},
-        {{"_AEI", 0, ACPI_RTYPE_BUFFER}},
-        {{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL3", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL4", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL5", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL6", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL7", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL8", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_AL9", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_ALC", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ALI", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ALP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ALR", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 (Ints) */
-                          {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2,0}, 0,0}},
-
-        {{"_ALT", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ART", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (1 Int(rev), n Pkg (2 Ref/11 Int) */
-        {{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER},
-          11, 0}},
-
-        {{"_BBN", 0, ACPI_RTYPE_INTEGER}},
-        {{"_BCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
-
-        {{"_BCM", 1, 0}},
-        {{"_BCT", 1, ACPI_RTYPE_INTEGER}},
-        {{"_BDN", 0, ACPI_RTYPE_INTEGER}},
-        {{"_BFS", 1, 0}},
-        {{"_BIF", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (9 Int),(4 Str) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9, ACPI_RTYPE_STRING}, 4, 0}},
-
-        {{"_BIX", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (16 Int),(4 Str) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING}, 4,
-          0}},
-
-        {{"_BLT", 3, 0}},
-        {{"_BMA", 1, ACPI_RTYPE_INTEGER}},
-        {{"_BMC", 1, 0}},
-        {{"_BMD", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (5 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
-
-        {{"_BMS", 1, ACPI_RTYPE_INTEGER}},
-        {{"_BQC", 0, ACPI_RTYPE_INTEGER}},
-        {{"_BST", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
-
-        {{"_BTM", 1, ACPI_RTYPE_INTEGER}},
-        {{"_BTP", 1, 0}},
-        {{"_CBA", 0, ACPI_RTYPE_INTEGER}}, /* See PCI firmware spec 3.0 */
-        {{"_CDM", 0, ACPI_RTYPE_INTEGER}},
-        {{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0, 0}, 0,
-          0}},
-
-        {{"_CLS", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
-
-        {{"_CPC", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Ints/Bufs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0,
-          0}},
-
-        {{"_CRS", 0, ACPI_RTYPE_BUFFER}},
-        {{"_CRT", 0, ACPI_RTYPE_INTEGER}},
-        {{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */
-                          {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
-
-        {{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
-        {{{ACPI_PTYPE2_PKG_COUNT, ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,
-          0}},
-
-        {{"_CWS", 1, ACPI_RTYPE_INTEGER}},
-        {{"_DCK", 1, ACPI_RTYPE_INTEGER}},
-        {{"_DCS", 0, ACPI_RTYPE_INTEGER}},
-        {{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
-        {{"_DDN", 0, ACPI_RTYPE_STRING}},
-        {{"_DEP", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
-        {{"_DGS", 0, ACPI_RTYPE_INTEGER}},
-        {{"_DIS", 0, 0}},
-
-        {{"_DLM", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
-        {{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,
-           ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}},
-
-        {{"_DMA", 0, ACPI_RTYPE_BUFFER}},
-        {{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
-
-        {{"_DOS", 1, 0}},
-        {{"_DSM", 4, ACPI_RTYPE_ALL}},     /* Must return a type, but it can be of any type */
-        {{"_DSS", 1, 0}},
-        {{"_DSW", 3, 0}},
-        {{"_DTI", 1, 0}},
-        {{"_EC_", 0, ACPI_RTYPE_INTEGER}},
-        {{"_EDL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs)*/
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_EJ0", 1, 0}},
-        {{"_EJ1", 1, 0}},
-        {{"_EJ2", 1, 0}},
-        {{"_EJ3", 1, 0}},
-        {{"_EJ4", 1, 0}},
-        {{"_EJD", 0, ACPI_RTYPE_STRING}},
-        {{"_EVT", 1, 0}},
-        {{"_FDE", 0, ACPI_RTYPE_BUFFER}},
-        {{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},
-
-        {{"_FDM", 1, 0}},
-        {{"_FIF", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (4 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0}, 0, 0}},
-
-        {{"_FIX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
-
-        {{"_FPS", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (1 Int(rev), n Pkg (5 Int) */
-        {{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 5, 0}, 0, 0}},
-
-        {{"_FSL", 1, 0}},
-        {{"_FST", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},
-
-        {{"_GAI", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GCP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GHL", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GLK", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GPD", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */
-        {{"_GRT", 0, ACPI_RTYPE_BUFFER}},
-        {{"_GSB", 0, ACPI_RTYPE_INTEGER}},
-        {{"_GTF", 0, ACPI_RTYPE_BUFFER}},
-        {{"_GTM", 0, ACPI_RTYPE_BUFFER}},
-        {{"_GTS", 1, 0}},
-        {{"_GWS", 1, ACPI_RTYPE_INTEGER}},
-        {{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
-        {{"_HOT", 0, ACPI_RTYPE_INTEGER}},
-        {{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
+ *
+ * Note2: Table is used by the kernel-resident subsystem, the iASL compiler,
+ * and the acpi_help utility.
+ *
+ * TBD: _PRT - currently ignore reversed entries. Attempt to fix in nsrepair.
+ * Possibly fixing package elements like _BIF, etc.
+ *
+ *****************************************************************************/
+
+const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
+        {{"_AC0", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC1", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC2", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC3", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC4", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC5", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC6", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC7", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC8", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AC9", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ADR", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_AEI", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_AL0", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL1", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL2", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL3", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL4", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL5", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL6", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL7", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL8", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_AL9", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_ALC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ALI", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ALP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ALR", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 2 (Ints) */
+        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),
+
+        {{"_ALT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ART", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (2 Ref/11 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_REFERENCE, 2,
+                     ACPI_RTYPE_INTEGER, 11, 0),
+
+        {{"_BBN", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BCL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
+
+        {{"_BCM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_BCT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BDN", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BFS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_BIF", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (9 Int),(4 Str) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9,
+                     ACPI_RTYPE_STRING, 4, 0),
+
+        {{"_BIX", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int),(4 Str) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,
+                     ACPI_RTYPE_STRING, 4, 0),
+
+        {{"_BLT",
+          METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_BMA", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BMC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_BMD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (5 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
+
+        {{"_BMS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BQC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BST", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
+
+        {{"_BTM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_BTP", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_CBA", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See PCI firmware spec 3.0 */
+
+        {{"_CDM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_CID", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE)}},        /* Variable-length (Ints/Strs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,
+                     0, 0, 0),
+
+        {{"_CLS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0, 0, 0),
+
+        {{"_CPC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints/Bufs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,
+                     0, 0, 0),
+
+        {{"_CRS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_CRT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_CSD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(n), n-1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
+
+        {{"_CST", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2_PKG_COUNT, ACPI_RTYPE_BUFFER, 1,
+                     ACPI_RTYPE_INTEGER, 3, 0),
+
+        {{"_CWS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_DCK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_DCS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_DDC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER)}},
+
+        {{"_DDN", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_STRING)}},
+
+        {{"_DEP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_DGS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_DIS", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_DLM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
+        PACKAGE_INFO(ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,
+                     ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER, 0, 0),
+
+        {{"_DMA", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_DOD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
+
+        {{"_DOS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_DSM",
+          METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
+                       ACPI_TYPE_PACKAGE),
+          METHOD_RETURNS(ACPI_RTYPE_ALL)}},     /* Must return a value, but it can be of any type */
+
+        {{"_DSS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_DSW",
+          METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_DTI", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EC_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_EDL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_EJ0", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EJ1", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EJ2", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EJ3", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EJ4", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_EJD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_STRING)}},
+
+        {{"_ERR",
+          METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_STRING, ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* Internal use only, used by ACPICA test suites */
+
+        {{"_EVT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_FDE", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_FDI", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, 0, 0, 0),
+
+        {{"_FDM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_FIF", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
+
+        {{"_FIX", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
+
+        {{"_FPS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (5 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
+
+        {{"_FSL", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_FST", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0, 0, 0),
+
+        {{"_GAI", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GCP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GHL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GLK", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GPD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GPE", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* _GPE method, not _GPE scope */
+
+        {{"_GRT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_GSB", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_GTF", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_GTM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_GTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_GWS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_HID", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING)}},
+
+        {{"_HOT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_HPP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
 
         /*
-         * For _HPX, a single package is returned, containing a Variable-length number
+         * For _HPX, a single package is returned, containing a variable-length number
          * of sub-packages. Each sub-package contains a PCI record setting.
          * There are several different type of record settings, of different
          * lengths, but all elements of all settings are Integers.
          */
-        {{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */
-                          {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
-
-        {{"_HRV", 0, ACPI_RTYPE_INTEGER}},
-        {{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
-        {{"_INI", 0, 0}},
-        {{"_IRC", 0, 0}},
-        {{"_LCK", 1, 0}},
-        {{"_LID", 0, ACPI_RTYPE_INTEGER}},
-        {{"_MAT", 0, ACPI_RTYPE_BUFFER}},
-        {{"_MBM", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (8 Int) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 8, 0}, 0, 0}},
-
-        {{"_MLS", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Pkgs) each (1 Str/1 Buf) */
-        {{{ACPI_PTYPE2, ACPI_RTYPE_STRING, 1, ACPI_RTYPE_BUFFER}, 1, 0}},
-
-        {{"_MSG", 1, 0}},
-        {{"_MSM", 4, ACPI_RTYPE_INTEGER}},
-        {{"_NTT", 0, ACPI_RTYPE_INTEGER}},
-        {{"_OFF", 0, 0}},
-        {{"_ON_", 0, 0}},
-        {{"_OS_", 0, ACPI_RTYPE_STRING}},
-        {{"_OSC", 4, ACPI_RTYPE_BUFFER}},
-        {{"_OST", 3, 0}},
-        {{"_PAI", 1, ACPI_RTYPE_INTEGER}},
-        {{"_PCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_PCT", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}},
-
-        {{"_PDC", 1, 0}},
-        {{"_PDL", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PIC", 1, 0}},
-        {{"_PIF", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (3 Int),(3 Str) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, ACPI_RTYPE_STRING}, 3, 0}},
-
-        {{"_PLD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Bufs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0,0}, 0,0}},
-
-        {{"_PMC", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (11 Int),(3 Str) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 11, ACPI_RTYPE_STRING}, 3,
-          0}},
-
-        {{"_PMD", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
-        {{"_PMM", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PPC", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PPE", 0, ACPI_RTYPE_INTEGER}}, /* See dig64 spec */
-        {{"_PR0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_PR1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_PR2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_PR3", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
-        {{"_PRE", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
-        {{"_PRL", 0, ACPI_RTYPE_PACKAGE}},      /* Variable-length (Refs) */
-        {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},
-
-        {{"_PRS", 0, ACPI_RTYPE_BUFFER}},
+        {{"_HPX", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (var Ints) */
+        PACKAGE_INFO(ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
+
+        {{"_HRV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_IFT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See IPMI spec */
+
+        {{"_INI", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_IRC", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_LCK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_LID", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_MAT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_MBM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (8 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 8, 0, 0, 0),
+
+        {{"_MLS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (1 Str/1 Buf) */
+        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_STRING, 1, ACPI_RTYPE_BUFFER, 1,
+                     0),
+
+        {{"_MSG", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_MSM",
+          METHOD_4ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
+                       ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_NTT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_OFF", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_ON_", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_OS_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_STRING)}},
+
+        {{"_OSC",
+          METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
+                       ACPI_TYPE_BUFFER),
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_OST",
+          METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_BUFFER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PAI", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PCL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PCT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Buf) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0),
+
+        {{"_PDC", METHOD_1ARGS(ACPI_TYPE_BUFFER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PDL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PIC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PIF", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int),(3 Str) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3,
+                     ACPI_RTYPE_STRING, 3, 0),
+
+        {{"_PLD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Bufs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0, 0, 0, 0),
+
+        {{"_PMC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (11 Int),(3 Str) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 11,
+                     ACPI_RTYPE_STRING, 3, 0),
+
+        {{"_PMD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PMM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PPC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PPE", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See dig64 spec */
+
+        {{"_PR0", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PR1", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PR2", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PR3", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PRE", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PRL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PRS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
         /*
          * For _PRT, many BIOSs reverse the 3rd and 4th Package elements (Source
@@ -410,47 +709,89 @@ static const union acpi_predefined_info predefined_names[] = {
          * warning, add the ACPI_RTYPE_REFERENCE type to the 4th element (index 3)
          * in the statement below.
          */
-        {{"_PRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (4): Int,Int,Int/Ref,Int */
-                          {{{ACPI_PTYPE2_FIXED, 4, ACPI_RTYPE_INTEGER,ACPI_RTYPE_INTEGER},
-                          ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE,
-                          ACPI_RTYPE_INTEGER}},
-
-        {{"_PRW", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each: Pkg/Int,Int,[Variable-length Refs] (Pkg is Ref/Int) */
-                          {{{ACPI_PTYPE1_OPTION, 2, ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE,
-                          ACPI_RTYPE_INTEGER}, ACPI_RTYPE_REFERENCE,0}},
-
-        {{"_PS0", 0, 0}},
-        {{"_PS1", 0, 0}},
-        {{"_PS2", 0, 0}},
-        {{"_PS3", 0, 0}},
-        {{"_PSC", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */
-                          {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}},
-
-        {{"_PSE", 1, 0}},
-        {{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_PSR", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (6 Int) */
-                          {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6,0}, 0,0}},
-
-        {{"_PSV", 0, ACPI_RTYPE_INTEGER}},
-        {{"_PSW", 1, 0}},
-        {{"_PTC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}},
-
-        {{"_PTP", 2, ACPI_RTYPE_INTEGER}},
-        {{"_PTS", 1, 0}},
-        {{"_PUR", 0, ACPI_RTYPE_PACKAGE}},      /* Fixed-length (2 Int) */
-        {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0}, 0, 0}},
-
-        {{"_PXM", 0, ACPI_RTYPE_INTEGER}},
-        {{"_REG", 2, 0}},
-        {{"_REV", 0, ACPI_RTYPE_INTEGER}},
-        {{"_RMV", 0, ACPI_RTYPE_INTEGER}},
-        {{"_ROM", 2, ACPI_RTYPE_BUFFER}},
-        {{"_RTV", 0, ACPI_RTYPE_INTEGER}},
+        {{"_PRT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (4): Int,Int,Int/Ref,Int */
+        PACKAGE_INFO(ACPI_PTYPE2_FIXED, 4, ACPI_RTYPE_INTEGER,
+                     ACPI_RTYPE_INTEGER,
+                     ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE,
+                     ACPI_RTYPE_INTEGER),
+
+        {{"_PRW", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each: Pkg/Int,Int,[Variable-length Refs] (Pkg is Ref/Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_OPTION, 2,
+                     ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE,
+                     ACPI_RTYPE_INTEGER, ACPI_RTYPE_REFERENCE, 0),
+
+        {{"_PS0", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PS1", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PS2", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PS3", METHOD_0ARGS,
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PSC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PSD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (5 Int) with count */
+        PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
+
+        {{"_PSE", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PSL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_PSR", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PSS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (6 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6, 0, 0, 0),
+
+        {{"_PSV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PSW", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PTC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Buf) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0),
+
+        {{"_PTP", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_PTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_PUR", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),
+
+        {{"_PXM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_REG", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_REV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_RMV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_ROM", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_RTV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
 
         /*
          * For _S0_ through _S5_, the ACPI spec defines a return Package
@@ -458,111 +799,285 @@ static const union acpi_predefined_info predefined_names[] = {
          * Allow this by making the objects "Variable-length length", but all elements
          * must be Integers.
          */
-        {{"_S0_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S1_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S2_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S3_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S4_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S5_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
-
-        {{"_S1D", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S2D", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S3D", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S4D", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S0W", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S1W", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S2W", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S3W", 0, ACPI_RTYPE_INTEGER}},
-        {{"_S4W", 0, ACPI_RTYPE_INTEGER}},
-        {{"_SBS", 0, ACPI_RTYPE_INTEGER}},
-        {{"_SCP", 0x13, 0}},               /* Acpi 1.0 allowed 1 arg. Acpi 3.0 expanded to 3 args. Allow both. */
-                           /* Note: the 3-arg definition may be removed for ACPI 4.0 */
-        {{"_SDD", 1, 0}},
-        {{"_SEG", 0, ACPI_RTYPE_INTEGER}},
-        {{"_SHL", 1, ACPI_RTYPE_INTEGER}},
-        {{"_SLI", 0, ACPI_RTYPE_BUFFER}},
-        {{"_SPD", 1, ACPI_RTYPE_INTEGER}},
-        {{"_SRS", 1, 0}},
-        {{"_SRT", 1, ACPI_RTYPE_INTEGER}},
-        {{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */
-        {{"_SST", 1, 0}},
-        {{"_STA", 0, ACPI_RTYPE_INTEGER}},
-        {{"_STM", 3, 0}},
-        {{"_STP", 2, ACPI_RTYPE_INTEGER}},
-        {{"_STR", 0, ACPI_RTYPE_BUFFER}},
-        {{"_STV", 2, ACPI_RTYPE_INTEGER}},
-        {{"_SUB", 0, ACPI_RTYPE_STRING}},
-        {{"_SUN", 0, ACPI_RTYPE_INTEGER}},
-        {{"_SWS", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TC1", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TC2", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TDL", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TIP", 1, ACPI_RTYPE_INTEGER}},
-        {{"_TIV", 1, ACPI_RTYPE_INTEGER}},
-        {{"_TMP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TPC", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TPT", 1, 0}},
-        {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
-                          {{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
-
-        {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int with count */
-                          {{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
-
-        {{"_TSP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int */
-                          {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
-
-        {{"_TST", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TTS", 1, 0}},
-        {{"_TZD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
-                          {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
-
-        {{"_TZM", 0, ACPI_RTYPE_REFERENCE}},
-        {{"_TZP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_UID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
-        {{"_UPC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
-
-        {{"_UPD", 0, ACPI_RTYPE_INTEGER}},
-        {{"_UPP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_VPO", 0, ACPI_RTYPE_INTEGER}},
+        {{"_S0_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S1_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S2_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S3_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S4_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S5_", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
+
+        {{"_S1D", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S2D", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S3D", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S4D", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S0W", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S1W", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S2W", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S3W", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_S4W", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SBS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SCP", METHOD_1ARGS(ACPI_TYPE_INTEGER) | ARG_COUNT_IS_MINIMUM,
+          METHOD_NO_RETURN_VALUE}},     /* Acpi 1.0 allowed 1 integer arg. Acpi 3.0 expanded to 3 args. Allow both. */
+
+        {{"_SDD", METHOD_1ARGS(ACPI_TYPE_BUFFER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_SEG", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SHL", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SLI", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_SPD", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SRS", METHOD_1ARGS(ACPI_TYPE_BUFFER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_SRT", METHOD_1ARGS(ACPI_TYPE_BUFFER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SRV", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See IPMI spec */
+
+        {{"_SST", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_STA", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_STM",
+          METHOD_3ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_BUFFER, ACPI_TYPE_BUFFER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_STP", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_STR", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_STV", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SUB", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_STRING)}},
+
+        {{"_SUN", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_SWS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TC1", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TC2", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TDL", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TIP", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TIV", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TMP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TPC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TPT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_TRT", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
+        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER,
+                     6, 0),
+
+        {{"_TSD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 5 Int with count */
+        PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
+
+        {{"_TSP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TSS", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 5 Int */
+        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
+
+        {{"_TST", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_TTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_NO_RETURN_VALUE}},
+
+        {{"_TZD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
+        PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
+
+        {{"_TZM", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_REFERENCE)}},
+
+        {{"_TZP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_UID", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING)}},
+
+        {{"_UPC", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
+
+        {{"_UPD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_UPP", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
+
+        {{"_VPO", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
 
         /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
 
-        {{"_WAK", 1,
-          ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
-                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */
+        {{"_WAK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER |
+                         ACPI_RTYPE_PACKAGE)}},
+        PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),        /* Fixed-length (2 Int), but is optional */
 
         /* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
 
-        {{"_WDG", 0, ACPI_RTYPE_BUFFER}},
-        {{"_WED", 1,
-          ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER}},
+        {{"_WDG", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
+
+        {{"_WED", METHOD_1ARGS(ACPI_TYPE_INTEGER),
+          METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING |
+                         ACPI_RTYPE_BUFFER)}},
 
-        {{{0, 0, 0, 0}, 0, 0}}  /* Table terminator */
+        PACKAGE_INFO(0, 0, 0, 0, 0, 0)  /* Table terminator */
 };
+#else
+extern const union acpi_predefined_info acpi_gbl_predefined_methods[];
+#endif
 
-#if 0
+#if (defined ACPI_CREATE_RESOURCE_TABLE && defined ACPI_APPLICATION)
+/******************************************************************************
+ *
+ * Predefined names for use in Resource Descriptors. These names do not
+ * appear in the global Predefined Name table (since these names never
+ * appear in actual AML byte code, only in the original ASL)
+ *
+ * Note: Used by iASL compiler and acpi_help utility only.
+ *
+ *****************************************************************************/
 
-        /* This is an internally implemented control method, no need to check */
-{ {
-"_OSI", 1, ACPI_RTYPE_INTEGER}},
+const union acpi_predefined_info acpi_gbl_resource_names[] = {
+        {{"_ADR", WIDTH_16 | WIDTH_64, 0}},
+        {{"_ALN", WIDTH_8 | WIDTH_16 | WIDTH_32, 0}},
+        {{"_ASI", WIDTH_8, 0}},
+        {{"_ASZ", WIDTH_8, 0}},
+        {{"_ATT", WIDTH_64, 0}},
+        {{"_BAS", WIDTH_16 | WIDTH_32, 0}},
+        {{"_BM_", WIDTH_1, 0}},
+        {{"_DBT", WIDTH_16, 0}},        /* Acpi 5.0 */
+        {{"_DEC", WIDTH_1, 0}},
+        {{"_DMA", WIDTH_8, 0}},
+        {{"_DPL", WIDTH_1, 0}}, /* Acpi 5.0 */
+        {{"_DRS", WIDTH_16, 0}},        /* Acpi 5.0 */
+        {{"_END", WIDTH_1, 0}}, /* Acpi 5.0 */
+        {{"_FLC", WIDTH_2, 0}}, /* Acpi 5.0 */
+        {{"_GRA", WIDTH_ADDRESS, 0}},
+        {{"_HE_", WIDTH_1, 0}},
+        {{"_INT", WIDTH_16 | WIDTH_32, 0}},
+        {{"_IOR", WIDTH_2, 0}}, /* Acpi 5.0 */
+        {{"_LEN", WIDTH_8 | WIDTH_ADDRESS, 0}},
+        {{"_LIN", WIDTH_8, 0}}, /* Acpi 5.0 */
+        {{"_LL_", WIDTH_1, 0}},
+        {{"_MAF", WIDTH_1, 0}},
+        {{"_MAX", WIDTH_ADDRESS, 0}},
+        {{"_MEM", WIDTH_2, 0}},
+        {{"_MIF", WIDTH_1, 0}},
+        {{"_MIN", WIDTH_ADDRESS, 0}},
+        {{"_MOD", WIDTH_1, 0}}, /* Acpi 5.0 */
+        {{"_MTP", WIDTH_2, 0}},
+        {{"_PAR", WIDTH_8, 0}}, /* Acpi 5.0 */
+        {{"_PHA", WIDTH_1, 0}}, /* Acpi 5.0 */
+        {{"_PIN", WIDTH_16, 0}},        /* Acpi 5.0 */
+        {{"_PPI", WIDTH_8, 0}}, /* Acpi 5.0 */
+        {{"_POL", WIDTH_1 | WIDTH_2, 0}},       /* Acpi 5.0 */
+        {{"_RBO", WIDTH_8, 0}},
+        {{"_RBW", WIDTH_8, 0}},
+        {{"_RNG", WIDTH_1, 0}},
+        {{"_RT_", WIDTH_8, 0}}, /* Acpi 3.0 */
+        {{"_RW_", WIDTH_1, 0}},
+        {{"_RXL", WIDTH_16, 0}},        /* Acpi 5.0 */
+        {{"_SHR", WIDTH_2, 0}},
+        {{"_SIZ", WIDTH_2, 0}},
+        {{"_SLV", WIDTH_1, 0}}, /* Acpi 5.0 */
+        {{"_SPE", WIDTH_32, 0}},        /* Acpi 5.0 */
+        {{"_STB", WIDTH_2, 0}}, /* Acpi 5.0 */
+        {{"_TRA", WIDTH_ADDRESS, 0}},
+        {{"_TRS", WIDTH_1, 0}},
+        {{"_TSF", WIDTH_8, 0}}, /* Acpi 3.0 */
+        {{"_TTP", WIDTH_1, 0}},
+        {{"_TXL", WIDTH_16, 0}},        /* Acpi 5.0 */
+        {{"_TYP", WIDTH_2 | WIDTH_16, 0}},
+        {{"_VEN", VARIABLE_DATA, 0}},   /* Acpi 5.0 */
+        PACKAGE_INFO(0, 0, 0, 0, 0, 0)  /* Table terminator */
+};
 
-        /* TBD: */
-        _PRT - currently ignore reversed entries. attempt to fix here?
-        think about possibly fixing package elements like _BIF, etc.
+static const union acpi_predefined_info acpi_gbl_scope_names[] = {
+        {{"_GPE", 0, 0}},
+        {{"_PR_", 0, 0}},
+        {{"_SB_", 0, 0}},
+        {{"_SI_", 0, 0}},
+        {{"_TZ_", 0, 0}},
+        PACKAGE_INFO(0, 0, 0, 0, 0, 0)  /* Table terminator */
+};
+#else
+extern const union acpi_predefined_info acpi_gbl_resource_names[];
 #endif
 
 #endif
-#endif
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 0082fa0a6139..202f4f12d3e2 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -113,9 +113,10 @@ struct acpi_pkg_info {
         u32 num_packages;
 };
 
+/* Object reference counts */
+
 #define REF_INCREMENT       (u16) 0
 #define REF_DECREMENT       (u16) 1
-#define REF_FORCE_DELETE    (u16) 2
 
 /* acpi_ut_dump_buffer */
 
@@ -421,7 +422,7 @@ acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size * obj_length);
  */
 acpi_status acpi_ut_initialize_interfaces(void);
 
-void acpi_ut_interface_terminate(void);
+acpi_status acpi_ut_interface_terminate(void);
 
 acpi_status acpi_ut_install_interface(acpi_string interface_name);
 
@@ -432,6 +433,26 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name);
 acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state);
 
 /*
+ * utpredef - support for predefined names
+ */
+const union acpi_predefined_info *acpi_ut_get_next_predefined_method(const union
+                                                                     acpi_predefined_info
+                                                                     *this_name);
+
+const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name);
+
+const union acpi_predefined_info *acpi_ut_match_resource_name(char *name);
+
+void
+acpi_ut_display_predefined_method(char *buffer,
+                                  const union acpi_predefined_info *this_name,
+                                  u8 multi_line);
+
+void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes);
+
+u32 acpi_ut_get_resource_bit_width(char *buffer, u16 types);
+
+/*
  * utstate - Generic state creation/cache routines
  */
 void
@@ -483,7 +504,8 @@ acpi_ut_short_divide(u64 in_dividend,
 /*
  * utmisc
  */
-const char *acpi_ut_validate_exception(acpi_status status);
+const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status
+                                                             status);
 
 u8 acpi_ut_is_pci_root_bridge(char *id);
 
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 4d8c992a51d8..99778997c35a 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -178,7 +178,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 
         if (!op) {
                 ACPI_ERROR((AE_INFO, "Null Op"));
-                return_VALUE(TRUE);
+                return_UINT8(TRUE);
         }
 
         /*
@@ -210,7 +210,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                                   "At Method level, result of [%s] not used\n",
                                   acpi_ps_get_opcode_name(op->common.
                                                           aml_opcode)));
-                return_VALUE(FALSE);
+                return_UINT8(FALSE);
         }
 
         /* Get info on the parent. The root_op is AML_SCOPE */
@@ -219,7 +219,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
             acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
         if (parent_info->class == AML_CLASS_UNKNOWN) {
                 ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));
-                return_VALUE(FALSE);
+                return_UINT8(FALSE);
         }
 
         /*
@@ -307,7 +307,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                           acpi_ps_get_opcode_name(op->common.parent->common.
                                                   aml_opcode), op));
 
-        return_VALUE(TRUE);
+        return_UINT8(TRUE);
 
       result_not_used:
         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
@@ -316,7 +316,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                           acpi_ps_get_opcode_name(op->common.parent->common.
                                                   aml_opcode), op));
 
-        return_VALUE(FALSE);
+        return_UINT8(FALSE);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 44f8325c2bae..e2199a947470 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -693,7 +693,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                 default:
 
                         ACPI_ERROR((AE_INFO,
-                                    "Unimplemented opcode, class=0x%X type=0x%X Opcode=-0x%X Op=%p",
+                                    "Unimplemented opcode, class=0x%X type=0x%X Opcode=0x%X Op=%p",
                                     op_class, op_type, op->common.aml_opcode,
                                     op));
 
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index b8ea0b26cde3..83cd45f4a870 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -257,6 +257,8 @@ u32 acpi_ev_fixed_event_detect(void)
  *
  * DESCRIPTION: Clears the status bit for the requested event, calls the
  *              handler that previously registered for the event.
+ *              NOTE: If there is no handler for the event, the event is
+ *              disabled to prevent further interrupts.
  *
  ******************************************************************************/
 
@@ -271,17 +273,17 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
                                       status_register_id, ACPI_CLEAR_STATUS);
 
         /*
-         * Make sure we've got a handler. If not, report an error. The event is
-         * disabled to prevent further interrupts.
+         * Make sure that a handler exists. If not, report an error
+         * and disable the event to prevent further interrupts.
          */
-        if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
+        if (!acpi_gbl_fixed_event_handlers[event].handler) {
                 (void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
                                               enable_register_id,
                                               ACPI_DISABLE_EVENT);
 
                 ACPI_ERROR((AE_INFO,
-                            "No installed handler for fixed event [0x%08X]",
-                            event));
+                            "No installed handler for fixed event - %s (%u), disabling",
+                            acpi_ut_get_event_name(event), event));
 
                 return (ACPI_INTERRUPT_NOT_HANDLED);
         }
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index b9adb9a7ed85..a493b528f8f9 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -707,7 +707,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Unable to clear GPE%02X", gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
 
@@ -724,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Unable to disable GPE%02X", gpe_number));
-                return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
         }
 
         /*
@@ -784,7 +784,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                 break;
         }
 
-        return_VALUE(ACPI_INTERRUPT_HANDLED);
+        return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
 
 #endif                          /* !ACPI_REDUCED_HARDWARE */
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index f4b43bede015..b905acf7aacd 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -89,7 +89,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
          */
         interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
 
-        return_VALUE(interrupt_handled);
+        return_UINT32(interrupt_handled);
 }
 
 /*******************************************************************************
@@ -120,7 +120,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
 
         interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
 
-        return_VALUE(interrupt_handled);
+        return_UINT32(interrupt_handled);
 }
 
 /******************************************************************************
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index ddffd6847914..ca5fba99c33b 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -467,9 +467,9 @@ acpi_install_fixed_event_handler(u32 event,
                 return_ACPI_STATUS(status);
         }
 
-        /* Don't allow two handlers. */
+        /* Do not allow multiple handlers */
 
-        if (NULL != acpi_gbl_fixed_event_handlers[event].handler) {
+        if (acpi_gbl_fixed_event_handlers[event].handler) {
                 status = AE_ALREADY_EXISTS;
                 goto cleanup;
         }
@@ -483,8 +483,9 @@ acpi_install_fixed_event_handler(u32 event,
         if (ACPI_SUCCESS(status))
                 status = acpi_enable_event(event, 0);
         if (ACPI_FAILURE(status)) {
-                ACPI_WARNING((AE_INFO, "Could not enable fixed event 0x%X",
-                              event));
+                ACPI_WARNING((AE_INFO,
+                              "Could not enable fixed event - %s (%u)",
+                              acpi_ut_get_event_name(event), event));
 
                 /* Remove the handler */
 
@@ -492,7 +493,8 @@ acpi_install_fixed_event_handler(u32 event,
                 acpi_gbl_fixed_event_handlers[event].context = NULL;
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Enabled fixed event %X, Handler=%p\n", event,
+                                  "Enabled fixed event %s (%X), Handler=%p\n",
+                                  acpi_ut_get_event_name(event), event,
                                   handler));
         }
 
@@ -544,11 +546,12 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
 
         if (ACPI_FAILURE(status)) {
                 ACPI_WARNING((AE_INFO,
-                              "Could not write to fixed event enable register 0x%X",
-                              event));
+                              "Could not disable fixed event - %s (%u)",
+                              acpi_ut_get_event_name(event), event));
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
-                                  event));
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Disabled fixed event - %s (%X)\n",
+                                  acpi_ut_get_event_name(event), event));
         }
 
         (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index d6e4e42316db..7039606a0ba8 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -74,6 +74,12 @@ acpi_status acpi_enable(void)
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
+        /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /* Check current mode */
 
         if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
@@ -126,6 +132,12 @@ acpi_status acpi_disable(void)
 
         ACPI_FUNCTION_TRACE(acpi_disable);
 
+        /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                                   "System is already in legacy (non-ACPI) mode\n"));
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index e491e46f17df..b0838a4ea53e 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -257,7 +257,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
         union acpi_operand_object *return_desc = NULL;
         u64 index;
         acpi_status status = AE_OK;
-        acpi_size length;
+        acpi_size length = 0;
 
         ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R,
                                 acpi_ps_get_opcode_name(walk_state->opcode));
@@ -320,7 +320,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                  * NOTE: A length of zero is ok, and will create a zero-length, null
                  *       terminated string.
                  */
-                length = 0;
                 while ((length < operand[0]->buffer.length) &&
                        (length < operand[1]->integer.value) &&
                        (operand[0]->buffer.pointer[length])) {
@@ -376,6 +375,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 case ACPI_TYPE_STRING:
 
                         if (index >= operand[0]->string.length) {
+                                length = operand[0]->string.length;
                                 status = AE_AML_STRING_LIMIT;
                         }
 
@@ -386,6 +386,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 case ACPI_TYPE_BUFFER:
 
                         if (index >= operand[0]->buffer.length) {
+                                length = operand[0]->buffer.length;
                                 status = AE_AML_BUFFER_LIMIT;
                         }
 
@@ -396,6 +397,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 case ACPI_TYPE_PACKAGE:
 
                         if (index >= operand[0]->package.count) {
+                                length = operand[0]->package.count;
                                 status = AE_AML_PACKAGE_LIMIT;
                         }
 
@@ -414,8 +416,9 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Index (0x%8.8X%8.8X) is beyond end of object",
-                                        ACPI_FORMAT_UINT64(index)));
+                                        "Index (0x%X%8.8X) is beyond end of object (length 0x%X)",
+                                        ACPI_FORMAT_UINT64(index),
+                                        (u32)length));
                         goto cleanup;
                 }
 
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index d6eab81f54fb..6b728aef2dca 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -276,7 +276,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
                 /* Invalid field access type */
 
                 ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access));
-                return_VALUE(0);
+                return_UINT32(0);
         }
 
         if (obj_desc->common.type == ACPI_TYPE_BUFFER_FIELD) {
@@ -289,7 +289,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
         }
 
         *return_byte_alignment = byte_alignment;
-        return_VALUE(bit_length);
+        return_UINT32(bit_length);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index b205cbb4b50c..99dc7b287d55 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -340,7 +340,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base)
         /* u64 is unsigned, so we don't worry about a '-' prefix */
 
         if (value == 0) {
-                return_VALUE(1);
+                return_UINT32(1);
         }
 
         current_value = value;
@@ -354,7 +354,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base)
                 num_digits++;
         }
 
-        return_VALUE(num_digits);
+        return_UINT32(num_digits);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index deb3f61e2bd1..579c3a53ac87 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -66,6 +66,12 @@ acpi_status acpi_hw_set_mode(u32 mode)
 
         ACPI_FUNCTION_TRACE(hw_set_mode);
 
+        /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /*
          * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
          * system does not support mode transition.
@@ -146,23 +152,29 @@ u32 acpi_hw_get_mode(void)
 
         ACPI_FUNCTION_TRACE(hw_get_mode);
 
+        /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+        if (acpi_gbl_reduced_hardware) {
+                return_UINT32(ACPI_SYS_MODE_ACPI);
+        }
+
         /*
          * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
          * system does not support mode transition.
          */
         if (!acpi_gbl_FADT.smi_command) {
-                return_VALUE(ACPI_SYS_MODE_ACPI);
+                return_UINT32(ACPI_SYS_MODE_ACPI);
         }
 
         status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
         if (ACPI_FAILURE(status)) {
-                return_VALUE(ACPI_SYS_MODE_LEGACY);
+                return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
 
         if (value) {
-                return_VALUE(ACPI_SYS_MODE_ACPI);
+                return_UINT32(ACPI_SYS_MODE_ACPI);
         } else {
-                return_VALUE(ACPI_SYS_MODE_LEGACY);
+                return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
 }
 
diff --git a/drivers/acpi/acpica/nsconvert.c b/drivers/acpi/acpica/nsconvert.c
new file mode 100644
index 000000000000..8f79a9d2d50e
--- /dev/null
+++ b/drivers/acpi/acpica/nsconvert.c
@@ -0,0 +1,443 @@
+/******************************************************************************
+ *
+ * Module Name: nsconvert - Object conversions for objects returned by
+ *                          predefined methods
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acinterp.h"
+#include "acpredef.h"
+#include "amlresrc.h"
+
+#define _COMPONENT          ACPI_NAMESPACE
+ACPI_MODULE_NAME("nsconvert")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_convert_to_integer
+ *
+ * PARAMETERS:  original_object     - Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful.
+ *
+ * DESCRIPTION: Attempt to convert a String/Buffer object to an Integer.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        acpi_status status;
+        u64 value = 0;
+        u32 i;
+
+        switch (original_object->common.type) {
+        case ACPI_TYPE_STRING:
+
+                /* String-to-Integer conversion */
+
+                status = acpi_ut_strtoul64(original_object->string.pointer,
+                                           ACPI_ANY_BASE, &value);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+                break;
+
+        case ACPI_TYPE_BUFFER:
+
+                /* Buffer-to-Integer conversion. Max buffer size is 64 bits. */
+
+                if (original_object->buffer.length > 8) {
+                        return (AE_AML_OPERAND_TYPE);
+                }
+
+                /* Extract each buffer byte to create the integer */
+
+                for (i = 0; i < original_object->buffer.length; i++) {
+                        value |=
+                            ((u64)original_object->buffer.
+                             pointer[i] << (i * 8));
+                }
+                break;
+
+        default:
+                return (AE_AML_OPERAND_TYPE);
+        }
+
+        new_object = acpi_ut_create_integer_object(value);
+        if (!new_object) {
+                return (AE_NO_MEMORY);
+        }
+
+        *return_object = new_object;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_convert_to_string
+ *
+ * PARAMETERS:  original_object     - Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful.
+ *
+ * DESCRIPTION: Attempt to convert a Integer/Buffer object to a String.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ns_convert_to_string(union acpi_operand_object *original_object,
+                          union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        acpi_size length;
+        acpi_status status;
+
+        switch (original_object->common.type) {
+        case ACPI_TYPE_INTEGER:
+                /*
+                 * Integer-to-String conversion. Commonly, convert
+                 * an integer of value 0 to a NULL string. The last element of
+                 * _BIF and _BIX packages occasionally need this fix.
+                 */
+                if (original_object->integer.value == 0) {
+
+                        /* Allocate a new NULL string object */
+
+                        new_object = acpi_ut_create_string_object(0);
+                        if (!new_object) {
+                                return (AE_NO_MEMORY);
+                        }
+                } else {
+                        status =
+                            acpi_ex_convert_to_string(original_object,
+                                                      &new_object,
+                                                      ACPI_IMPLICIT_CONVERT_HEX);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+                }
+                break;
+
+        case ACPI_TYPE_BUFFER:
+                /*
+                 * Buffer-to-String conversion. Use a to_string
+                 * conversion, no transform performed on the buffer data. The best
+                 * example of this is the _BIF method, where the string data from
+                 * the battery is often (incorrectly) returned as buffer object(s).
+                 */
+                length = 0;
+                while ((length < original_object->buffer.length) &&
+                       (original_object->buffer.pointer[length])) {
+                        length++;
+                }
+
+                /* Allocate a new string object */
+
+                new_object = acpi_ut_create_string_object(length);
+                if (!new_object) {
+                        return (AE_NO_MEMORY);
+                }
+
+                /*
+                 * Copy the raw buffer data with no transform. String is already NULL
+                 * terminated at Length+1.
+                 */
+                ACPI_MEMCPY(new_object->string.pointer,
+                            original_object->buffer.pointer, length);
+                break;
+
+        default:
+                return (AE_AML_OPERAND_TYPE);
+        }
+
+        *return_object = new_object;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_convert_to_buffer
+ *
+ * PARAMETERS:  original_object     - Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful.
+ *
+ * DESCRIPTION: Attempt to convert a Integer/String/Package object to a Buffer.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
+                          union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        acpi_status status;
+        union acpi_operand_object **elements;
+        u32 *dword_buffer;
+        u32 count;
+        u32 i;
+
+        switch (original_object->common.type) {
+        case ACPI_TYPE_INTEGER:
+                /*
+                 * Integer-to-Buffer conversion.
+                 * Convert the Integer to a packed-byte buffer. _MAT and other
+                 * objects need this sometimes, if a read has been performed on a
+                 * Field object that is less than or equal to the global integer
+                 * size (32 or 64 bits).
+                 */
+                status =
+                    acpi_ex_convert_to_buffer(original_object, &new_object);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+                break;
+
+        case ACPI_TYPE_STRING:
+
+                /* String-to-Buffer conversion. Simple data copy */
+
+                new_object =
+                    acpi_ut_create_buffer_object(original_object->string.
+                                                 length);
+                if (!new_object) {
+                        return (AE_NO_MEMORY);
+                }
+
+                ACPI_MEMCPY(new_object->buffer.pointer,
+                            original_object->string.pointer,
+                            original_object->string.length);
+                break;
+
+        case ACPI_TYPE_PACKAGE:
+                /*
+                 * This case is often seen for predefined names that must return a
+                 * Buffer object with multiple DWORD integers within. For example,
+                 * _FDE and _GTM. The Package can be converted to a Buffer.
+                 */
+
+                /* All elements of the Package must be integers */
+
+                elements = original_object->package.elements;
+                count = original_object->package.count;
+
+                for (i = 0; i < count; i++) {
+                        if ((!*elements) ||
+                            ((*elements)->common.type != ACPI_TYPE_INTEGER)) {
+                                return (AE_AML_OPERAND_TYPE);
+                        }
+                        elements++;
+                }
+
+                /* Create the new buffer object to replace the Package */
+
+                new_object = acpi_ut_create_buffer_object(ACPI_MUL_4(count));
+                if (!new_object) {
+                        return (AE_NO_MEMORY);
+                }
+
+                /* Copy the package elements (integers) to the buffer as DWORDs */
+
+                elements = original_object->package.elements;
+                dword_buffer = ACPI_CAST_PTR(u32, new_object->buffer.pointer);
+
+                for (i = 0; i < count; i++) {
+                        *dword_buffer = (u32)(*elements)->integer.value;
+                        dword_buffer++;
+                        elements++;
+                }
+                break;
+
+        default:
+                return (AE_AML_OPERAND_TYPE);
+        }
+
+        *return_object = new_object;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_convert_to_unicode
+ *
+ * PARAMETERS:  original_object     - ASCII String Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful.
+ *
+ * DESCRIPTION: Attempt to convert a String object to a Unicode string Buffer.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ns_convert_to_unicode(union acpi_operand_object *original_object,
+                           union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        char *ascii_string;
+        u16 *unicode_buffer;
+        u32 unicode_length;
+        u32 i;
+
+        if (!original_object) {
+                return (AE_OK);
+        }
+
+        /* If a Buffer was returned, it must be at least two bytes long */
+
+        if (original_object->common.type == ACPI_TYPE_BUFFER) {
+                if (original_object->buffer.length < 2) {
+                        return (AE_AML_OPERAND_VALUE);
+                }
+
+                *return_object = NULL;
+                return (AE_OK);
+        }
+
+        /*
+         * The original object is an ASCII string. Convert this string to
+         * a unicode buffer.
+         */
+        ascii_string = original_object->string.pointer;
+        unicode_length = (original_object->string.length * 2) + 2;
+
+        /* Create a new buffer object for the Unicode data */
+
+        new_object = acpi_ut_create_buffer_object(unicode_length);
+        if (!new_object) {
+                return (AE_NO_MEMORY);
+        }
+
+        unicode_buffer = ACPI_CAST_PTR(u16, new_object->buffer.pointer);
+
+        /* Convert ASCII to Unicode */
+
+        for (i = 0; i < original_object->string.length; i++) {
+                unicode_buffer[i] = (u16)ascii_string[i];
+        }
+
+        *return_object = new_object;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_convert_to_resource
+ *
+ * PARAMETERS:  original_object     - Object to be converted
+ *              return_object       - Where the new converted object is returned
+ *
+ * RETURN:      Status. AE_OK if conversion was successful
+ *
+ * DESCRIPTION: Attempt to convert a Integer object to a resource_template
+ *              Buffer.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ns_convert_to_resource(union acpi_operand_object *original_object,
+                            union acpi_operand_object **return_object)
+{
+        union acpi_operand_object *new_object;
+        u8 *buffer;
+
+        /*
+         * We can fix the following cases for an expected resource template:
+         * 1. No return value (interpreter slack mode is disabled)
+         * 2. A "Return (Zero)" statement
+         * 3. A "Return empty buffer" statement
+         *
+         * We will return a buffer containing a single end_tag
+         * resource descriptor.
+         */
+        if (original_object) {
+                switch (original_object->common.type) {
+                case ACPI_TYPE_INTEGER:
+
+                        /* We can only repair an Integer==0 */
+
+                        if (original_object->integer.value) {
+                                return (AE_AML_OPERAND_TYPE);
+                        }
+                        break;
+
+                case ACPI_TYPE_BUFFER:
+
+                        if (original_object->buffer.length) {
+
+                                /* Additional checks can be added in the future */
+
+                                *return_object = NULL;
+                                return (AE_OK);
+                        }
+                        break;
+
+                case ACPI_TYPE_STRING:
+                default:
+
+                        return (AE_AML_OPERAND_TYPE);
+                }
+        }
+
+        /* Create the new buffer object for the resource descriptor */
+
+        new_object = acpi_ut_create_buffer_object(2);
+        if (!new_object) {
+                return (AE_NO_MEMORY);
+        }
+
+        buffer = ACPI_CAST_PTR(u8, new_object->buffer.pointer);
+
+        /* Initialize the Buffer with a single end_tag descriptor */
+
+        buffer[0] = (ACPI_RESOURCE_NAME_END_TAG | ASL_RDESC_END_TAG_SIZE);
+        buffer[1] = 0x00;
+
+        *return_object = new_object;
+        return (AE_OK);
+}
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 1538f3eb2a8f..b61db69d5675 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -98,17 +98,21 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
         info->return_object = NULL;
         info->param_count = 0;
 
-        /*
-         * Get the actual namespace node for the target object. Handles these cases:
-         *
-         * 1) Null node, Pathname (absolute path)
-         * 2) Node, Pathname (path relative to Node)
-         * 3) Node, Null Pathname
-         */
-        status = acpi_ns_get_node(info->prefix_node, info->pathname,
-                                  ACPI_NS_NO_UPSEARCH, &info->resolved_node);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+        if (!info->resolved_node) {
+                /*
+                 * Get the actual namespace node for the target object if we need to.
+                 * Handles these cases:
+                 *
+                 * 1) Null node, Pathname (absolute path)
+                 * 2) Node, Pathname (path relative to Node)
+                 * 3) Node, Null Pathname
+                 */
+                status = acpi_ns_get_node(info->prefix_node, info->pathname,
+                                          ACPI_NS_NO_UPSEARCH,
+                                          &info->resolved_node);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
         }
 
         /*
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 224c30053401..8a52916148cb 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -76,19 +76,7 @@ static acpi_status
 acpi_ns_check_reference(struct acpi_predefined_data *data,
                         union acpi_operand_object *return_object);
 
-static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes);
-
-/*
- * Names for the types that can be returned by the predefined objects.
- * Used for warning messages. Must be in the same order as the ACPI_RTYPEs
- */
-static const char *acpi_rtype_names[] = {
-        "/Integer",
-        "/String",
-        "/Buffer",
-        "/Package",
-        "/Reference",
-};
+static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object);
 
 /*******************************************************************************
  *
@@ -112,7 +100,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
                                acpi_status return_status,
                                union acpi_operand_object **return_object_ptr)
 {
-        union acpi_operand_object *return_object = *return_object_ptr;
         acpi_status status = AE_OK;
         const union acpi_predefined_info *predefined;
         char *pathname;
@@ -120,7 +107,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
 
         /* Match the name for this method/object against the predefined list */
 
-        predefined = acpi_ns_check_for_predefined_name(node);
+        predefined = acpi_ut_match_predefined_method(node->name.ascii);
 
         /* Get the full pathname to the object, for use in warning messages */
 
@@ -152,25 +139,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
         }
 
         /*
-         * If there is no return value, check if we require a return value for
-         * this predefined name. Either one return value is expected, or none,
-         * for both methods and other objects.
-         *
-         * Exit now if there is no return object. Warning if one was expected.
-         */
-        if (!return_object) {
-                if ((predefined->info.expected_btypes) &&
-                    (!(predefined->info.expected_btypes & ACPI_RTYPE_NONE))) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
-                                              ACPI_WARN_ALWAYS,
-                                              "Missing expected return value"));
-
-                        status = AE_AML_NO_RETURN_VALUE;
-                }
-                goto cleanup;
-        }
-
-        /*
          * Return value validation and possible repair.
          *
          * 1) Don't perform return value validation/repair if this feature
@@ -310,8 +278,10 @@ acpi_ns_check_parameter_count(char *pathname,
          * Validate the user-supplied parameter count.
          * Allow two different legal argument counts (_SCP, etc.)
          */
-        required_params_current = predefined->info.param_count & 0x0F;
-        required_params_old = predefined->info.param_count >> 4;
+        required_params_current =
+            predefined->info.argument_list & METHOD_ARG_MASK;
+        required_params_old =
+            predefined->info.argument_list >> METHOD_ARG_BIT_WIDTH;
 
         if (user_param_count != ACPI_UINT32_MAX) {
                 if ((user_param_count != required_params_current) &&
@@ -340,52 +310,6 @@ acpi_ns_check_parameter_count(char *pathname,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_check_for_predefined_name
- *
- * PARAMETERS:  node            - Namespace node for the method/object
- *
- * RETURN:      Pointer to entry in predefined table. NULL indicates not found.
- *
- * DESCRIPTION: Check an object name against the predefined object list.
- *
- ******************************************************************************/
-
-const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
-                                                                    acpi_namespace_node
-                                                                    *node)
-{
-        const union acpi_predefined_info *this_name;
-
-        /* Quick check for a predefined name, first character must be underscore */
-
-        if (node->name.ascii[0] != '_') {
-                return (NULL);
-        }
-
-        /* Search info table for a predefined method/object name */
-
-        this_name = predefined_names;
-        while (this_name->info.name[0]) {
-                if (ACPI_COMPARE_NAME(node->name.ascii, this_name->info.name)) {
-                        return (this_name);
-                }
-
-                /*
-                 * Skip next entry in the table if this name returns a Package
-                 * (next entry contains the package info)
-                 */
-                if (this_name->info.expected_btypes & ACPI_RTYPE_PACKAGE) {
-                        this_name++;
-                }
-
-                this_name++;
-        }
-
-        return (NULL);          /* Not found */
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ns_check_object_type
  *
  * PARAMETERS:  data            - Pointer to validation data structure
@@ -410,28 +334,12 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
 {
         union acpi_operand_object *return_object = *return_object_ptr;
         acpi_status status = AE_OK;
-        u32 return_btype;
         char type_buffer[48];   /* Room for 5 types */
 
-        /*
-         * If we get a NULL return_object here, it is a NULL package element.
-         * Since all extraneous NULL package elements were removed earlier by a
-         * call to acpi_ns_remove_null_elements, this is an unexpected NULL element.
-         * We will attempt to repair it.
-         */
-        if (!return_object) {
-                status = acpi_ns_repair_null_element(data, expected_btypes,
-                                                     package_index,
-                                                     return_object_ptr);
-                if (ACPI_SUCCESS(status)) {
-                        return (AE_OK); /* Repair was successful */
-                }
-                goto type_error_exit;
-        }
-
         /* A Namespace node should not get here, but make sure */
 
-        if (ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) {
+        if (return_object &&
+            ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) {
                 ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
                                       "Invalid return type - Found a Namespace node [%4.4s] type %s",
                                       return_object->node.name.ascii,
@@ -448,59 +356,31 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
          * from all of the predefined names (including elements of returned
          * packages)
          */
-        switch (return_object->common.type) {
-        case ACPI_TYPE_INTEGER:
-                return_btype = ACPI_RTYPE_INTEGER;
-                break;
-
-        case ACPI_TYPE_BUFFER:
-                return_btype = ACPI_RTYPE_BUFFER;
-                break;
-
-        case ACPI_TYPE_STRING:
-                return_btype = ACPI_RTYPE_STRING;
-                break;
+        data->return_btype = acpi_ns_get_bitmapped_type(return_object);
+        if (data->return_btype == ACPI_RTYPE_ANY) {
 
-        case ACPI_TYPE_PACKAGE:
-                return_btype = ACPI_RTYPE_PACKAGE;
-                break;
-
-        case ACPI_TYPE_LOCAL_REFERENCE:
-                return_btype = ACPI_RTYPE_REFERENCE;
-                break;
-
-        default:
                 /* Not one of the supported objects, must be incorrect */
-
                 goto type_error_exit;
         }
 
-        /* Is the object one of the expected types? */
-
-        if (return_btype & expected_btypes) {
-
-                /* For reference objects, check that the reference type is correct */
-
-                if (return_object->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
-                        status = acpi_ns_check_reference(data, return_object);
-                }
+        /* For reference objects, check that the reference type is correct */
 
+        if ((data->return_btype & expected_btypes) == ACPI_RTYPE_REFERENCE) {
+                status = acpi_ns_check_reference(data, return_object);
                 return (status);
         }
 
-        /* Type mismatch -- attempt repair of the returned object */
+        /* Attempt simple repair of the returned object if necessary */
 
-        status = acpi_ns_repair_object(data, expected_btypes,
+        status = acpi_ns_simple_repair(data, expected_btypes,
                                        package_index, return_object_ptr);
-        if (ACPI_SUCCESS(status)) {
-                return (AE_OK); /* Repair was successful */
-        }
+        return (status);
 
       type_error_exit:
 
         /* Create a string with all expected types for this predefined object */
 
-        acpi_ns_get_expected_types(type_buffer, expected_btypes);
+        acpi_ut_get_expected_return_types(type_buffer, expected_btypes);
 
         if (package_index == ACPI_NOT_PACKAGE_ELEMENT) {
                 ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
@@ -558,36 +438,55 @@ acpi_ns_check_reference(struct acpi_predefined_data *data,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_get_expected_types
+ * FUNCTION:    acpi_ns_get_bitmapped_type
  *
- * PARAMETERS:  buffer          - Pointer to where the string is returned
- *              expected_btypes - Bitmap of expected return type(s)
+ * PARAMETERS:  return_object   - Object returned from method/obj evaluation
  *
- * RETURN:      Buffer is populated with type names.
+ * RETURN:      Object return type. ACPI_RTYPE_ANY indicates that the object
+ *              type is not supported. ACPI_RTYPE_NONE indicates that no
+ *              object was returned (return_object is NULL).
  *
- * DESCRIPTION: Translate the expected types bitmap into a string of ascii
- *              names of expected types, for use in warning messages.
+ * DESCRIPTION: Convert object type into a bitmapped object return type.
  *
  ******************************************************************************/
 
-static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes)
+static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object)
 {
-        u32 this_rtype;
-        u32 i;
-        u32 j;
+        u32 return_btype;
 
-        j = 1;
-        buffer[0] = 0;
-        this_rtype = ACPI_RTYPE_INTEGER;
+        if (!return_object) {
+                return (ACPI_RTYPE_NONE);
+        }
 
-        for (i = 0; i < ACPI_NUM_RTYPES; i++) {
+        /* Map acpi_object_type to internal bitmapped type */
 
-                /* If one of the expected types, concatenate the name of this type */
+        switch (return_object->common.type) {
+        case ACPI_TYPE_INTEGER:
+                return_btype = ACPI_RTYPE_INTEGER;
+                break;
 
-                if (expected_btypes & this_rtype) {
-                        ACPI_STRCAT(buffer, &acpi_rtype_names[i][j]);
-                        j = 0;  /* Use name separator from now on */
-                }
-                this_rtype <<= 1;       /* Next Rtype */
+        case ACPI_TYPE_BUFFER:
+                return_btype = ACPI_RTYPE_BUFFER;
+                break;
+
+        case ACPI_TYPE_STRING:
+                return_btype = ACPI_RTYPE_STRING;
+                break;
+
+        case ACPI_TYPE_PACKAGE:
+                return_btype = ACPI_RTYPE_PACKAGE;
+                break;
+
+        case ACPI_TYPE_LOCAL_REFERENCE:
+                return_btype = ACPI_RTYPE_REFERENCE;
+                break;
+
+        default:
+                /* Not one of the supported objects, must be incorrect */
+
+                return_btype = ACPI_RTYPE_ANY;
+                break;
         }
+
+        return (return_btype);
 }
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index a40155467d2e..77cdd539de16 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -112,9 +112,15 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
         elements = return_object->package.elements;
         count = return_object->package.count;
 
-        /* The package must have at least one element, else invalid */
-
+        /*
+         * Most packages must have at least one element. The only exception
+         * is the variable-length package (ACPI_PTYPE1_VAR).
+         */
         if (!count) {
+                if (package->ret_info.type == ACPI_PTYPE1_VAR) {
+                        return (AE_OK);
+                }
+
                 ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
                                       "Return Package has no elements (empty)"));
 
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 9e833353c06a..18f02e4ece01 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -46,6 +46,7 @@
 #include "acnamesp.h"
 #include "acinterp.h"
 #include "acpredef.h"
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsrepair")
@@ -71,6 +72,11 @@ ACPI_MODULE_NAME("nsrepair")
  * Buffer  -> String
  * Buffer  -> Package of Integers
  * Package -> Package of one Package
+ *
+ * Additional conversions that are available:
+ *  Convert a null return or zero return value to an end_tag descriptor
+ *  Convert an ASCII string to a Unicode buffer
+ *
  * An incorrect standalone object is wrapped with required outer package
  *
  * Additional possible repairs:
@@ -78,21 +84,51 @@ ACPI_MODULE_NAME("nsrepair")
  *
  ******************************************************************************/
 /* Local prototypes */
-static acpi_status
-acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
-                           union acpi_operand_object **return_object);
-
-static acpi_status
-acpi_ns_convert_to_string(union acpi_operand_object *original_object,
-                          union acpi_operand_object **return_object);
+static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
+                                                                         acpi_namespace_node
+                                                                         *node,
+                                                                         u32
+                                                                         return_btype,
+                                                                         u32
+                                                                         package_index);
 
-static acpi_status
-acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
-                          union acpi_operand_object **return_object);
+/*
+ * Special but simple repairs for some names.
+ *
+ * 2nd argument: Unexpected types that can be repaired
+ */
+static const struct acpi_simple_repair_info acpi_object_repair_info[] = {
+        /* Resource descriptor conversions */
+
+        {"_CRS",
+         ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
+         ACPI_RTYPE_NONE,
+         ACPI_NOT_PACKAGE_ELEMENT,
+         acpi_ns_convert_to_resource},
+        {"_DMA",
+         ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
+         ACPI_RTYPE_NONE,
+         ACPI_NOT_PACKAGE_ELEMENT,
+         acpi_ns_convert_to_resource},
+        {"_PRS",
+         ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
+         ACPI_RTYPE_NONE,
+         ACPI_NOT_PACKAGE_ELEMENT,
+         acpi_ns_convert_to_resource},
+
+        /* Unicode conversions */
+
+        {"_MLS", ACPI_RTYPE_STRING, 1,
+         acpi_ns_convert_to_unicode},
+        {"_STR", ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER,
+         ACPI_NOT_PACKAGE_ELEMENT,
+         acpi_ns_convert_to_unicode},
+        {{0, 0, 0, 0}, 0, 0, NULL}      /* Table terminator */
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_repair_object
+ * FUNCTION:    acpi_ns_simple_repair
  *
  * PARAMETERS:  data                - Pointer to validation data structure
  *              expected_btypes     - Object types expected
@@ -110,16 +146,54 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
  ******************************************************************************/
 
 acpi_status
-acpi_ns_repair_object(struct acpi_predefined_data *data,
+acpi_ns_simple_repair(struct acpi_predefined_data *data,
                       u32 expected_btypes,
                       u32 package_index,
                       union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
-        union acpi_operand_object *new_object;
+        union acpi_operand_object *new_object = NULL;
         acpi_status status;
+        const struct acpi_simple_repair_info *predefined;
+
+        ACPI_FUNCTION_NAME(ns_simple_repair);
+
+        /*
+         * Special repairs for certain names that are in the repair table.
+         * Check if this name is in the list of repairable names.
+         */
+        predefined = acpi_ns_match_simple_repair(data->node,
+                                                 data->return_btype,
+                                                 package_index);
+        if (predefined) {
+                if (!return_object) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Missing expected return value"));
+                }
+
+                status =
+                    predefined->object_converter(return_object, &new_object);
+                if (ACPI_FAILURE(status)) {
+
+                        /* A fatal error occurred during a conversion */
+
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "During return object analysis"));
+                        return (status);
+                }
+                if (new_object) {
+                        goto object_repaired;
+                }
+        }
 
-        ACPI_FUNCTION_NAME(ns_repair_object);
+        /*
+         * Do not perform simple object repair unless the return type is not
+         * expected.
+         */
+        if (data->return_btype & expected_btypes) {
+                return (AE_OK);
+        }
 
         /*
          * At this point, we know that the type of the returned object was not
@@ -127,6 +201,24 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
          * repair the object by converting it to one of the expected object
          * types for this predefined name.
          */
+
+        /*
+         * If there is no return value, check if we require a return value for
+         * this predefined name. Either one return value is expected, or none,
+         * for both methods and other objects.
+         *
+         * Exit now if there is no return object. Warning if one was expected.
+         */
+        if (!return_object) {
+                if (expected_btypes && (!(expected_btypes & ACPI_RTYPE_NONE))) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Missing expected return value"));
+
+                        return (AE_AML_NO_RETURN_VALUE);
+                }
+        }
+
         if (expected_btypes & ACPI_RTYPE_INTEGER) {
                 status = acpi_ns_convert_to_integer(return_object, &new_object);
                 if (ACPI_SUCCESS(status)) {
@@ -216,254 +308,51 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
         return (AE_OK);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ns_convert_to_integer
- *
- * PARAMETERS:  original_object     - Object to be converted
- *              return_object       - Where the new converted object is returned
- *
- * RETURN:      Status. AE_OK if conversion was successful.
- *
- * DESCRIPTION: Attempt to convert a String/Buffer object to an Integer.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
-                           union acpi_operand_object **return_object)
-{
-        union acpi_operand_object *new_object;
-        acpi_status status;
-        u64 value = 0;
-        u32 i;
-
-        switch (original_object->common.type) {
-        case ACPI_TYPE_STRING:
-
-                /* String-to-Integer conversion */
-
-                status = acpi_ut_strtoul64(original_object->string.pointer,
-                                           ACPI_ANY_BASE, &value);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-                break;
-
-        case ACPI_TYPE_BUFFER:
-
-                /* Buffer-to-Integer conversion. Max buffer size is 64 bits. */
-
-                if (original_object->buffer.length > 8) {
-                        return (AE_AML_OPERAND_TYPE);
-                }
-
-                /* Extract each buffer byte to create the integer */
-
-                for (i = 0; i < original_object->buffer.length; i++) {
-                        value |=
-                            ((u64) original_object->buffer.
-                             pointer[i] << (i * 8));
-                }
-                break;
-
-        default:
-                return (AE_AML_OPERAND_TYPE);
-        }
-
-        new_object = acpi_ut_create_integer_object(value);
-        if (!new_object) {
-                return (AE_NO_MEMORY);
-        }
-
-        *return_object = new_object;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ns_convert_to_string
- *
- * PARAMETERS:  original_object     - Object to be converted
- *              return_object       - Where the new converted object is returned
- *
- * RETURN:      Status. AE_OK if conversion was successful.
- *
- * DESCRIPTION: Attempt to convert a Integer/Buffer object to a String.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ns_convert_to_string(union acpi_operand_object *original_object,
-                          union acpi_operand_object **return_object)
-{
-        union acpi_operand_object *new_object;
-        acpi_size length;
-        acpi_status status;
-
-        switch (original_object->common.type) {
-        case ACPI_TYPE_INTEGER:
-                /*
-                 * Integer-to-String conversion. Commonly, convert
-                 * an integer of value 0 to a NULL string. The last element of
-                 * _BIF and _BIX packages occasionally need this fix.
-                 */
-                if (original_object->integer.value == 0) {
-
-                        /* Allocate a new NULL string object */
-
-                        new_object = acpi_ut_create_string_object(0);
-                        if (!new_object) {
-                                return (AE_NO_MEMORY);
-                        }
-                } else {
-                        status =
-                            acpi_ex_convert_to_string(original_object,
-                                                      &new_object,
-                                                      ACPI_IMPLICIT_CONVERT_HEX);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
-                }
-                break;
-
-        case ACPI_TYPE_BUFFER:
-                /*
-                 * Buffer-to-String conversion. Use a to_string
-                 * conversion, no transform performed on the buffer data. The best
-                 * example of this is the _BIF method, where the string data from
-                 * the battery is often (incorrectly) returned as buffer object(s).
-                 */
-                length = 0;
-                while ((length < original_object->buffer.length) &&
-                       (original_object->buffer.pointer[length])) {
-                        length++;
-                }
-
-                /* Allocate a new string object */
-
-                new_object = acpi_ut_create_string_object(length);
-                if (!new_object) {
-                        return (AE_NO_MEMORY);
-                }
-
-                /*
-                 * Copy the raw buffer data with no transform. String is already NULL
-                 * terminated at Length+1.
-                 */
-                ACPI_MEMCPY(new_object->string.pointer,
-                            original_object->buffer.pointer, length);
-                break;
-
-        default:
-                return (AE_AML_OPERAND_TYPE);
-        }
-
-        *return_object = new_object;
-        return (AE_OK);
-}
-
-/*******************************************************************************
+/******************************************************************************
  *
- * FUNCTION:    acpi_ns_convert_to_buffer
+ * FUNCTION:    acpi_ns_match_simple_repair
  *
- * PARAMETERS:  original_object     - Object to be converted
- *              return_object       - Where the new converted object is returned
+ * PARAMETERS:  node                - Namespace node for the method/object
+ *              return_btype        - Object type that was returned
+ *              package_index       - Index of object within parent package (if
+ *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
+ *                                    otherwise)
  *
- * RETURN:      Status. AE_OK if conversion was successful.
+ * RETURN:      Pointer to entry in repair table. NULL indicates not found.
  *
- * DESCRIPTION: Attempt to convert a Integer/String/Package object to a Buffer.
+ * DESCRIPTION: Check an object name against the repairable object list.
  *
- ******************************************************************************/
+ *****************************************************************************/
 
-static acpi_status
-acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
-                          union acpi_operand_object **return_object)
+static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
+                                                                         acpi_namespace_node
+                                                                         *node,
+                                                                         u32
+                                                                         return_btype,
+                                                                         u32
+                                                                         package_index)
 {
-        union acpi_operand_object *new_object;
-        acpi_status status;
-        union acpi_operand_object **elements;
-        u32 *dword_buffer;
-        u32 count;
-        u32 i;
+        const struct acpi_simple_repair_info *this_name;
 
-        switch (original_object->common.type) {
-        case ACPI_TYPE_INTEGER:
-                /*
-                 * Integer-to-Buffer conversion.
-                 * Convert the Integer to a packed-byte buffer. _MAT and other
-                 * objects need this sometimes, if a read has been performed on a
-                 * Field object that is less than or equal to the global integer
-                 * size (32 or 64 bits).
-                 */
-                status =
-                    acpi_ex_convert_to_buffer(original_object, &new_object);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-                break;
+        /* Search info table for a repairable predefined method/object name */
 
-        case ACPI_TYPE_STRING:
+        this_name = acpi_object_repair_info;
+        while (this_name->object_converter) {
+                if (ACPI_COMPARE_NAME(node->name.ascii, this_name->name)) {
 
-                /* String-to-Buffer conversion. Simple data copy */
-
-                new_object =
-                    acpi_ut_create_buffer_object(original_object->string.
-                                                 length);
-                if (!new_object) {
-                        return (AE_NO_MEMORY);
-                }
+                        /* Check if we can actually repair this name/type combination */
 
-                ACPI_MEMCPY(new_object->buffer.pointer,
-                            original_object->string.pointer,
-                            original_object->string.length);
-                break;
-
-        case ACPI_TYPE_PACKAGE:
-                /*
-                 * This case is often seen for predefined names that must return a
-                 * Buffer object with multiple DWORD integers within. For example,
-                 * _FDE and _GTM. The Package can be converted to a Buffer.
-                 */
-
-                /* All elements of the Package must be integers */
-
-                elements = original_object->package.elements;
-                count = original_object->package.count;
-
-                for (i = 0; i < count; i++) {
-                        if ((!*elements) ||
-                            ((*elements)->common.type != ACPI_TYPE_INTEGER)) {
-                                return (AE_AML_OPERAND_TYPE);
+                        if ((return_btype & this_name->unexpected_btypes) &&
+                            (package_index == this_name->package_index)) {
+                                return (this_name);
                         }
-                        elements++;
-                }
-
-                /* Create the new buffer object to replace the Package */
 
-                new_object = acpi_ut_create_buffer_object(ACPI_MUL_4(count));
-                if (!new_object) {
-                        return (AE_NO_MEMORY);
+                        return (NULL);
                 }
-
-                /* Copy the package elements (integers) to the buffer as DWORDs */
-
-                elements = original_object->package.elements;
-                dword_buffer = ACPI_CAST_PTR(u32, new_object->buffer.pointer);
-
-                for (i = 0; i < count; i++) {
-                        *dword_buffer = (u32) (*elements)->integer.value;
-                        dword_buffer++;
-                        elements++;
-                }
-                break;
-
-        default:
-                return (AE_AML_OPERAND_TYPE);
+                this_name++;
         }
 
-        *return_object = new_object;
-        return (AE_OK);
+        return (NULL);          /* Name was not found in the repair table */
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index ba4d98287c6a..149e9b9c2c1b 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -66,9 +66,9 @@ typedef struct acpi_repair_info {
 
 /* Local prototypes */
 
-static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct
-                                                                    acpi_namespace_node
-                                                                    *node);
+static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
+                                                                   acpi_namespace_node
+                                                                   *node);
 
 static acpi_status
 acpi_ns_repair_ALR(struct acpi_predefined_data *data,
@@ -175,7 +175,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
 
         /* Check if this name is in the list of repairable names */
 
-        predefined = acpi_ns_match_repairable_name(node);
+        predefined = acpi_ns_match_complex_repair(node);
         if (!predefined) {
                 return (validate_status);
         }
@@ -186,7 +186,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
 
 /******************************************************************************
  *
- * FUNCTION:    acpi_ns_match_repairable_name
+ * FUNCTION:    acpi_ns_match_complex_repair
  *
  * PARAMETERS:  node                - Namespace node for the method/object
  *
@@ -196,9 +196,9 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
  *
  *****************************************************************************/
 
-static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct
-                                                                    acpi_namespace_node
-                                                                    *node)
+static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
+                                                                   acpi_namespace_node
+                                                                   *node)
 {
         const struct acpi_repair_info *this_name;
 
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 686420df684f..2808586fad30 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -112,10 +112,10 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
 
         if (!node) {
                 ACPI_WARNING((AE_INFO, "Null Node parameter"));
-                return_VALUE(ACPI_TYPE_ANY);
+                return_UINT8(ACPI_TYPE_ANY);
         }
 
-        return_VALUE(node->type);
+        return_UINT8(node->type);
 }
 
 /*******************************************************************************
@@ -140,10 +140,10 @@ u32 acpi_ns_local(acpi_object_type type)
                 /* Type code out of range  */
 
                 ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type));
-                return_VALUE(ACPI_NS_NORMAL);
+                return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_VALUE(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
+        return_UINT32(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index f51308cdbc65..9f25a3d4e992 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -108,7 +108,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
         /* Byte 0 is a special case, either bits [0:3] or [0:5] are used */
 
         package_length |= (aml[0] & byte_zero_mask);
-        return_VALUE(package_length);
+        return_UINT32(package_length);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 7816d4eef04e..72077fa1eea5 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -202,6 +202,12 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                         return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
                 }
 
+                /* Sanity check the length. It must not be zero, or we loop forever */
+
+                if (!resource->length) {
+                        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
+                }
+
                 /* Get the base size of the (external stream) resource descriptor */
 
                 total_size = acpi_gbl_aml_resource_sizes[resource->type];
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index cab51445189d..b5fc0db2e87b 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -385,6 +385,14 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
                         return;
                 }
 
+                /* Sanity check the length. It must not be zero, or we loop forever */
+
+                if (!resource_list->length) {
+                        acpi_os_printf
+                            ("Invalid zero length descriptor in resource list\n");
+                        return;
+                }
+
                 /* Dump the resource descriptor */
 
                 if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index ee2e206fc6c8..6053aa182093 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -178,6 +178,14 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
+                /* Sanity check the length. It must not be zero, or we loop forever */
+
+                if (!resource->length) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid zero length descriptor in resource list\n"));
+                        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
+                }
+
                 /* Perform the conversion */
 
                 if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 15d6eaef0e28..c0e5d2d3ce67 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -563,13 +563,19 @@ acpi_walk_resource_buffer(struct acpi_buffer * buffer,
 
         while (resource < resource_end) {
 
-                /* Sanity check the resource */
+                /* Sanity check the resource type */
 
                 if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
                         status = AE_AML_INVALID_RESOURCE_TYPE;
                         break;
                 }
 
+                /* Sanity check the length. It must not be zero, or we loop forever */
+
+                if (!resource->length) {
+                        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
+                }
+
                 /* Invoke the user function, abort on any error returned */
 
                 status = user_function(resource, context);
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 74181bf181ec..33b00d22300a 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -559,8 +559,12 @@ static void acpi_tb_validate_fadt(void)
                 /*
                  * For each extended field, check for length mismatch between the
                  * legacy length field and the corresponding 64-bit X length field.
+                 * Note: If the legacy length field is > 0xFF bits, ignore this
+                 * check. (GPE registers can be larger than the 64-bit GAS structure
+                 * can accomodate, 0xFF bits).
                  */
                 if (address64->address &&
+                    (ACPI_MUL_8(length) <= ACPI_UINT8_MAX) &&
                     (address64->bit_width != ACPI_MUL_8(length))) {
                         ACPI_BIOS_WARNING((AE_INFO,
                                            "32/64X length mismatch in FADT/%s: %u/%u",
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index b35a5e6d653a..ad11162482ff 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Module Name: tbxface - ACPI table oriented external interfaces
+ * Module Name: tbxface - ACPI table-oriented external interfaces
  *
  *****************************************************************************/
 
@@ -80,7 +80,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
  *                                    array is dynamically allocated.
  *              initial_table_count - Size of initial_table_array, in number of
  *                                    struct acpi_table_desc structures
- *              allow_realloc       - Flag to tell Table Manager if resize of
+ *              allow_resize        - Flag to tell Table Manager if resize of
  *                                    pre-allocated array is allowed. Ignored
  *                                    if initial_table_array is NULL.
  *
@@ -107,8 +107,8 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
         ACPI_FUNCTION_TRACE(acpi_initialize_tables);
 
         /*
-         * Set up the Root Table Array
-         * Allocate the table array if requested
+         * Setup the Root Table Array and allocate the table array
+         * if requested
          */
         if (!initial_table_array) {
                 status = acpi_allocate_root_table(initial_table_count);
@@ -305,9 +305,10 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *              instance            - Which instance (for SSDTs)
  *              out_table           - Where the pointer to the table is returned
  *
- * RETURN:      Status and pointer to table
+ * RETURN:      Status and pointer to the requested table
  *
- * DESCRIPTION: Finds and verifies an ACPI table.
+ * DESCRIPTION: Finds and verifies an ACPI table. Table must be in the
+ *              RSDT/XSDT.
  *
  ******************************************************************************/
 acpi_status
@@ -375,9 +376,10 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
  * PARAMETERS:  table_index         - Table index
  *              table               - Where the pointer to the table is returned
  *
- * RETURN:      Status and pointer to the table
+ * RETURN:      Status and pointer to the requested table
  *
- * DESCRIPTION: Obtain a table by an index into the global table list.
+ * DESCRIPTION: Obtain a table by an index into the global table list. Used
+ *              internally also.
  *
  ******************************************************************************/
 acpi_status
@@ -432,7 +434,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Install table event handler
+ * DESCRIPTION: Install a global table event handler.
  *
  ******************************************************************************/
 acpi_status
@@ -479,7 +481,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Remove table event handler
+ * DESCRIPTION: Remove a table event handler
  *
  ******************************************************************************/
 acpi_status acpi_remove_table_handler(acpi_table_handler handler)
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index 698b9d385516..e0a2e2779c2e 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -214,7 +214,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
 
         if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
             (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                return_VALUE(0);
+                return_UINT32(0);
         }
 
         range_info = acpi_gbl_address_range_list[space_id];
@@ -256,7 +256,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
                 range_info = range_info->next;
         }
 
-        return_VALUE(overlap_count);
+        return_UINT32(overlap_count);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index e0e8579deaac..a877a9647fd9 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -85,7 +85,6 @@ acpi_os_create_cache(char *cache_name,
         /* Populate the cache object and return it */
 
         ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
-        cache->link_offset = 8;
         cache->list_name = cache_name;
         cache->object_size = object_size;
         cache->max_depth = max_depth;
@@ -108,7 +107,7 @@ acpi_os_create_cache(char *cache_name,
 
 acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
 {
-        char *next;
+        void *next;
         acpi_status status;
 
         ACPI_FUNCTION_ENTRY();
@@ -128,10 +127,7 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
 
                 /* Delete and unlink one cached state object */
 
-                next = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                &(((char *)cache->
-                                                   list_head)[cache->
-                                                              link_offset])));
+                next = ACPI_GET_DESCRIPTOR_PTR(cache->list_head);
                 ACPI_FREE(cache->list_head);
 
                 cache->list_head = next;
@@ -221,10 +217,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
 
                 /* Put the object at the head of the cache list */
 
-                *(ACPI_CAST_INDIRECT_PTR(char,
-                                         &(((char *)object)[cache->
-                                                            link_offset]))) =
-                    cache->list_head;
+                ACPI_SET_DESCRIPTOR_PTR(object, cache->list_head);
                 cache->list_head = object;
                 cache->current_depth++;
 
@@ -272,10 +265,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
                 /* There is an object available, use it */
 
                 object = cache->list_head;
-                cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                            &(((char *)
-                                                               object)[cache->
-                                                                       link_offset])));
+                cache->list_head = ACPI_GET_DESCRIPTOR_PTR(object);
 
                 cache->current_depth--;
 
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 2541de420249..29b930250b6f 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -359,19 +359,20 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)
  * FUNCTION:    acpi_ut_update_ref_count
  *
  * PARAMETERS:  object          - Object whose ref count is to be updated
- *              action          - What to do
+ *              action          - What to do (REF_INCREMENT or REF_DECREMENT)
  *
- * RETURN:      New ref count
+ * RETURN:      None. Sets new reference count within the object
  *
- * DESCRIPTION: Modify the ref count and return it.
+ * DESCRIPTION: Modify the reference count for an internal acpi object
  *
  ******************************************************************************/
 
 static void
 acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
 {
-        u16 count;
-        u16 new_count;
+        u16 original_count;
+        u16 new_count = 0;
+        acpi_cpu_flags lock_flags;
 
         ACPI_FUNCTION_NAME(ut_update_ref_count);
 
@@ -379,76 +380,79 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
                 return;
         }
 
-        count = object->common.reference_count;
-        new_count = count;
-
         /*
-         * Perform the reference count action (increment, decrement, force delete)
+         * Always get the reference count lock. Note: Interpreter and/or
+         * Namespace is not always locked when this function is called.
          */
+        lock_flags = acpi_os_acquire_lock(acpi_gbl_reference_count_lock);
+        original_count = object->common.reference_count;
+
+        /* Perform the reference count action (increment, decrement) */
+
         switch (action) {
         case REF_INCREMENT:
 
-                new_count++;
+                new_count = original_count + 1;
                 object->common.reference_count = new_count;
+                acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
+
+                /* The current reference count should never be zero here */
+
+                if (!original_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Obj %p, Reference Count was zero before increment\n",
+                                      object));
+                }
 
                 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                  "Obj %p Refs=%X, [Incremented]\n",
-                                  object, new_count));
+                                  "Obj %p Type %.2X Refs %.2X [Incremented]\n",
+                                  object, object->common.type, new_count));
                 break;
 
         case REF_DECREMENT:
 
-                if (count < 1) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                          "Obj %p Refs=%X, can't decrement! (Set to 0)\n",
-                                          object, new_count));
-
-                        new_count = 0;
-                } else {
-                        new_count--;
+                /* The current reference count must be non-zero */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                          "Obj %p Refs=%X, [Decremented]\n",
-                                          object, new_count));
+                if (original_count) {
+                        new_count = original_count - 1;
+                        object->common.reference_count = new_count;
                 }
 
-                if (object->common.type == ACPI_TYPE_METHOD) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                          "Method Obj %p Refs=%X, [Decremented]\n",
-                                          object, new_count));
-                }
+                acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
 
-                object->common.reference_count = new_count;
-                if (new_count == 0) {
-                        acpi_ut_delete_internal_obj(object);
+                if (!original_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Obj %p, Reference Count is already zero, cannot decrement\n",
+                                      object));
                 }
-                break;
-
-        case REF_FORCE_DELETE:
 
                 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
-                                  "Obj %p Refs=%X, Force delete! (Set to 0)\n",
-                                  object, count));
+                                  "Obj %p Type %.2X Refs %.2X [Decremented]\n",
+                                  object, object->common.type, new_count));
 
-                new_count = 0;
-                object->common.reference_count = new_count;
-                acpi_ut_delete_internal_obj(object);
+                /* Actually delete the object on a reference count of zero */
+
+                if (new_count == 0) {
+                        acpi_ut_delete_internal_obj(object);
+                }
                 break;
 
         default:
 
-                ACPI_ERROR((AE_INFO, "Unknown action (0x%X)", action));
-                break;
+                acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
+                ACPI_ERROR((AE_INFO, "Unknown Reference Count action (0x%X)",
+                            action));
+                return;
         }
 
         /*
          * Sanity check the reference count, for debug purposes only.
          * (A deleted object will have a huge reference count)
          */
-        if (count > ACPI_MAX_REFERENCE_COUNT) {
+        if (new_count > ACPI_MAX_REFERENCE_COUNT) {
                 ACPI_WARNING((AE_INFO,
-                              "Large Reference Count (0x%X) in object %p",
-                              count, object));
+                              "Large Reference Count (0x%X) in object %p, Type=0x%.2X",
+                              new_count, object, object->common.type));
         }
 }
 
@@ -458,8 +462,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
  *
  * PARAMETERS:  object              - Increment ref count for this object
  *                                    and all sub-objects
- *              action              - Either REF_INCREMENT or REF_DECREMENT or
- *                                    REF_FORCE_DELETE
+ *              action              - Either REF_INCREMENT or REF_DECREMENT
  *
  * RETURN:      Status
  *
@@ -714,7 +717,6 @@ void acpi_ut_remove_reference(union acpi_operand_object *object)
         /*
          * Allow a NULL pointer to be passed in, just ignore it. This saves
          * each caller from having to check. Also, ignore NS nodes.
-         *
          */
         if (!object ||
             (ACPI_GET_DESCRIPTOR_TYPE(object) == ACPI_DESC_TYPE_NAMED)) {
diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c
index a0ab7c02e87c..b543a144941a 100644
--- a/drivers/acpi/acpica/utexcep.c
+++ b/drivers/acpi/acpica/utexcep.c
@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("utexcep")
  ******************************************************************************/
 const char *acpi_format_exception(acpi_status status)
 {
-        const char *exception = NULL;
+        const struct acpi_exception_info *exception;
 
         ACPI_FUNCTION_ENTRY();
 
@@ -76,10 +76,10 @@ const char *acpi_format_exception(acpi_status status)
                 ACPI_ERROR((AE_INFO,
                             "Unknown exception code: 0x%8.8X", status));
 
-                exception = "UNKNOWN_STATUS_CODE";
+                return ("UNKNOWN_STATUS_CODE");
         }
 
-        return (ACPI_CAST_PTR(const char, exception));
+        return (exception->name);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_format_exception)
@@ -97,10 +97,10 @@ ACPI_EXPORT_SYMBOL(acpi_format_exception)
  *              an ASCII string.
  *
  ******************************************************************************/
-const char *acpi_ut_validate_exception(acpi_status status)
+const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status status)
 {
         u32 sub_status;
-        const char *exception = NULL;
+        const struct acpi_exception_info *exception = NULL;
 
         ACPI_FUNCTION_ENTRY();
 
@@ -113,35 +113,35 @@ const char *acpi_ut_validate_exception(acpi_status status)
         case AE_CODE_ENVIRONMENTAL:
 
                 if (sub_status <= AE_CODE_ENV_MAX) {
-                        exception = acpi_gbl_exception_names_env[sub_status];
+                        exception = &acpi_gbl_exception_names_env[sub_status];
                 }
                 break;
 
         case AE_CODE_PROGRAMMER:
 
                 if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception = acpi_gbl_exception_names_pgm[sub_status];
+                        exception = &acpi_gbl_exception_names_pgm[sub_status];
                 }
                 break;
 
         case AE_CODE_ACPI_TABLES:
 
                 if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception = acpi_gbl_exception_names_tbl[sub_status];
+                        exception = &acpi_gbl_exception_names_tbl[sub_status];
                 }
                 break;
 
         case AE_CODE_AML:
 
                 if (sub_status <= AE_CODE_AML_MAX) {
-                        exception = acpi_gbl_exception_names_aml[sub_status];
+                        exception = &acpi_gbl_exception_names_aml[sub_status];
                 }
                 break;
 
         case AE_CODE_CONTROL:
 
                 if (sub_status <= AE_CODE_CTRL_MAX) {
-                        exception = acpi_gbl_exception_names_ctrl[sub_status];
+                        exception = &acpi_gbl_exception_names_ctrl[sub_status];
                 }
                 break;
 
@@ -149,5 +149,9 @@ const char *acpi_ut_validate_exception(acpi_status status)
                 break;
         }
 
-        return (ACPI_CAST_PTR(const char, exception));
+        if (!exception || !exception->name) {
+                return (NULL);
+        }
+
+        return (exception);
 }
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index ffecf4b4f0dd..f736448a8606 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -359,6 +359,8 @@ acpi_status acpi_ut_init_globals(void)
 
 #ifdef ACPI_DISASSEMBLER
         acpi_gbl_external_list = NULL;
+        acpi_gbl_num_external_methods = 0;
+        acpi_gbl_resolved_external_methods = 0;
 #endif
 
 #ifdef ACPI_DEBUG_OUTPUT
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 22feb99b8e35..08c323245584 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -81,7 +81,7 @@ acpi_status acpi_ut_mutex_initialize(void)
                 }
         }
 
-        /* Create the spinlocks for use at interrupt level */
+        /* Create the spinlocks for use at interrupt level or for speed */
 
         status = acpi_os_create_lock (&acpi_gbl_gpe_lock);
         if (ACPI_FAILURE (status)) {
@@ -93,7 +93,13 @@ acpi_status acpi_ut_mutex_initialize(void)
                 return_ACPI_STATUS (status);
         }
 
+        status = acpi_os_create_lock(&acpi_gbl_reference_count_lock);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
         /* Mutex for _OSI support */
+
         status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -136,6 +142,7 @@ void acpi_ut_mutex_terminate(void)
 
         acpi_os_delete_lock(acpi_gbl_gpe_lock);
         acpi_os_delete_lock(acpi_gbl_hardware_lock);
+        acpi_os_delete_lock(acpi_gbl_reference_count_lock);
 
         /* Delete the reader/writer lock */
 
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 36a7d361d7cb..b15acebb96a1 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -108,9 +108,14 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
 
 acpi_status acpi_ut_initialize_interfaces(void)
 {
+        acpi_status status;
         u32 i;
 
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
         acpi_gbl_supported_interfaces = acpi_default_supported_interfaces;
 
         /* Link the static list of supported interfaces */
@@ -132,20 +137,24 @@ acpi_status acpi_ut_initialize_interfaces(void)
  *
  * PARAMETERS:  None
  *
- * RETURN:      None
+ * RETURN:      Status
  *
  * DESCRIPTION: Delete all interfaces in the global list. Sets
  *              acpi_gbl_supported_interfaces to NULL.
  *
  ******************************************************************************/
 
-void acpi_ut_interface_terminate(void)
+acpi_status acpi_ut_interface_terminate(void)
 {
+        acpi_status status;
         struct acpi_interface_info *next_interface;
 
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
-        next_interface = acpi_gbl_supported_interfaces;
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
 
+        next_interface = acpi_gbl_supported_interfaces;
         while (next_interface) {
                 acpi_gbl_supported_interfaces = next_interface->next;
 
@@ -160,6 +169,7 @@ void acpi_ut_interface_terminate(void)
         }
 
         acpi_os_release_mutex(acpi_gbl_osi_mutex);
+        return (AE_OK);
 }
 
 /*******************************************************************************
@@ -315,6 +325,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state)
         union acpi_operand_object *return_desc;
         struct acpi_interface_info *interface_info;
         acpi_interface_handler interface_handler;
+        acpi_status status;
         u32 return_value;
 
         ACPI_FUNCTION_TRACE(ut_osi_implementation);
@@ -336,7 +347,10 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state)
         /* Default return value is 0, NOT SUPPORTED */
 
         return_value = 0;
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
 
         /* Lookup the interface in the global _OSI list */
 
diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c
new file mode 100644
index 000000000000..29459479148f
--- /dev/null
+++ b/drivers/acpi/acpica/utpredef.c
@@ -0,0 +1,399 @@
+/******************************************************************************
+ *
+ * Module Name: utpredef - support functions for predefined names
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acpredef.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utpredef")
+
+/*
+ * Names for the types that can be returned by the predefined objects.
+ * Used for warning messages. Must be in the same order as the ACPI_RTYPEs
+ */
+static const char *ut_rtype_names[] = {
+        "/Integer",
+        "/String",
+        "/Buffer",
+        "/Package",
+        "/Reference",
+};
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_next_predefined_method
+ *
+ * PARAMETERS:  this_name           - Entry in the predefined method/name table
+ *
+ * RETURN:      Pointer to next entry in predefined table.
+ *
+ * DESCRIPTION: Get the next entry in the predefine method table. Handles the
+ *              cases where a package info entry follows a method name that
+ *              returns a package.
+ *
+ ******************************************************************************/
+
+const union acpi_predefined_info *acpi_ut_get_next_predefined_method(const union
+                                                                     acpi_predefined_info
+                                                                     *this_name)
+{
+
+        /*
+         * Skip next entry in the table if this name returns a Package
+         * (next entry contains the package info)
+         */
+        if ((this_name->info.expected_btypes & ACPI_RTYPE_PACKAGE) &&
+            (this_name->info.expected_btypes != ACPI_RTYPE_ALL)) {
+                this_name++;
+        }
+
+        this_name++;
+        return (this_name);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_match_predefined_method
+ *
+ * PARAMETERS:  name                - Name to find
+ *
+ * RETURN:      Pointer to entry in predefined table. NULL indicates not found.
+ *
+ * DESCRIPTION: Check an object name against the predefined object list.
+ *
+ ******************************************************************************/
+
+const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name)
+{
+        const union acpi_predefined_info *this_name;
+
+        /* Quick check for a predefined name, first character must be underscore */
+
+        if (name[0] != '_') {
+                return (NULL);
+        }
+
+        /* Search info table for a predefined method/object name */
+
+        this_name = acpi_gbl_predefined_methods;
+        while (this_name->info.name[0]) {
+                if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
+                        return (this_name);
+                }
+
+                this_name = acpi_ut_get_next_predefined_method(this_name);
+        }
+
+        return (NULL);          /* Not found */
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_expected_return_types
+ *
+ * PARAMETERS:  buffer              - Where the formatted string is returned
+ *              expected_Btypes     - Bitfield of expected data types
+ *
+ * RETURN:      Formatted string in Buffer.
+ *
+ * DESCRIPTION: Format the expected object types into a printable string.
+ *
+ ******************************************************************************/
+
+void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
+{
+        u32 this_rtype;
+        u32 i;
+        u32 j;
+
+        j = 1;
+        buffer[0] = 0;
+        this_rtype = ACPI_RTYPE_INTEGER;
+
+        for (i = 0; i < ACPI_NUM_RTYPES; i++) {
+
+                /* If one of the expected types, concatenate the name of this type */
+
+                if (expected_btypes & this_rtype) {
+                        ACPI_STRCAT(buffer, &ut_rtype_names[i][j]);
+                        j = 0;  /* Use name separator from now on */
+                }
+
+                this_rtype <<= 1;       /* Next Rtype */
+        }
+}
+
+/*******************************************************************************
+ *
+ * The remaining functions are used by iASL and acpi_help only
+ *
+ ******************************************************************************/
+
+#if (defined ACPI_ASL_COMPILER || defined ACPI_HELP_APP)
+#include <stdio.h>
+#include <string.h>
+
+/* Local prototypes */
+
+static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types);
+
+/* Types that can be returned externally by a predefined name */
+
+static const char *ut_external_type_names[] =   /* Indexed by ACPI_TYPE_* */
+{
+        ", UNSUPPORTED-TYPE",
+        ", Integer",
+        ", String",
+        ", Buffer",
+        ", Package"
+};
+
+/* Bit widths for resource descriptor predefined names */
+
+static const char *ut_resource_type_names[] = {
+        "/1",
+        "/2",
+        "/3",
+        "/8",
+        "/16",
+        "/32",
+        "/64",
+        "/variable",
+};
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_match_resource_name
+ *
+ * PARAMETERS:  name                - Name to find
+ *
+ * RETURN:      Pointer to entry in the resource table. NULL indicates not
+ *              found.
+ *
+ * DESCRIPTION: Check an object name against the predefined resource
+ *              descriptor object list.
+ *
+ ******************************************************************************/
+
+const union acpi_predefined_info *acpi_ut_match_resource_name(char *name)
+{
+        const union acpi_predefined_info *this_name;
+
+        /* Quick check for a predefined name, first character must be underscore */
+
+        if (name[0] != '_') {
+                return (NULL);
+        }
+
+        /* Search info table for a predefined method/object name */
+
+        this_name = acpi_gbl_resource_names;
+        while (this_name->info.name[0]) {
+                if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
+                        return (this_name);
+                }
+
+                this_name++;
+        }
+
+        return (NULL);          /* Not found */
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_display_predefined_method
+ *
+ * PARAMETERS:  buffer              - Scratch buffer for this function
+ *              this_name           - Entry in the predefined method/name table
+ *              multi_line          - TRUE if output should be on >1 line
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Display information about a predefined method. Number and
+ *              type of the input arguments, and expected type(s) for the
+ *              return value, if any.
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_display_predefined_method(char *buffer,
+                                  const union acpi_predefined_info *this_name,
+                                  u8 multi_line)
+{
+        u32 arg_count;
+
+        /*
+         * Get the argument count and the string buffer
+         * containing all argument types
+         */
+        arg_count = acpi_ut_get_argument_types(buffer,
+                                               this_name->info.argument_list);
+
+        if (multi_line) {
+                printf("      ");
+        }
+
+        printf("%4.4s    Requires %s%u argument%s",
+               this_name->info.name,
+               (this_name->info.argument_list & ARG_COUNT_IS_MINIMUM) ?
+               "(at least) " : "", arg_count, arg_count != 1 ? "s" : "");
+
+        /* Display the types for any arguments */
+
+        if (arg_count > 0) {
+                printf(" (%s)", buffer);
+        }
+
+        if (multi_line) {
+                printf("\n    ");
+        }
+
+        /* Get the return value type(s) allowed */
+
+        if (this_name->info.expected_btypes) {
+                acpi_ut_get_expected_return_types(buffer,
+                                                  this_name->info.
+                                                  expected_btypes);
+                printf("  Return value types: %s\n", buffer);
+        } else {
+                printf("  No return value\n");
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_argument_types
+ *
+ * PARAMETERS:  buffer              - Where to return the formatted types
+ *              argument_types      - Types field for this method
+ *
+ * RETURN:      count - the number of arguments required for this method
+ *
+ * DESCRIPTION: Format the required data types for this method (Integer,
+ *              String, Buffer, or Package) and return the required argument
+ *              count.
+ *
+ ******************************************************************************/
+
+static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types)
+{
+        u16 this_argument_type;
+        u16 sub_index;
+        u16 arg_count;
+        u32 i;
+
+        *buffer = 0;
+        sub_index = 2;
+
+        /* First field in the types list is the count of args to follow */
+
+        arg_count = (argument_types & METHOD_ARG_MASK);
+        argument_types >>= METHOD_ARG_BIT_WIDTH;
+
+        if (arg_count > METHOD_PREDEF_ARGS_MAX) {
+                printf("**** Invalid argument count (%u) "
+                       "in predefined info structure\n", arg_count);
+                return (arg_count);
+        }
+
+        /* Get each argument from the list, convert to ascii, store to buffer */
+
+        for (i = 0; i < arg_count; i++) {
+                this_argument_type = (argument_types & METHOD_ARG_MASK);
+                if (!this_argument_type
+                    || (this_argument_type > METHOD_MAX_ARG_TYPE)) {
+                        printf("**** Invalid argument type (%u) "
+                               "in predefined info structure\n",
+                               this_argument_type);
+                        return (arg_count);
+                }
+
+                strcat(buffer,
+                       ut_external_type_names[this_argument_type] + sub_index);
+
+                /* Shift to next argument type field */
+
+                argument_types >>= METHOD_ARG_BIT_WIDTH;
+                sub_index = 0;
+        }
+
+        return (arg_count);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_resource_bit_width
+ *
+ * PARAMETERS:  buffer              - Where the formatted string is returned
+ *              types               - Bitfield of expected data types
+ *
+ * RETURN:      Count of return types. Formatted string in Buffer.
+ *
+ * DESCRIPTION: Format the resource bit widths into a printable string.
+ *
+ ******************************************************************************/
+
+u32 acpi_ut_get_resource_bit_width(char *buffer, u16 types)
+{
+        u32 i;
+        u16 sub_index;
+        u32 found;
+
+        *buffer = 0;
+        sub_index = 1;
+        found = 0;
+
+        for (i = 0; i < NUM_RESOURCE_WIDTHS; i++) {
+                if (types & 1) {
+                        strcat(buffer, &(ut_resource_type_names[i][sub_index]));
+                        sub_index = 0;
+                        found++;
+                }
+
+                types >>= 1;
+        }
+
+        return (found);
+}
+#endif
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 48efb446258c..6505774f223e 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -287,7 +287,10 @@ acpi_status acpi_install_interface(acpi_string interface_name)
                 return (AE_BAD_PARAMETER);
         }
 
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
 
         /* Check if the interface name is already in the global list */
 
@@ -336,7 +339,10 @@ acpi_status acpi_remove_interface(acpi_string interface_name)
                 return (AE_BAD_PARAMETER);
         }
 
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
 
         status = acpi_ut_remove_interface(interface_name);
 
@@ -362,9 +368,12 @@ ACPI_EXPORT_SYMBOL(acpi_remove_interface)
  ****************************************************************************/
 acpi_status acpi_install_interface_handler(acpi_interface_handler handler)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
 
-        (void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
 
         if (handler && acpi_gbl_interface_handler) {
                 status = AE_ALREADY_EXISTS;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c5cd5b5513e6..0cc384b72943 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -146,7 +146,7 @@ struct acpi_battery {
 
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat)
 
-inline int acpi_battery_present(struct acpi_battery *battery)
+static inline int acpi_battery_present(struct acpi_battery *battery)
 {
         return battery->device->status.battery_present;
 }
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 01708a165368..292de3cab9cc 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -288,13 +288,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
         }
 out_success:
         context->ret.length = out_obj->buffer.length;
-        context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
+        context->ret.pointer = kmemdup(out_obj->buffer.pointer,
+                                       context->ret.length, GFP_KERNEL);
         if (!context->ret.pointer) {
                 status =  AE_NO_MEMORY;
                 goto out_kfree;
         }
-        memcpy(context->ret.pointer, out_obj->buffer.pointer,
-                context->ret.length);
         status =  AE_OK;
 
 out_kfree:
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 86c7d5445c38..92a659aa6396 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <acpi/button.h>
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 5523ba7d764d..e23151667655 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -1,12 +1,12 @@
 /*
- * acpi_container.c  - ACPI Generic Container Driver
- * ($Revision: )
+ * container.c  - ACPI Generic Container Driver
  *
  * Copyright (C) 2004 Anil S Keshavamurthy (anil.s.keshavamurthy@intel.com)
  * Copyright (C) 2004 Keiichiro Tokunaga (tokunaga.keiich@jp.fujitsu.com)
  * Copyright (C) 2004 Motoyuki Ito (motoyuki@soft.fujitsu.com)
- * Copyright (C) 2004 Intel Corp.
  * Copyright (C) 2004 FUJITSU LIMITED
+ * Copyright (C) 2004, 2013 Intel Corp.
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -26,14 +26,11 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/types.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+
+#include "internal.h"
+
+#include "internal.h"
 
 #define PREFIX "ACPI: "
 
@@ -50,141 +47,20 @@ static const struct acpi_device_id container_device_ids[] = {
 static int container_device_attach(struct acpi_device *device,
                                    const struct acpi_device_id *not_used)
 {
-        /*
-         * FIXME: This is necessary, so that acpi_eject_store() doesn't return
-         * -ENODEV for containers.
-         */
+        /* This is necessary for container hotplug to work. */
         return 1;
 }
 
-static struct acpi_scan_handler container_device_handler = {
+static struct acpi_scan_handler container_handler = {
         .ids = container_device_ids,
         .attach = container_device_attach,
+        .hotplug = {
+                .enabled = true,
+                .mode = AHM_CONTAINER,
+        },
 };
 
-static int is_device_present(acpi_handle handle)
-{
-        acpi_handle temp;
-        acpi_status status;
-        unsigned long long sta;
-
-
-        status = acpi_get_handle(handle, "_STA", &temp);
-        if (ACPI_FAILURE(status))
-                return 1;       /* _STA not found, assume device present */
-
-        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        if (ACPI_FAILURE(status))
-                return 0;       /* Firmware error */
-
-        return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
-}
-
-static void container_notify_cb(acpi_handle handle, u32 type, void *context)
-{
-        struct acpi_device *device = NULL;
-        int result;
-        int present;
-        acpi_status status;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
-
-        acpi_scan_lock_acquire();
-
-        switch (type) {
-        case ACPI_NOTIFY_BUS_CHECK:
-                /* Fall through */
-        case ACPI_NOTIFY_DEVICE_CHECK:
-                pr_debug("Container driver received %s event\n",
-                       (type == ACPI_NOTIFY_BUS_CHECK) ?
-                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
-
-                present = is_device_present(handle);
-                status = acpi_bus_get_device(handle, &device);
-                if (!present) {
-                        if (ACPI_SUCCESS(status)) {
-                                /* device exist and this is a remove request */
-                                device->flags.eject_pending = 1;
-                                kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-                                goto out;
-                        }
-                        break;
-                }
-
-                if (!ACPI_FAILURE(status) || device)
-                        break;
-
-                result = acpi_bus_scan(handle);
-                if (result) {
-                        acpi_handle_warn(handle, "Failed to add container\n");
-                        break;
-                }
-                result = acpi_bus_get_device(handle, &device);
-                if (result) {
-                        acpi_handle_warn(handle, "Missing device object\n");
-                        break;
-                }
-
-                kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
-                ost_code = ACPI_OST_SC_SUCCESS;
-                break;
-
-        case ACPI_NOTIFY_EJECT_REQUEST:
-                if (!acpi_bus_get_device(handle, &device) && device) {
-                        device->flags.eject_pending = 1;
-                        kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
-                        goto out;
-                }
-                break;
-
-        default:
-                /* non-hotplug event; possibly handled by other handler */
-                goto out;
-        }
-
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
-
- out:
-        acpi_scan_lock_release();
-}
-
-static bool is_container(acpi_handle handle)
-{
-        struct acpi_device_info *info;
-        bool ret = false;
-
-        if (ACPI_FAILURE(acpi_get_object_info(handle, &info)))
-                return false;
-
-        if (info->valid & ACPI_VALID_HID) {
-                const struct acpi_device_id *id;
-
-                for (id = container_device_ids; id->id[0]; id++) {
-                        ret = !strcmp((char *)id->id, info->hardware_id.string);
-                        if (ret)
-                                break;
-                }
-        }
-        kfree(info);
-        return ret;
-}
-
-static acpi_status acpi_container_register_notify_handler(acpi_handle handle,
-                                                          u32 lvl, void *ctxt,
-                                                          void **retv)
-{
-        if (is_container(handle))
-                acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
-                                            container_notify_cb, NULL);
-
-        return AE_OK;
-}
-
 void __init acpi_container_init(void)
 {
-        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                            acpi_container_register_notify_handler, NULL,
-                            NULL, NULL);
-
-        acpi_scan_add_handler(&container_device_handler);
+        acpi_scan_add_handler_with_hotplug(&container_handler, "container");
 }
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index dd314ef9bff1..96de787e6104 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -145,27 +145,36 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
         }
 
         /*
-         * Get the device's power state either directly (via _PSC) or
-         * indirectly (via power resources).
+         * Get the device's power state from power resources settings and _PSC,
+         * if available.
          */
+        if (device->power.flags.power_resources) {
+                int error = acpi_power_get_inferred_state(device, &result);
+                if (error)
+                        return error;
+        }
         if (device->power.flags.explicit_get) {
+                acpi_handle handle = device->handle;
                 unsigned long long psc;
-                acpi_status status = acpi_evaluate_integer(device->handle,
-                                                           "_PSC", NULL, &psc);
+                acpi_status status;
+
+                status = acpi_evaluate_integer(handle, "_PSC", NULL, &psc);
                 if (ACPI_FAILURE(status))
                         return -ENODEV;
 
-                result = psc;
-        }
-        /* The test below covers ACPI_STATE_UNKNOWN too. */
-        if (result <= ACPI_STATE_D2) {
-          ; /* Do nothing. */
-        } else if (device->power.flags.power_resources) {
-                int error = acpi_power_get_inferred_state(device, &result);
-                if (error)
-                        return error;
-        } else if (result == ACPI_STATE_D3_HOT) {
-                result = ACPI_STATE_D3;
+                /*
+                 * The power resources settings may indicate a power state
+                 * shallower than the actual power state of the device.
+                 *
+                 * Moreover, on systems predating ACPI 4.0, if the device
+                 * doesn't depend on any power resources and _PSC returns 3,
+                 * that means "power off".  We need to maintain compatibility
+                 * with those systems.
+                 */
+                if (psc > result && psc < ACPI_STATE_D3_COLD)
+                        result = psc;
+                else if (result == ACPI_STATE_UNKNOWN)
+                        result = psc > ACPI_STATE_D2 ? ACPI_STATE_D3_COLD : psc;
         }
 
         /*
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index f815da82c765..8d1c0105e113 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -174,9 +174,13 @@ static int acpi_fan_add(struct acpi_device *device)
 
 static int acpi_fan_remove(struct acpi_device *device)
 {
-        struct thermal_cooling_device *cdev = acpi_driver_data(device);
+        struct thermal_cooling_device *cdev;
+
+        if (!device)
+                return -EINVAL;
 
-        if (!device || !cdev)
+        cdev =  acpi_driver_data(device);
+        if (!cdev)
                 return -EINVAL;
 
         sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 3c94a732b4b3..6f1afd9118c8 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -41,6 +41,17 @@ void acpi_container_init(void);
 #else
 static inline void acpi_container_init(void) {}
 #endif
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+void acpi_memory_hotplug_init(void);
+#else
+static inline void acpi_memory_hotplug_init(void) {}
+#endif
+
+void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
+                                    const char *name);
+int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
+                                       const char *hotplug_profile_name);
+void acpi_scan_hotplug_enabled(struct acpi_hotplug_profile *hotplug, bool val);
 
 #ifdef CONFIG_DEBUG_FS
 extern struct dentry *acpi_debugfs_dir;
@@ -48,6 +59,11 @@ int acpi_debugfs_init(void);
 #else
 static inline void acpi_debugfs_init(void) { return; }
 #endif
+#ifdef CONFIG_X86_INTEL_LPSS
+void acpi_lpss_init(void);
+#else
+static inline void acpi_lpss_init(void) {}
+#endif
 
 /* --------------------------------------------------------------------------
                      Device Node Initialization / Removal
@@ -60,7 +76,7 @@ int acpi_device_add(struct acpi_device *device,
 void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
                              int type, unsigned long long sta);
 void acpi_device_add_finalize(struct acpi_device *device);
-void acpi_free_ids(struct acpi_device *device);
+void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
 
 /* --------------------------------------------------------------------------
                                   Power Resource
@@ -131,4 +147,7 @@ static inline void suspend_nvs_restore(void) {}
   -------------------------------------------------------------------------- */
 struct platform_device;
 
+int acpi_create_platform_device(struct acpi_device *adev,
+                                const struct acpi_device_id *id);
+
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 586e7e993d3d..e72186340fec 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -641,7 +641,7 @@ void __init acpi_initrd_override(void *data, size_t size)
          * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area)
          * works fine.
          */
-        memblock_reserve(acpi_tables_addr, acpi_tables_addr + all_tables_size);
+        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);
@@ -1555,7 +1555,7 @@ int acpi_check_resource_conflict(const struct resource *res)
         else
                 space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY;
 
-        length = res->end - res->start + 1;
+        length = resource_size(res);
         if (acpi_enforce_resources != ENFORCE_RESOURCES_NO)
                 warn = 1;
         clash = acpi_check_address_range(space_id, res->start, length, warn);
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index ab764ed34a50..2652a614deeb 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -354,6 +354,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
 
         }
         resource->end.type = ACPI_RESOURCE_TYPE_END_TAG;
+        resource->end.length = sizeof(struct acpi_resource);
 
         /* Attempt to set the resource */
         status = acpi_set_current_resources(link->device->handle, &buffer);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ac8688b89705..1dd6f6c85874 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -169,8 +169,8 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
                 *control &= OSC_PCI_CONTROL_MASKS;
                 capbuf[OSC_CONTROL_TYPE] = *control | root->osc_control_set;
         } else {
-                /* Run _OSC query for all possible controls. */
-                capbuf[OSC_CONTROL_TYPE] = OSC_PCI_CONTROL_MASKS;
+                /* Run _OSC query only with existing controls. */
+                capbuf[OSC_CONTROL_TYPE] = root->osc_control_set;
         }
 
         status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 34f5ef11d427..f962047c6c85 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -459,57 +459,79 @@ static struct attribute_group attr_groups[] = {
         },
 };
 
-static void acpi_power_hide_list(struct acpi_device *adev, int state)
+static struct attribute_group wakeup_attr_group = {
+        .name = "power_resources_wakeup",
+        .attrs = attrs,
+};
+
+static void acpi_power_hide_list(struct acpi_device *adev,
+                                 struct list_head *resources,
+                                 struct attribute_group *attr_group)
 {
-        struct acpi_device_power_state *ps = &adev->power.states[state];
         struct acpi_power_resource_entry *entry;
 
-        if (list_empty(&ps->resources))
+        if (list_empty(resources))
                 return;
 
-        list_for_each_entry_reverse(entry, &ps->resources, node) {
+        list_for_each_entry_reverse(entry, resources, node) {
                 struct acpi_device *res_dev = &entry->resource->device;
 
                 sysfs_remove_link_from_group(&adev->dev.kobj,
-                                             attr_groups[state].name,
+                                             attr_group->name,
                                              dev_name(&res_dev->dev));
         }
-        sysfs_remove_group(&adev->dev.kobj, &attr_groups[state]);
+        sysfs_remove_group(&adev->dev.kobj, attr_group);
 }
 
-static void acpi_power_expose_list(struct acpi_device *adev, int state)
+static void acpi_power_expose_list(struct acpi_device *adev,
+                                   struct list_head *resources,
+                                   struct attribute_group *attr_group)
 {
-        struct acpi_device_power_state *ps = &adev->power.states[state];
         struct acpi_power_resource_entry *entry;
         int ret;
 
-        if (list_empty(&ps->resources))
+        if (list_empty(resources))
                 return;
 
-        ret = sysfs_create_group(&adev->dev.kobj, &attr_groups[state]);
+        ret = sysfs_create_group(&adev->dev.kobj, attr_group);
         if (ret)
                 return;
 
-        list_for_each_entry(entry, &ps->resources, node) {
+        list_for_each_entry(entry, resources, node) {
                 struct acpi_device *res_dev = &entry->resource->device;
 
                 ret = sysfs_add_link_to_group(&adev->dev.kobj,
-                                              attr_groups[state].name,
+                                              attr_group->name,
                                               &res_dev->dev.kobj,
                                               dev_name(&res_dev->dev));
                 if (ret) {
-                        acpi_power_hide_list(adev, state);
+                        acpi_power_hide_list(adev, resources, attr_group);
                         break;
                 }
         }
 }
 
+static void acpi_power_expose_hide(struct acpi_device *adev,
+                                   struct list_head *resources,
+                                   struct attribute_group *attr_group,
+                                   bool expose)
+{
+        if (expose)
+                acpi_power_expose_list(adev, resources, attr_group);
+        else
+                acpi_power_hide_list(adev, resources, attr_group);
+}
+
 void acpi_power_add_remove_device(struct acpi_device *adev, bool add)
 {
         struct acpi_device_power_state *ps;
         struct acpi_power_resource_entry *entry;
         int state;
 
+        if (adev->wakeup.flags.valid)
+                acpi_power_expose_hide(adev, &adev->wakeup.resources,
+                                       &wakeup_attr_group, add);
+
         if (!adev->power.flags.power_resources)
                 return;
 
@@ -523,12 +545,10 @@ void acpi_power_add_remove_device(struct acpi_device *adev, bool add)
                         acpi_power_remove_dependent(resource, adev);
         }
 
-        for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++) {
-                if (add)
-                        acpi_power_expose_list(adev, state);
-                else
-                        acpi_power_hide_list(adev, state);
-        }
+        for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++)
+                acpi_power_expose_hide(adev,
+                                       &adev->power.states[state].resources,
+                                       &attr_groups[state], add);
 }
 
 int acpi_power_wakeup_list_init(struct list_head *list, int *system_level_p)
@@ -824,7 +844,7 @@ static void acpi_release_power_resource(struct device *dev)
         list_del(&resource->list_node);
         mutex_unlock(&power_resource_list_lock);
 
-        acpi_free_ids(device);
+        acpi_free_pnp_ids(&device->pnp);
         kfree(resource);
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ee255c60bdac..f0df2c9434d2 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -918,7 +918,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 struct cpuidle_driver acpi_idle_driver = {
         .name =         "acpi_idle",
         .owner =        THIS_MODULE,
-        .en_core_tk_irqen = 1,
 };
 
 /**
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 641b5450a0db..e8e652710e65 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -218,9 +218,13 @@ processor_get_max_state(struct thermal_cooling_device *cdev,
                         unsigned long *state)
 {
         struct acpi_device *device = cdev->devdata;
-        struct acpi_processor *pr = acpi_driver_data(device);
+        struct acpi_processor *pr;
 
-        if (!device || !pr)
+        if (!device)
+                return -EINVAL;
+
+        pr = acpi_driver_data(device);
+        if (!pr)
                 return -EINVAL;
 
         *state = acpi_processor_max_state(pr);
@@ -232,9 +236,13 @@ processor_get_cur_state(struct thermal_cooling_device *cdev,
                         unsigned long *cur_state)
 {
         struct acpi_device *device = cdev->devdata;
-        struct acpi_processor *pr = acpi_driver_data(device);
+        struct acpi_processor *pr;
 
-        if (!device || !pr)
+        if (!device)
+                return -EINVAL;
+
+        pr = acpi_driver_data(device);
+        if (!pr)
                 return -EINVAL;
 
         *cur_state = cpufreq_get_cur_state(pr->id);
@@ -248,11 +256,15 @@ processor_set_cur_state(struct thermal_cooling_device *cdev,
                         unsigned long state)
 {
         struct acpi_device *device = cdev->devdata;
-        struct acpi_processor *pr = acpi_driver_data(device);
+        struct acpi_processor *pr;
         int result = 0;
         int max_pstate;
 
-        if (!device || !pr)
+        if (!device)
+                return -EINVAL;
+
+        pr = acpi_driver_data(device);
+        if (!pr)
                 return -EINVAL;
 
         max_pstate = cpufreq_get_max_state(pr->id);
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1d02b7b5ade0..e7dd2c1fee79 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -211,9 +211,10 @@ err_ret:
  */
 void acpi_processor_throttling_init(void)
 {
-        if (acpi_processor_update_tsd_coord())
+        if (acpi_processor_update_tsd_coord()) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                         "Assume no T-state coordination\n"));
+        }
 
         return;
 }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f54d1985e594..fe158fd4f1df 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -63,6 +63,19 @@ int acpi_scan_add_handler(struct acpi_scan_handler *handler)
         return 0;
 }
 
+int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
+                                       const char *hotplug_profile_name)
+{
+        int error;
+
+        error = acpi_scan_add_handler(handler);
+        if (error)
+                return error;
+
+        acpi_sysfs_add_hotplug_profile(&handler->hotplug, hotplug_profile_name);
+        return 0;
+}
+
 /*
  * Creates hid/cid(s) string needed for modalias and uevent
  * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
@@ -107,32 +120,20 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
 
-/**
- * acpi_bus_hot_remove_device: hot-remove a device and its children
- * @context: struct acpi_eject_event pointer (freed in this func)
- *
- * Hot-remove a device and its children. This function frees up the
- * memory space passed by arg context, so that the caller may call
- * this function asynchronously through acpi_os_hotplug_execute().
- */
-void acpi_bus_hot_remove_device(void *context)
+static int acpi_scan_hot_remove(struct acpi_device *device)
 {
-        struct acpi_eject_event *ej_event = context;
-        struct acpi_device *device = ej_event->device;
         acpi_handle handle = device->handle;
-        acpi_handle temp;
+        acpi_handle not_used;
         struct acpi_object_list arg_list;
         union acpi_object arg;
-        acpi_status status = AE_OK;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
-
-        mutex_lock(&acpi_scan_lock);
+        acpi_status status;
+        unsigned long long sta;
 
         /* If there is no handle, the device node has been unregistered. */
-        if (!device->handle) {
+        if (!handle) {
                 dev_dbg(&device->dev, "ACPI handle missing\n");
                 put_device(&device->dev);
-                goto out;
+                return -EINVAL;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -143,7 +144,7 @@ void acpi_bus_hot_remove_device(void *context)
         put_device(&device->dev);
         device = NULL;
 
-        if (ACPI_SUCCESS(acpi_get_handle(handle, "_LCK", &temp))) {
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_LCK", &not_used))) {
                 arg_list.count = 1;
                 arg_list.pointer = &arg;
                 arg.type = ACPI_TYPE_INTEGER;
@@ -161,18 +162,205 @@ void acpi_bus_hot_remove_device(void *context)
          */
         status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
         if (ACPI_FAILURE(status)) {
-                if (status != AE_NOT_FOUND)
-                        acpi_handle_warn(handle, "Eject failed\n");
+                if (status == AE_NOT_FOUND) {
+                        return -ENODEV;
+                } else {
+                        acpi_handle_warn(handle, "Eject failed (0x%x)\n",
+                                                                status);
+                        return -EIO;
+                }
+        }
 
-                /* Tell the firmware the hot-remove operation has failed. */
-                acpi_evaluate_hotplug_ost(handle, ej_event->event,
-                                          ost_code, NULL);
+        /*
+         * Verify if eject was indeed successful.  If not, log an error
+         * message.  No need to call _OST since _EJ0 call was made OK.
+         */
+        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+        if (ACPI_FAILURE(status)) {
+                acpi_handle_warn(handle,
+                        "Status check after eject failed (0x%x)\n", status);
+        } else if (sta & ACPI_STA_DEVICE_ENABLED) {
+                acpi_handle_warn(handle,
+                        "Eject incomplete - status 0x%llx\n", sta);
+        }
+
+        return 0;
+}
+
+static void acpi_bus_device_eject(void *context)
+{
+        acpi_handle handle = context;
+        struct acpi_device *device = NULL;
+        struct acpi_scan_handler *handler;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
+
+        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;
+                goto err_out;
+        }
+        acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
+                                  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+        if (handler->hotplug.mode == AHM_CONTAINER) {
+                device->flags.eject_pending = true;
+                kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
+        } else {
+                int error;
+
+                get_device(&device->dev);
+                error = acpi_scan_hot_remove(device);
+                if (error)
+                        goto err_out;
         }
 
  out:
         mutex_unlock(&acpi_scan_lock);
-        kfree(context);
         return;
+
+ err_out:
+        acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST, ost_code,
+                                  NULL);
+        goto out;
+}
+
+static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
+{
+        struct acpi_device *device = NULL;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
+        int error;
+
+        mutex_lock(&acpi_scan_lock);
+
+        acpi_bus_get_device(handle, &device);
+        if (device) {
+                dev_warn(&device->dev, "Attempt to re-insert\n");
+                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");
+                goto out;
+        }
+        error = acpi_bus_get_device(handle, &device);
+        if (error) {
+                acpi_handle_warn(handle, "Missing device node object\n");
+                goto out;
+        }
+        ost_code = ACPI_OST_SC_SUCCESS;
+        if (device->handler && device->handler->hotplug.mode == AHM_CONTAINER)
+                kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
+
+ out:
+        acpi_evaluate_hotplug_ost(handle, ost_source, ost_code, NULL);
+        mutex_unlock(&acpi_scan_lock);
+}
+
+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;
+
+        switch (type) {
+        case ACPI_NOTIFY_BUS_CHECK:
+                acpi_handle_debug(handle,
+                        "ACPI_NOTIFY_BUS_CHECK event: unsupported\n");
+                ost_status = ACPI_OST_SC_INSERT_NOT_SUPPORTED;
+                break;
+        case ACPI_NOTIFY_DEVICE_CHECK:
+                acpi_handle_debug(handle,
+                        "ACPI_NOTIFY_DEVICE_CHECK event: unsupported\n");
+                ost_status = ACPI_OST_SC_INSERT_NOT_SUPPORTED;
+                break;
+        case ACPI_NOTIFY_EJECT_REQUEST:
+                acpi_handle_debug(handle,
+                        "ACPI_NOTIFY_EJECT_REQUEST event: unsupported\n");
+                ost_status = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
+                break;
+        default:
+                /* non-hotplug event; possibly handled by other handler */
+                return;
+        }
+
+        acpi_evaluate_hotplug_ost(handle, type, ost_status, NULL);
+}
+
+static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
+{
+        acpi_osd_exec_callback callback;
+        struct acpi_scan_handler *handler = data;
+        acpi_status status;
+
+        if (!handler->hotplug.enabled)
+                return acpi_hotplug_unsupported(handle, type);
+
+        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;
+                break;
+        default:
+                /* non-hotplug event; possibly handled by other handler */
+                return;
+        }
+        status = acpi_os_hotplug_execute(callback, handle);
+        if (ACPI_FAILURE(status))
+                acpi_evaluate_hotplug_ost(handle, type,
+                                          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;
+
+        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);
+        kfree(context);
 }
 EXPORT_SYMBOL(acpi_bus_hot_remove_device);
 
@@ -206,51 +394,61 @@ static ssize_t
 acpi_eject_store(struct device *d, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
-        int ret = count;
-        acpi_status status;
-        acpi_object_type type = 0;
         struct acpi_device *acpi_device = to_acpi_device(d);
         struct acpi_eject_event *ej_event;
+        acpi_object_type not_used;
+        acpi_status status;
+        u32 ost_source;
+        int ret;
 
-        if ((!count) || (buf[0] != '1')) {
+        if (!count || buf[0] != '1')
                 return -EINVAL;
-        }
-        if (!acpi_device->driver && !acpi_device->handler) {
-                ret = -ENODEV;
-                goto err;
-        }
-        status = acpi_get_type(acpi_device->handle, &type);
-        if (ACPI_FAILURE(status) || (!acpi_device->flags.ejectable)) {
-                ret = -ENODEV;
-                goto err;
-        }
 
-        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-        if (!ej_event) {
-                ret = -ENOMEM;
-                goto err;
-        }
+        if ((!acpi_device->handler || !acpi_device->handler->hotplug.enabled)
+            && !acpi_device->driver)
+                return -ENODEV;
+
+        status = acpi_get_type(acpi_device->handle, &not_used);
+        if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable)
+                return -ENODEV;
+
+        mutex_lock(&acpi_scan_lock);
 
-        get_device(&acpi_device->dev);
-        ej_event->device = acpi_device;
         if (acpi_device->flags.eject_pending) {
-                /* event originated from ACPI eject notification */
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
+                /* ACPI eject notification event. */
+                ost_source = ACPI_NOTIFY_EJECT_REQUEST;
                 acpi_device->flags.eject_pending = 0;
         } else {
-                /* event originated from user */
-                ej_event->event = ACPI_OST_EC_OSPM_EJECT;
-                (void) acpi_evaluate_hotplug_ost(acpi_device->handle,
-                        ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+                /* Eject initiated by user space. */
+                ost_source = ACPI_OST_EC_OSPM_EJECT;
         }
-
+        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
+        if (!ej_event) {
+                ret = -ENOMEM;
+                goto err_out;
+        }
+        acpi_evaluate_hotplug_ost(acpi_device->handle, ost_source,
+                                  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+        ej_event->device = acpi_device;
+        ej_event->event = ost_source;
+        get_device(&acpi_device->dev);
         status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);
         if (ACPI_FAILURE(status)) {
                 put_device(&acpi_device->dev);
                 kfree(ej_event);
+                ret = status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
+                goto err_out;
         }
-err:
+        ret = count;
+
+ out:
+        mutex_unlock(&acpi_scan_lock);
         return ret;
+
+ err_out:
+        acpi_evaluate_hotplug_ost(acpi_device->handle, ost_source,
+                                  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
+        goto out;
 }
 
 static DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
@@ -376,7 +574,7 @@ static int acpi_device_setup_files(struct acpi_device *dev)
                         goto end;
         }
 
-        if (dev->flags.bus_address)
+        if (dev->pnp.type.bus_address)
                 result = device_create_file(&dev->dev, &dev_attr_adr);
         if (dev->pnp.unique_id)
                 result = device_create_file(&dev->dev, &dev_attr_uid);
@@ -449,7 +647,7 @@ static void acpi_device_remove_files(struct acpi_device *dev)
 
         if (dev->pnp.unique_id)
                 device_remove_file(&dev->dev, &dev_attr_uid);
-        if (dev->flags.bus_address)
+        if (dev->pnp.type.bus_address)
                 device_remove_file(&dev->dev, &dev_attr_adr);
         device_remove_file(&dev->dev, &dev_attr_modalias);
         device_remove_file(&dev->dev, &dev_attr_hid);
@@ -512,17 +710,6 @@ int acpi_match_device_ids(struct acpi_device *device,
 }
 EXPORT_SYMBOL(acpi_match_device_ids);
 
-void acpi_free_ids(struct acpi_device *device)
-{
-        struct acpi_hardware_id *id, *tmp;
-
-        list_for_each_entry_safe(id, tmp, &device->pnp.ids, list) {
-                kfree(id->id);
-                kfree(id);
-        }
-        kfree(device->pnp.unique_id);
-}
-
 static void acpi_free_power_resources_lists(struct acpi_device *device)
 {
         int i;
@@ -543,7 +730,7 @@ static void acpi_device_release(struct device *dev)
 {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
 
-        acpi_free_ids(acpi_dev);
+        acpi_free_pnp_ids(&acpi_dev->pnp);
         acpi_free_power_resources_lists(acpi_dev);
         kfree(acpi_dev);
 }
@@ -1256,19 +1443,17 @@ static void acpi_device_get_busid(struct acpi_device *device)
 }
 
 /*
- * acpi_bay_match - see if a device is an ejectable driver bay
+ * acpi_bay_match - see if an acpi object is an ejectable driver bay
  *
  * If an acpi object is ejectable and has one of the ACPI ATA methods defined,
  * then we can safely call it an ejectable drive bay
  */
-static int acpi_bay_match(struct acpi_device *device){
+static int acpi_bay_match(acpi_handle handle)
+{
         acpi_status status;
-        acpi_handle handle;
         acpi_handle tmp;
         acpi_handle phandle;
 
-        handle = device->handle;
-
         status = acpi_get_handle(handle, "_EJ0", &tmp);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
@@ -1292,12 +1477,12 @@ static int acpi_bay_match(struct acpi_device *device){
 }
 
 /*
- * acpi_dock_match - see if a device has a _DCK method
+ * acpi_dock_match - see if an acpi object has a _DCK method
  */
-static int acpi_dock_match(struct acpi_device *device)
+static int acpi_dock_match(acpi_handle handle)
 {
         acpi_handle tmp;
-        return acpi_get_handle(device->handle, "_DCK", &tmp);
+        return acpi_get_handle(handle, "_DCK", &tmp);
 }
 
 const char *acpi_device_hid(struct acpi_device *device)
@@ -1312,7 +1497,7 @@ const char *acpi_device_hid(struct acpi_device *device)
 }
 EXPORT_SYMBOL(acpi_device_hid);
 
-static void acpi_add_id(struct acpi_device *device, const char *dev_id)
+static void acpi_add_id(struct acpi_device_pnp *pnp, const char *dev_id)
 {
         struct acpi_hardware_id *id;
 
@@ -1326,7 +1511,8 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id)
                 return;
         }
 
-        list_add_tail(&id->list, &device->pnp.ids);
+        list_add_tail(&id->list, &pnp->ids);
+        pnp->type.hardware_id = 1;
 }
 
 /*
@@ -1334,7 +1520,7 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id)
  * lacks the SMBUS01 HID and the methods do not have the necessary "_"
  * prefix.  Work around this.
  */
-static int acpi_ibm_smbus_match(struct acpi_device *device)
+static int acpi_ibm_smbus_match(acpi_handle handle)
 {
         acpi_handle h_dummy;
         struct acpi_buffer path = {ACPI_ALLOCATE_BUFFER, NULL};
@@ -1344,7 +1530,7 @@ static int acpi_ibm_smbus_match(struct acpi_device *device)
                 return -ENODEV;
 
         /* Look for SMBS object */
-        result = acpi_get_name(device->handle, ACPI_SINGLE_NAME, &path);
+        result = acpi_get_name(handle, ACPI_SINGLE_NAME, &path);
         if (result)
                 return result;
 
@@ -1355,48 +1541,50 @@ static int acpi_ibm_smbus_match(struct acpi_device *device)
 
         /* Does it have the necessary (but misnamed) methods? */
         result = -ENODEV;
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "SBI", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "SBR", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "SBW", &h_dummy)))
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "SBI", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(handle, "SBR", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(handle, "SBW", &h_dummy)))
                 result = 0;
 out:
         kfree(path.pointer);
         return result;
 }
 
-static void acpi_device_set_id(struct acpi_device *device)
+static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
+                                int device_type)
 {
         acpi_status status;
         struct acpi_device_info *info;
         struct acpi_pnp_device_id_list *cid_list;
         int i;
 
-        switch (device->device_type) {
+        switch (device_type) {
         case ACPI_BUS_TYPE_DEVICE:
-                if (ACPI_IS_ROOT_DEVICE(device)) {
-                        acpi_add_id(device, ACPI_SYSTEM_HID);
+                if (handle == ACPI_ROOT_OBJECT) {
+                        acpi_add_id(pnp, ACPI_SYSTEM_HID);
                         break;
                 }
 
-                status = acpi_get_object_info(device->handle, &info);
+                status = acpi_get_object_info(handle, &info);
                 if (ACPI_FAILURE(status)) {
-                        printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
+                        pr_err(PREFIX "%s: Error reading device info\n",
+                                        __func__);
                         return;
                 }
 
                 if (info->valid & ACPI_VALID_HID)
-                        acpi_add_id(device, info->hardware_id.string);
+                        acpi_add_id(pnp, info->hardware_id.string);
                 if (info->valid & ACPI_VALID_CID) {
                         cid_list = &info->compatible_id_list;
                         for (i = 0; i < cid_list->count; i++)
-                                acpi_add_id(device, cid_list->ids[i].string);
+                                acpi_add_id(pnp, cid_list->ids[i].string);
                 }
                 if (info->valid & ACPI_VALID_ADR) {
-                        device->pnp.bus_address = info->address;
-                        device->flags.bus_address = 1;
+                        pnp->bus_address = info->address;
+                        pnp->type.bus_address = 1;
                 }
                 if (info->valid & ACPI_VALID_UID)
-                        device->pnp.unique_id = kstrdup(info->unique_id.string,
+                        pnp->unique_id = kstrdup(info->unique_id.string,
                                                         GFP_KERNEL);
 
                 kfree(info);
@@ -1405,40 +1593,50 @@ static void acpi_device_set_id(struct acpi_device *device)
                  * Some devices don't reliably have _HIDs & _CIDs, so add
                  * synthetic HIDs to make sure drivers can find them.
                  */
-                if (acpi_is_video_device(device))
-                        acpi_add_id(device, ACPI_VIDEO_HID);
-                else if (ACPI_SUCCESS(acpi_bay_match(device)))
-                        acpi_add_id(device, ACPI_BAY_HID);
-                else if (ACPI_SUCCESS(acpi_dock_match(device)))
-                        acpi_add_id(device, ACPI_DOCK_HID);
-                else if (!acpi_ibm_smbus_match(device))
-                        acpi_add_id(device, ACPI_SMBUS_IBM_HID);
-                else if (list_empty(&device->pnp.ids) &&
-                         ACPI_IS_ROOT_DEVICE(device->parent)) {
-                        acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
-                        strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
-                        strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
+                if (acpi_is_video_device(handle))
+                        acpi_add_id(pnp, ACPI_VIDEO_HID);
+                else if (ACPI_SUCCESS(acpi_bay_match(handle)))
+                        acpi_add_id(pnp, ACPI_BAY_HID);
+                else if (ACPI_SUCCESS(acpi_dock_match(handle)))
+                        acpi_add_id(pnp, ACPI_DOCK_HID);
+                else if (!acpi_ibm_smbus_match(handle))
+                        acpi_add_id(pnp, ACPI_SMBUS_IBM_HID);
+                else if (list_empty(&pnp->ids) && handle == ACPI_ROOT_OBJECT) {
+                        acpi_add_id(pnp, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
+                        strcpy(pnp->device_name, ACPI_BUS_DEVICE_NAME);
+                        strcpy(pnp->device_class, ACPI_BUS_CLASS);
                 }
 
                 break;
         case ACPI_BUS_TYPE_POWER:
-                acpi_add_id(device, ACPI_POWER_HID);
+                acpi_add_id(pnp, ACPI_POWER_HID);
                 break;
         case ACPI_BUS_TYPE_PROCESSOR:
-                acpi_add_id(device, ACPI_PROCESSOR_OBJECT_HID);
+                acpi_add_id(pnp, ACPI_PROCESSOR_OBJECT_HID);
                 break;
         case ACPI_BUS_TYPE_THERMAL:
-                acpi_add_id(device, ACPI_THERMAL_HID);
+                acpi_add_id(pnp, ACPI_THERMAL_HID);
                 break;
         case ACPI_BUS_TYPE_POWER_BUTTON:
-                acpi_add_id(device, ACPI_BUTTON_HID_POWERF);
+                acpi_add_id(pnp, ACPI_BUTTON_HID_POWERF);
                 break;
         case ACPI_BUS_TYPE_SLEEP_BUTTON:
-                acpi_add_id(device, ACPI_BUTTON_HID_SLEEPF);
+                acpi_add_id(pnp, ACPI_BUTTON_HID_SLEEPF);
                 break;
         }
 }
 
+void acpi_free_pnp_ids(struct acpi_device_pnp *pnp)
+{
+        struct acpi_hardware_id *id, *tmp;
+
+        list_for_each_entry_safe(id, tmp, &pnp->ids, list) {
+                kfree(id->id);
+                kfree(id);
+        }
+        kfree(pnp->unique_id);
+}
+
 void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
                              int type, unsigned long long sta)
 {
@@ -1448,7 +1646,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
         device->parent = acpi_bus_get_parent(handle);
         STRUCT_TO_INT(device->status) = sta;
         acpi_device_get_busid(device);
-        acpi_device_set_id(device);
+        acpi_set_pnp_ids(handle, &device->pnp, type);
         acpi_bus_get_flags(device);
         device->flags.match_driver = false;
         device_initialize(&device->dev);
@@ -1536,6 +1734,75 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
         return 0;
 }
 
+static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
+                                       char *idstr,
+                                       const struct acpi_device_id **matchid)
+{
+        const struct acpi_device_id *devid;
+
+        for (devid = handler->ids; devid->id[0]; devid++)
+                if (!strcmp((char *)devid->id, idstr)) {
+                        if (matchid)
+                                *matchid = devid;
+
+                        return true;
+                }
+
+        return false;
+}
+
+static struct acpi_scan_handler *acpi_scan_match_handler(char *idstr,
+                                        const struct acpi_device_id **matchid)
+{
+        struct acpi_scan_handler *handler;
+
+        list_for_each_entry(handler, &acpi_scan_handlers_list, list_node)
+                if (acpi_scan_handler_matching(handler, idstr, matchid))
+                        return handler;
+
+        return NULL;
+}
+
+void acpi_scan_hotplug_enabled(struct acpi_hotplug_profile *hotplug, bool val)
+{
+        if (!!hotplug->enabled == !!val)
+                return;
+
+        mutex_lock(&acpi_scan_lock);
+
+        hotplug->enabled = val;
+
+        mutex_unlock(&acpi_scan_lock);
+}
+
+static void acpi_scan_init_hotplug(acpi_handle handle, int type)
+{
+        struct acpi_device_pnp pnp = {};
+        struct acpi_hardware_id *hwid;
+        struct acpi_scan_handler *handler;
+
+        INIT_LIST_HEAD(&pnp.ids);
+        acpi_set_pnp_ids(handle, &pnp, type);
+
+        if (!pnp.type.hardware_id)
+                return;
+
+        /*
+         * This relies on the fact that acpi_install_notify_handler() will not
+         * install the same notify handler routine twice for the same handle.
+         */
+        list_for_each_entry(hwid, &pnp.ids, list) {
+                handler = acpi_scan_match_handler(hwid->id, NULL);
+                if (handler) {
+                        acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+                                        acpi_hotplug_notify_cb, handler);
+                        break;
+                }
+        }
+
+        acpi_free_pnp_ids(&pnp);
+}
+
 static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
                                       void *not_used, void **return_value)
 {
@@ -1558,6 +1825,8 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
                 return AE_OK;
         }
 
+        acpi_scan_init_hotplug(handle, type);
+
         if (!(sta & ACPI_STA_DEVICE_PRESENT) &&
             !(sta & ACPI_STA_DEVICE_FUNCTIONING)) {
                 struct acpi_device_wakeup wakeup;
@@ -1583,42 +1852,26 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
         return AE_OK;
 }
 
-static int acpi_scan_do_attach_handler(struct acpi_device *device, char *id)
+static int acpi_scan_attach_handler(struct acpi_device *device)
 {
-        struct acpi_scan_handler *handler;
+        struct acpi_hardware_id *hwid;
+        int ret = 0;
 
-        list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) {
+        list_for_each_entry(hwid, &device->pnp.ids, list) {
                 const struct acpi_device_id *devid;
+                struct acpi_scan_handler *handler;
 
-                for (devid = handler->ids; devid->id[0]; devid++) {
-                        int ret;
-
-                        if (strcmp((char *)devid->id, id))
-                                continue;
-
+                handler = acpi_scan_match_handler(hwid->id, &devid);
+                if (handler) {
                         ret = handler->attach(device, devid);
                         if (ret > 0) {
                                 device->handler = handler;
-                                return ret;
+                                break;
                         } else if (ret < 0) {
-                                return ret;
+                                break;
                         }
                 }
         }
-        return 0;
-}
-
-static int acpi_scan_attach_handler(struct acpi_device *device)
-{
-        struct acpi_hardware_id *hwid;
-        int ret = 0;
-
-        list_for_each_entry(hwid, &device->pnp.ids, list) {
-                ret = acpi_scan_do_attach_handler(device, hwid->id);
-                if (ret)
-                        break;
-
-        }
         return ret;
 }
 
@@ -1788,8 +2041,10 @@ int __init acpi_scan_init(void)
         acpi_pci_root_init();
         acpi_pci_link_init();
         acpi_platform_init();
+        acpi_lpss_init();
         acpi_csrt_init();
         acpi_container_init();
+        acpi_memory_hotplug_init();
 
         mutex_lock(&acpi_scan_lock);
         /*
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 41c0504470db..fcae5fa2e1b3 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -7,6 +7,8 @@
 #include <linux/moduleparam.h>
 #include <acpi/acpi_drivers.h>
 
+#include "internal.h"
+
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("sysfs");
 
@@ -249,6 +251,7 @@ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
 static LIST_HEAD(acpi_table_attr_list);
 static struct kobject *tables_kobj;
 static struct kobject *dynamic_tables_kobj;
+static struct kobject *hotplug_kobj;
 
 struct acpi_table_attr {
         struct bin_attribute attr;
@@ -716,6 +719,67 @@ acpi_show_profile(struct device *dev, struct device_attribute *attr,
 static const struct device_attribute pm_profile_attr =
         __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
 
+static ssize_t hotplug_enabled_show(struct kobject *kobj,
+                                    struct kobj_attribute *attr, char *buf)
+{
+        struct acpi_hotplug_profile *hotplug = to_acpi_hotplug_profile(kobj);
+
+        return sprintf(buf, "%d\n", hotplug->enabled);
+}
+
+static ssize_t hotplug_enabled_store(struct kobject *kobj,
+                                     struct kobj_attribute *attr,
+                                     const char *buf, size_t size)
+{
+        struct acpi_hotplug_profile *hotplug = to_acpi_hotplug_profile(kobj);
+        unsigned int val;
+
+        if (kstrtouint(buf, 10, &val) || val > 1)
+                return -EINVAL;
+
+        acpi_scan_hotplug_enabled(hotplug, val);
+        return size;
+}
+
+static struct kobj_attribute hotplug_enabled_attr =
+        __ATTR(enabled, S_IRUGO | S_IWUSR, hotplug_enabled_show,
+                hotplug_enabled_store);
+
+static struct attribute *hotplug_profile_attrs[] = {
+        &hotplug_enabled_attr.attr,
+        NULL
+};
+
+static struct kobj_type acpi_hotplug_profile_ktype = {
+        .sysfs_ops = &kobj_sysfs_ops,
+        .default_attrs = hotplug_profile_attrs,
+};
+
+void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
+                                    const char *name)
+{
+        int error;
+
+        if (!hotplug_kobj)
+                goto err_out;
+
+        kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype);
+        error = kobject_set_name(&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;
+
+        kobject_uevent(&hotplug->kobj, KOBJ_ADD);
+        return;
+
+ err_out:
+        pr_err(PREFIX "Unable to add hotplug profile '%s'\n", name);
+}
+
 int __init acpi_sysfs_init(void)
 {
         int result;
@@ -723,6 +787,8 @@ int __init acpi_sysfs_init(void)
         result = acpi_tables_sysfs_init();
         if (result)
                 return result;
+
+        hotplug_kobj = kobject_create_and_add("hotplug", acpi_kobj);
         result = sysfs_create_file(acpi_kobj, &pm_profile_attr.attr);
         return result;
 }
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 8470771e5eae..a33821ca3895 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -723,9 +723,19 @@ static int thermal_get_trend(struct thermal_zone_device *thermal,
                 return -EINVAL;
 
         if (type == THERMAL_TRIP_ACTIVE) {
-                /* aggressive active cooling */
-                *trend = THERMAL_TREND_RAISING;
-                return 0;
+                unsigned long trip_temp;
+                unsigned long temp = KELVIN_TO_MILLICELSIUS(tz->temperature,
+                                                        tz->kelvin_offset);
+                if (thermal_get_trip_temp(thermal, trip, &trip_temp))
+                        return -EINVAL;
+
+                if (temp > trip_temp) {
+                        *trend = THERMAL_TREND_RAISING;
+                        return 0;
+                } else {
+                        /* Fall back on default trend */
+                        return -EINVAL;
+                }
         }
 
         /*
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 313f959413dc..c3932d0876e0 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -167,7 +167,8 @@ struct acpi_video_device_flags {
         u8 dvi:1;
         u8 bios:1;
         u8 unknown:1;
-        u8 reserved:2;
+        u8 notify:1;
+        u8 reserved:1;
 };
 
 struct acpi_video_device_cap {
@@ -222,7 +223,7 @@ static int acpi_video_device_lcd_set_level(struct acpi_video_device *device,
                         int level);
 static int acpi_video_device_lcd_get_level_current(
                         struct acpi_video_device *device,
-                        unsigned long long *level, int init);
+                        unsigned long long *level, bool raw);
 static int acpi_video_get_next_level(struct acpi_video_device *device,
                                      u32 level_current, u32 event);
 static int acpi_video_switch_brightness(struct acpi_video_device *device,
@@ -236,7 +237,7 @@ static int acpi_video_get_brightness(struct backlight_device *bd)
         struct acpi_video_device *vd =
                 (struct acpi_video_device *)bl_get_data(bd);
 
-        if (acpi_video_device_lcd_get_level_current(vd, &cur_level, 0))
+        if (acpi_video_device_lcd_get_level_current(vd, &cur_level, false))
                 return -EINVAL;
         for (i = 2; i < vd->brightness->count; i++) {
                 if (vd->brightness->levels[i] == cur_level)
@@ -281,7 +282,7 @@ static int video_get_cur_state(struct thermal_cooling_device *cooling_dev, unsig
         unsigned long long level;
         int offset;
 
-        if (acpi_video_device_lcd_get_level_current(video, &level, 0))
+        if (acpi_video_device_lcd_get_level_current(video, &level, false))
                 return -EINVAL;
         for (offset = 2; offset < video->brightness->count; offset++)
                 if (level == video->brightness->levels[offset]) {
@@ -447,12 +448,45 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"),
                 },
         },
+        {
+         .callback = video_ignore_initial_backlight,
+         .ident = "HP Pavilion dm4",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dm4 Notebook PC"),
+                },
+        },
         {}
 };
 
+static unsigned long long
+acpi_video_bqc_value_to_level(struct acpi_video_device *device,
+                              unsigned long long bqc_value)
+{
+        unsigned long long level;
+
+        if (device->brightness->flags._BQC_use_index) {
+                /*
+                 * _BQC returns an index that doesn't account for
+                 * the first 2 items with special meaning, so we need
+                 * to compensate for that by offsetting ourselves
+                 */
+                if (device->brightness->flags._BCL_reversed)
+                        bqc_value = device->brightness->count - 3 - bqc_value;
+
+                level = device->brightness->levels[bqc_value + 2];
+        } else {
+                level = bqc_value;
+        }
+
+        level += bqc_offset_aml_bug_workaround;
+
+        return level;
+}
+
 static int
 acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
-                                        unsigned long long *level, int init)
+                                        unsigned long long *level, bool raw)
 {
         acpi_status status = AE_OK;
         int i;
@@ -463,29 +497,30 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
                 status = acpi_evaluate_integer(device->dev->handle, buf,
                                                 NULL, level);
                 if (ACPI_SUCCESS(status)) {
-                        if (device->brightness->flags._BQC_use_index) {
-                                if (device->brightness->flags._BCL_reversed)
-                                        *level = device->brightness->count
-                                                                 - 3 - (*level);
-                                *level = device->brightness->levels[*level + 2];
-
+                        if (raw) {
+                                /*
+                                 * Caller has indicated he wants the raw
+                                 * value returned by _BQC, so don't furtherly
+                                 * mess with the value.
+                                 */
+                                return 0;
                         }
-                        *level += bqc_offset_aml_bug_workaround;
+
+                        *level = acpi_video_bqc_value_to_level(device, *level);
+
                         for (i = 2; i < device->brightness->count; i++)
                                 if (device->brightness->levels[i] == *level) {
                                         device->brightness->curr = *level;
                                         return 0;
                         }
-                        if (!init) {
-                                /*
-                                 * BQC returned an invalid level.
-                                 * Stop using it.
-                                 */
-                                ACPI_WARNING((AE_INFO,
-                                              "%s returned an invalid level",
-                                              buf));
-                                device->cap._BQC = device->cap._BCQ = 0;
-                        }
+                        /*
+                         * BQC returned an invalid level.
+                         * Stop using it.
+                         */
+                        ACPI_WARNING((AE_INFO,
+                                      "%s returned an invalid level",
+                                      buf));
+                        device->cap._BQC = device->cap._BCQ = 0;
                 } else {
                         /* Fixme:
                          * should we return an error or ignore this failure?
@@ -598,6 +633,56 @@ acpi_video_cmp_level(const void *a, const void *b)
 }
 
 /*
+ * Decides if _BQC/_BCQ for this system is usable
+ *
+ * We do this by changing the level first and then read out the current
+ * brightness level, if the value does not match, find out if it is using
+ * index. If not, clear the _BQC/_BCQ capability.
+ */
+static int acpi_video_bqc_quirk(struct acpi_video_device *device,
+                                int max_level, int current_level)
+{
+        struct acpi_video_device_brightness *br = device->brightness;
+        int result;
+        unsigned long long level;
+        int test_level;
+
+        /* don't mess with existing known broken systems */
+        if (bqc_offset_aml_bug_workaround)
+                return 0;
+
+        /*
+         * Some systems always report current brightness level as maximum
+         * through _BQC, we need to test another value for them.
+         */
+        test_level = current_level == max_level ? br->levels[2] : max_level;
+
+        result = acpi_video_device_lcd_set_level(device, test_level);
+        if (result)
+                return result;
+
+        result = acpi_video_device_lcd_get_level_current(device, &level, true);
+        if (result)
+                return result;
+
+        if (level != test_level) {
+                /* buggy _BQC found, need to find out if it uses index */
+                if (level < br->count) {
+                        if (br->flags._BCL_reversed)
+                                level = br->count - 3 - level;
+                        if (br->levels[level + 2] == test_level)
+                                br->flags._BQC_use_index = 1;
+                }
+
+                if (!br->flags._BQC_use_index)
+                        device->cap._BQC = device->cap._BCQ = 0;
+        }
+
+        return 0;
+}
+
+
+/*
  *  Arg:        
  *      device  : video output device (LCD, CRT, ..)
  *
@@ -703,42 +788,36 @@ acpi_video_init_brightness(struct acpi_video_device *device)
         if (!device->cap._BQC)
                 goto set_level;
 
-        result = acpi_video_device_lcd_get_level_current(device, &level_old, 1);
-        if (result)
-                goto out_free_levels;
-
-        /*
-         * Set the level to maximum and check if _BQC uses indexed value
-         */
-        result = acpi_video_device_lcd_set_level(device, max_level);
+        result = acpi_video_device_lcd_get_level_current(device,
+                                                         &level_old, true);
         if (result)
                 goto out_free_levels;
 
-        result = acpi_video_device_lcd_get_level_current(device, &level, 0);
+        result = acpi_video_bqc_quirk(device, max_level, level_old);
         if (result)
                 goto out_free_levels;
+        /*
+         * cap._BQC may get cleared due to _BQC is found to be broken
+         * in acpi_video_bqc_quirk, so check again here.
+         */
+        if (!device->cap._BQC)
+                goto set_level;
 
-        br->flags._BQC_use_index = (level == max_level ? 0 : 1);
-
-        if (!br->flags._BQC_use_index) {
+        if (use_bios_initial_backlight) {
+                level = acpi_video_bqc_value_to_level(device, level_old);
                 /*
-                 * Set the backlight to the initial state.
-                 * On some buggy laptops, _BQC returns an uninitialized value
-                 * when invoked for the first time, i.e. level_old is invalid.
-                 * set the backlight to max_level in this case
+                 * On some buggy laptops, _BQC returns an uninitialized
+                 * value when invoked for the first time, i.e.
+                 * level_old is invalid (no matter whether it's a level
+                 * or an index). Set the backlight to max_level in this case.
                  */
-                if (use_bios_initial_backlight) {
-                        for (i = 2; i < br->count; i++)
-                                if (level_old == br->levels[i])
-                                        level = level_old;
-                }
-                goto set_level;
+                for (i = 2; i < br->count; i++)
+                        if (level_old == br->levels[i])
+                                break;
+                if (i == br->count)
+                        level = max_level;
         }
 
-        if (br->flags._BCL_reversed)
-                level_old = (br->count - 1) - level_old;
-        level = br->levels[level_old];
-
 set_level:
         result = acpi_video_device_lcd_set_level(device, level);
         if (result)
@@ -996,53 +1075,51 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
         struct acpi_video_device *data;
         struct acpi_video_device_attrib* attribute;
 
-        if (!device || !video)
-                return -EINVAL;
-
         status =
             acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-        if (ACPI_SUCCESS(status)) {
-
-                data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
-                if (!data)
-                        return -ENOMEM;
-
-                strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
-                strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
-                device->driver_data = data;
-
-                data->device_id = device_id;
-                data->video = video;
-                data->dev = device;
+        /* Some device omits _ADR, we skip them instead of fail */
+        if (ACPI_FAILURE(status))
+                return 0;
 
-                attribute = acpi_video_get_device_attr(video, device_id);
+        data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
 
-                if((attribute != NULL) && attribute->device_id_scheme) {
-                        switch (attribute->display_type) {
-                        case ACPI_VIDEO_DISPLAY_CRT:
-                                data->flags.crt = 1;
-                                break;
-                        case ACPI_VIDEO_DISPLAY_TV:
-                                data->flags.tvout = 1;
-                                break;
-                        case ACPI_VIDEO_DISPLAY_DVI:
-                                data->flags.dvi = 1;
-                                break;
-                        case ACPI_VIDEO_DISPLAY_LCD:
-                                data->flags.lcd = 1;
-                                break;
-                        default:
-                                data->flags.unknown = 1;
-                                break;
-                        }
-                        if(attribute->bios_can_detect)
-                                data->flags.bios = 1;
-                } else {
-                        /* Check for legacy IDs */
-                        device_type = acpi_video_get_device_type(video,
-                                                                 device_id);
-                        /* Ignore bits 16 and 18-20 */
-                        switch (device_type & 0xffe2ffff) {
+        strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
+        strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
+        device->driver_data = data;
+
+        data->device_id = device_id;
+        data->video = video;
+        data->dev = device;
+
+        attribute = acpi_video_get_device_attr(video, device_id);
+
+        if((attribute != NULL) && attribute->device_id_scheme) {
+                switch (attribute->display_type) {
+                case ACPI_VIDEO_DISPLAY_CRT:
+                        data->flags.crt = 1;
+                        break;
+                case ACPI_VIDEO_DISPLAY_TV:
+                        data->flags.tvout = 1;
+                        break;
+                case ACPI_VIDEO_DISPLAY_DVI:
+                        data->flags.dvi = 1;
+                        break;
+                case ACPI_VIDEO_DISPLAY_LCD:
+                        data->flags.lcd = 1;
+                        break;
+                default:
+                        data->flags.unknown = 1;
+                        break;
+                }
+                if(attribute->bios_can_detect)
+                        data->flags.bios = 1;
+        } else {
+                /* Check for legacy IDs */
+                device_type = acpi_video_get_device_type(video, device_id);
+                /* Ignore bits 16 and 18-20 */
+                switch (device_type & 0xffe2ffff) {
                         case ACPI_VIDEO_DISPLAY_LEGACY_MONITOR:
                                 data->flags.crt = 1;
                                 break;
@@ -1054,34 +1131,24 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                                 break;
                         default:
                                 data->flags.unknown = 1;
-                        }
                 }
+        }
 
-                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)) {
-                        printk(KERN_ERR PREFIX
-                                          "Error installing notify handler\n");
-                        if(data->brightness)
-                                kfree(data->brightness->levels);
-                        kfree(data->brightness);
-                        kfree(data);
-                        return -ENODEV;
-                }
+        acpi_video_device_bind(video, data);
+        acpi_video_device_find_cap(data);
 
-                mutex_lock(&video->device_list_lock);
-                list_add_tail(&data->entry, &video->video_device_list);
-                mutex_unlock(&video->device_list_lock);
+        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;
 
-                return 0;
-        }
+        mutex_lock(&video->device_list_lock);
+        list_add_tail(&data->entry, &video->video_device_list);
+        mutex_unlock(&video->device_list_lock);
 
-        return -ENOENT;
+        return status;
 }
 
 /*
@@ -1268,7 +1335,8 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event)
                 goto out;
 
         result = acpi_video_device_lcd_get_level_current(device,
-                                                         &level_current, 0);
+                                                         &level_current,
+                                                         false);
         if (result)
                 goto out;
 
@@ -1373,9 +1441,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
 
                 status = acpi_video_bus_get_one_device(dev, video);
                 if (status) {
-                        printk(KERN_WARNING PREFIX
-                                        "Can't attach device\n");
-                        continue;
+                        dev_err(&dev->dev, "Can't attach device\n");
+                        break;
                 }
         }
         return status;
@@ -1388,13 +1455,14 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
         if (!device || !device->video)
                 return -ENOENT;
 
-        status = acpi_remove_notify_handler(device->dev->handle,
-                                            ACPI_DEVICE_NOTIFY,
-                                            acpi_video_device_notify);
-        if (ACPI_FAILURE(status)) {
-                printk(KERN_WARNING PREFIX
-                       "Can't remove video notify handler\n");
+        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;
@@ -1676,7 +1744,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
 
         error = acpi_video_bus_get_devices(video, device);
         if (error)
-                goto err_free_video;
+                goto err_put_video;
 
         video->input = input = input_allocate_device();
         if (!input) {
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 4ac2593234e7..66f67626f02e 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -67,40 +67,37 @@ acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,
         return 0;
 }
 
-/* Returns true if the device is a video device which can be handled by
- * video.ko.
+/* Returns true if the ACPI object is a video device which can be
+ * handled by video.ko.
  * The device will get a Linux specific CID added in scan.c to
  * identify the device as an ACPI graphics device
  * Be aware that the graphics device may not be physically present
  * Use acpi_video_get_capabilities() to detect general ACPI video
  * capabilities of present cards
  */
-long acpi_is_video_device(struct acpi_device *device)
+long acpi_is_video_device(acpi_handle handle)
 {
         acpi_handle h_dummy;
         long video_caps = 0;
 
-        if (!device)
-                return 0;
-
         /* Is this device able to support video switching ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) ||
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_DOD", &h_dummy)) ||
+            ACPI_SUCCESS(acpi_get_handle(handle, "_DOS", &h_dummy)))
                 video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING;
 
         /* Is this device able to retrieve a video ROM ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_ROM", &h_dummy)))
                 video_caps |= ACPI_VIDEO_ROM_AVAILABLE;
 
         /* Is this device able to configure which video head to be POSTed ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_VPO", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(handle, "_GPD", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(handle, "_SPD", &h_dummy)))
                 video_caps |= ACPI_VIDEO_DEVICE_POSTING;
 
         /* Only check for backlight functionality if one of the above hit. */
         if (video_caps)
-                acpi_walk_namespace(ACPI_TYPE_DEVICE, device->handle,
+                acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
                                     ACPI_UINT32_MAX, acpi_backlight_cap_match, NULL,
                                     &video_caps, NULL);
 
@@ -127,7 +124,7 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
                 if (!dev)
                         return AE_OK;
                 pci_dev_put(dev);
-                *cap |= acpi_is_video_device(acpi_dev);
+                *cap |= acpi_is_video_device(handle);
         }
         return AE_OK;
 }
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 9a6b05a35603..7072404c8b6d 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -920,7 +920,7 @@ static int pm_genpd_prepare(struct device *dev)
                 pm_wakeup_event(dev, 0);
 
         if (pm_wakeup_pending()) {
-                pm_runtime_put_sync(dev);
+                pm_runtime_put(dev);
                 return -EBUSY;
         }
 
@@ -961,7 +961,7 @@ static int pm_genpd_prepare(struct device *dev)
                 pm_runtime_enable(dev);
         }
 
-        pm_runtime_put_sync(dev);
+        pm_runtime_put(dev);
         return ret;
 }
 
@@ -1327,7 +1327,7 @@ static void pm_genpd_complete(struct device *dev)
                 pm_generic_complete(dev);
                 pm_runtime_set_active(dev);
                 pm_runtime_enable(dev);
-                pm_runtime_idle(dev);
+                pm_request_idle(dev);
         }
 }
 
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index d03d290f31c2..bfd898b8988e 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -324,6 +324,6 @@ void pm_generic_complete(struct device *dev)
          * Let runtime PM try to suspend devices that haven't been in use before
          * going into the system-wide sleep state we're resuming from.
          */
-        pm_runtime_idle(dev);
+        pm_request_idle(dev);
 }
 #endif /* CONFIG_PM_SLEEP */
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 15beb500a4e4..5a9b6569dd74 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -756,7 +756,7 @@ static void device_complete(struct device *dev, pm_message_t state)
 
         device_unlock(dev);
 
-        pm_runtime_put_sync(dev);
+        pm_runtime_put(dev);
 }
 
 /**
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 32ee0fc7ea54..f0077cb8e249 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -55,6 +55,7 @@
  * @rate:       Frequency in hertz
  * @u_volt:     Nominal voltage in microvolts corresponding to this OPP
  * @dev_opp:    points back to the device_opp struct this opp belongs to
+ * @head:       RCU callback head used for deferred freeing
  *
  * This structure stores the OPP information for a given device.
  */
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 1244930e3d7a..ef13ad08afb2 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -1400,5 +1400,5 @@ void pm_runtime_remove(struct device *dev)
         if (dev->power.runtime_status == RPM_ACTIVE)
                 pm_runtime_set_suspended(dev);
         if (dev->power.irq_safe && dev->parent)
-                pm_runtime_put_sync(dev->parent);
+                pm_runtime_put(dev->parent);
 }
diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
index f9ba4fab0ddc..04781389d0fb 100644
--- a/drivers/clk/x86/Makefile
+++ b/drivers/clk/x86/Makefile
@@ -1,2 +1,2 @@
-clk-x86-lpss-objs               := clk-lpss.o clk-lpt.o
+clk-x86-lpss-objs               := clk-lpt.o
 obj-$(CONFIG_X86_INTEL_LPSS)    += clk-x86-lpss.o
diff --git a/drivers/clk/x86/clk-lpss.c b/drivers/clk/x86/clk-lpss.c
deleted file mode 100644
index b5e229f3c3d9..000000000000
--- a/drivers/clk/x86/clk-lpss.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Intel Low Power Subsystem clocks.
- *
- * Copyright (C) 2013, Intel Corporation
- * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
- *          Heikki Krogerus <heikki.krogerus@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/acpi.h>
-#include <linux/clk.h>
-#include <linux/clk-provider.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/module.h>
-
-static int clk_lpss_is_mmio_resource(struct acpi_resource *res, void *data)
-{
-        struct resource r;
-        return !acpi_dev_resource_memory(res, &r);
-}
-
-static acpi_status clk_lpss_find_mmio(acpi_handle handle, u32 level,
-                                      void *data, void **retval)
-{
-        struct resource_list_entry *rentry;
-        struct list_head resource_list;
-        struct acpi_device *adev;
-        const char *uid = data;
-        int ret;
-
-        if (acpi_bus_get_device(handle, &adev))
-                return AE_OK;
-
-        if (uid) {
-                if (!adev->pnp.unique_id)
-                        return AE_OK;
-                if (strcmp(uid, adev->pnp.unique_id))
-                        return AE_OK;
-        }
-
-        INIT_LIST_HEAD(&resource_list);
-        ret = acpi_dev_get_resources(adev, &resource_list,
-                                     clk_lpss_is_mmio_resource, NULL);
-        if (ret < 0)
-                return AE_NO_MEMORY;
-
-        list_for_each_entry(rentry, &resource_list, node)
-                if (resource_type(&rentry->res) == IORESOURCE_MEM) {
-                        *(struct resource *)retval = rentry->res;
-                        break;
-                }
-
-        acpi_dev_free_resource_list(&resource_list);
-        return AE_OK;
-}
-
-/**
- * clk_register_lpss_gate - register LPSS clock gate
- * @name: name of this clock gate
- * @parent_name: parent clock name
- * @hid: ACPI _HID of the device
- * @uid: ACPI _UID of the device (optional)
- * @offset: LPSS PRV_CLOCK_PARAMS offset
- *
- * Creates and registers LPSS clock gate.
- */
-struct clk *clk_register_lpss_gate(const char *name, const char *parent_name,
-                                   const char *hid, const char *uid,
-                                   unsigned offset)
-{
-        struct resource res = { };
-        void __iomem *mmio_base;
-        acpi_status status;
-        struct clk *clk;
-
-        /*
-         * First try to look the device and its mmio resource from the
-         * ACPI namespace.
-         */
-        status = acpi_get_devices(hid, clk_lpss_find_mmio, (void *)uid,
-                                  (void **)&res);
-        if (ACPI_FAILURE(status) || !res.start)
-                return ERR_PTR(-ENODEV);
-
-        mmio_base = ioremap(res.start, resource_size(&res));
-        if (!mmio_base)
-                return ERR_PTR(-ENOMEM);
-
-        clk = clk_register_gate(NULL, name, parent_name, 0, mmio_base + offset,
-                                0, 0, NULL);
-        if (IS_ERR(clk))
-                iounmap(mmio_base);
-
-        return clk;
-}
diff --git a/drivers/clk/x86/clk-lpss.h b/drivers/clk/x86/clk-lpss.h
deleted file mode 100644
index e9460f442297..000000000000
--- a/drivers/clk/x86/clk-lpss.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Intel Low Power Subsystem clock.
- *
- * Copyright (C) 2013, Intel Corporation
- * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
- *          Heikki Krogerus <heikki.krogerus@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __CLK_LPSS_H
-#define __CLK_LPSS_H
-
-#include <linux/err.h>
-#include <linux/errno.h>
-#include <linux/clk.h>
-
-#ifdef CONFIG_ACPI
-extern struct clk *clk_register_lpss_gate(const char *name,
-                                          const char *parent_name,
-                                          const char *hid, const char *uid,
-                                          unsigned offset);
-#else
-static inline struct clk *clk_register_lpss_gate(const char *name,
-                                                 const char *parent_name,
-                                                 const char *hid,
-                                                 const char *uid,
-                                                 unsigned offset)
-{
-        return ERR_PTR(-ENODEV);
-}
-#endif
-
-#endif /* __CLK_LPSS_H */
diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c
index 81298aeef7e3..5cf4f4686406 100644
--- a/drivers/clk/x86/clk-lpt.c
+++ b/drivers/clk/x86/clk-lpt.c
@@ -10,7 +10,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
@@ -18,8 +17,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include "clk-lpss.h"
-
 #define PRV_CLOCK_PARAMS 0x800
 
 static int lpt_clk_probe(struct platform_device *pdev)
@@ -34,40 +31,6 @@ static int lpt_clk_probe(struct platform_device *pdev)
 
         /* Shared DMA clock */
         clk_register_clkdev(clk, "hclk", "INTL9C60.0.auto");
-
-        /* SPI clocks */
-        clk = clk_register_lpss_gate("spi0_clk", "lpss_clk", "INT33C0", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C0:00");
-
-        clk = clk_register_lpss_gate("spi1_clk", "lpss_clk", "INT33C1", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C1:00");
-
-        /* I2C clocks */
-        clk = clk_register_lpss_gate("i2c0_clk", "lpss_clk", "INT33C2", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C2:00");
-
-        clk = clk_register_lpss_gate("i2c1_clk", "lpss_clk", "INT33C3", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C3:00");
-
-        /* UART clocks */
-        clk = clk_register_lpss_gate("uart0_clk", "lpss_clk", "INT33C4", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C4:00");
-
-        clk = clk_register_lpss_gate("uart1_clk", "lpss_clk", "INT33C5", NULL,
-                                     PRV_CLOCK_PARAMS);
-        if (!IS_ERR(clk))
-                clk_register_clkdev(clk, NULL, "INT33C5:00");
-
         return 0;
 }
 
@@ -79,8 +42,7 @@ static struct platform_driver lpt_clk_driver = {
         .probe = lpt_clk_probe,
 };
 
-static int __init lpt_clk_init(void)
+int __init lpt_clk_init(void)
 {
         return platform_driver_register(&lpt_clk_driver);
 }
-arch_initcall(lpt_clk_init);
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index cbcb21e32771..a1488f58f6ca 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -205,10 +205,99 @@ depends on ARM
 source "drivers/cpufreq/Kconfig.arm"
 endmenu
 
+menu "AVR32 CPU frequency scaling drivers"
+depends on AVR32
+
+config AVR32_AT32AP_CPUFREQ
+        bool "CPU frequency driver for AT32AP"
+        depends on PLATFORM_AT32AP
+        default n
+        help
+          This enables the CPU frequency driver for AT32AP processors.
+          If in doubt, say N.
+
+endmenu
+
+menu "CPUFreq processor drivers"
+depends on IA64
+
+config IA64_ACPI_CPUFREQ
+        tristate "ACPI Processor P-States driver"
+        select CPU_FREQ_TABLE
+        depends on ACPI_PROCESSOR
+        help
+        This driver adds a CPUFreq driver which utilizes the ACPI
+        Processor Performance States.
+
+        For details, take a look at <file:Documentation/cpu-freq/>.
+
+        If in doubt, say N.
+
+endmenu
+
+menu "MIPS CPUFreq processor drivers"
+depends on MIPS
+
+config LOONGSON2_CPUFREQ
+        tristate "Loongson2 CPUFreq Driver"
+        select CPU_FREQ_TABLE
+        help
+          This option adds a CPUFreq driver for loongson processors which
+          support software configurable cpu frequency.
+
+          Loongson2F and it's successors support this feature.
+
+          For details, take a look at <file:Documentation/cpu-freq/>.
+
+          If in doubt, say N.
+
+endmenu
+
 menu "PowerPC CPU frequency scaling drivers"
 depends on PPC32 || PPC64
 source "drivers/cpufreq/Kconfig.powerpc"
 endmenu
 
+menu "SPARC CPU frequency scaling drivers"
+depends on SPARC64
+config SPARC_US3_CPUFREQ
+        tristate "UltraSPARC-III CPU Frequency driver"
+        select CPU_FREQ_TABLE
+        help
+          This adds the CPUFreq driver for UltraSPARC-III processors.
+
+          For details, take a look at <file:Documentation/cpu-freq>.
+
+          If in doubt, say N.
+
+config SPARC_US2E_CPUFREQ
+        tristate "UltraSPARC-IIe CPU Frequency driver"
+        select CPU_FREQ_TABLE
+        help
+          This adds the CPUFreq driver for UltraSPARC-IIe processors.
+
+          For details, take a look at <file:Documentation/cpu-freq>.
+
+          If in doubt, say N.
+endmenu
+
+menu "SH CPU Frequency scaling"
+depends on SUPERH
+config SH_CPU_FREQ
+        tristate "SuperH CPU Frequency driver"
+        select CPU_FREQ_TABLE
+        help
+          This adds the cpufreq driver for SuperH. Any CPU that supports
+          clock rate rounding through the clock framework can use this
+          driver. While it will make the kernel slightly larger, this is
+          harmless for CPUs that don't support rate rounding. The driver
+          will also generate a notice in the boot log before disabling
+          itself if the CPU in question is not capable of rate rounding.
+
+          For details, take a look at <file:Documentation/cpu-freq>.
+
+          If unsure, say N.
+endmenu
+
 endif
 endmenu
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 030ddf6dd3f1..f3af18b9acc5 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -2,6 +2,93 @@
 # ARM CPU Frequency scaling drivers
 #
 
+config ARM_BIG_LITTLE_CPUFREQ
+        tristate
+        depends on ARM_CPU_TOPOLOGY
+
+config ARM_DT_BL_CPUFREQ
+        tristate "Generic ARM big LITTLE CPUfreq driver probed via DT"
+        select ARM_BIG_LITTLE_CPUFREQ
+        depends on OF && HAVE_CLK
+        help
+          This enables the Generic CPUfreq driver for ARM big.LITTLE platform.
+          This gets frequency tables from DT.
+
+config ARM_EXYNOS_CPUFREQ
+        bool "SAMSUNG EXYNOS SoCs"
+        depends on ARCH_EXYNOS
+        default y
+        help
+          This adds the CPUFreq driver common part for Samsung
+          EXYNOS SoCs.
+
+          If in doubt, say N.
+
+config ARM_EXYNOS4210_CPUFREQ
+        def_bool CPU_EXYNOS4210
+        help
+          This adds the CPUFreq driver for Samsung EXYNOS4210
+          SoC (S5PV310 or S5PC210).
+
+config ARM_EXYNOS4X12_CPUFREQ
+        def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+        help
+          This adds the CPUFreq driver for Samsung EXYNOS4X12
+          SoC (EXYNOS4212 or EXYNOS4412).
+
+config ARM_EXYNOS5250_CPUFREQ
+        def_bool SOC_EXYNOS5250
+        help
+          This adds the CPUFreq driver for Samsung EXYNOS5250
+          SoC.
+
+config ARM_EXYNOS5440_CPUFREQ
+        def_bool SOC_EXYNOS5440
+        depends on HAVE_CLK && PM_OPP && OF
+        help
+          This adds the CPUFreq driver for Samsung EXYNOS5440
+          SoC. The nature of exynos5440 clock controller is
+          different than previous exynos controllers so not using
+          the common exynos framework.
+
+config ARM_HIGHBANK_CPUFREQ
+        tristate "Calxeda Highbank-based"
+        depends on ARCH_HIGHBANK
+        select CPU_FREQ_TABLE
+        select GENERIC_CPUFREQ_CPU0
+        select PM_OPP
+        select REGULATOR
+
+        default m
+        help
+          This adds the CPUFreq driver for Calxeda Highbank SoC
+          based boards.
+
+          If in doubt, say N.
+
+config ARM_IMX6Q_CPUFREQ
+        tristate "Freescale i.MX6Q cpufreq support"
+        depends on SOC_IMX6Q
+        depends on REGULATOR_ANATOP
+        help
+          This adds cpufreq driver support for Freescale i.MX6Q SOC.
+
+          If in doubt, say N.
+
+config ARM_INTEGRATOR
+        tristate "CPUfreq driver for ARM Integrator CPUs"
+        depends on ARCH_INTEGRATOR
+        default y
+        help
+          This enables the CPUfreq driver for ARM Integrator CPUs.
+          If in doubt, say Y.
+
+config ARM_KIRKWOOD_CPUFREQ
+        def_bool ARCH_KIRKWOOD && OF
+        help
+          This adds the CPUFreq driver for Marvell Kirkwood
+          SoCs.
+
 config ARM_OMAP2PLUS_CPUFREQ
         bool "TI OMAP2+"
         depends on ARCH_OMAP2PLUS
@@ -42,6 +129,7 @@ config ARM_S3C64XX_CPUFREQ
 config ARM_S5PV210_CPUFREQ
         bool "Samsung S5PV210 and S5PC110"
         depends on CPU_S5PV210
+        select CPU_FREQ_TABLE
         default y
         help
           This adds the CPUFreq driver for Samsung S5PV210 and
@@ -49,48 +137,11 @@ config ARM_S5PV210_CPUFREQ
 
           If in doubt, say N.
 
-config ARM_EXYNOS_CPUFREQ
-        bool "SAMSUNG EXYNOS SoCs"
-        depends on ARCH_EXYNOS
-        default y
-        help
-          This adds the CPUFreq driver common part for Samsung
-          EXYNOS SoCs.
-
-          If in doubt, say N.
+config ARM_SA1100_CPUFREQ
+        bool
 
-config ARM_EXYNOS4210_CPUFREQ
-        def_bool CPU_EXYNOS4210
-        help
-          This adds the CPUFreq driver for Samsung EXYNOS4210
-          SoC (S5PV310 or S5PC210).
-
-config ARM_EXYNOS4X12_CPUFREQ
-        def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
-        help
-          This adds the CPUFreq driver for Samsung EXYNOS4X12
-          SoC (EXYNOS4212 or EXYNOS4412).
-
-config ARM_EXYNOS5250_CPUFREQ
-        def_bool SOC_EXYNOS5250
-        help
-          This adds the CPUFreq driver for Samsung EXYNOS5250
-          SoC.
-
-config ARM_KIRKWOOD_CPUFREQ
-        def_bool ARCH_KIRKWOOD && OF
-        help
-          This adds the CPUFreq driver for Marvell Kirkwood
-          SoCs.
-
-config ARM_IMX6Q_CPUFREQ
-        tristate "Freescale i.MX6Q cpufreq support"
-        depends on SOC_IMX6Q
-        depends on REGULATOR_ANATOP
-        help
-          This adds cpufreq driver support for Freescale i.MX6Q SOC.
-
-          If in doubt, say N.
+config ARM_SA1110_CPUFREQ
+        bool
 
 config ARM_SPEAR_CPUFREQ
         bool "SPEAr CPUFreq support"
@@ -98,18 +149,3 @@ config ARM_SPEAR_CPUFREQ
         default y
         help
           This adds the CPUFreq driver support for SPEAr SOCs.
-
-config ARM_HIGHBANK_CPUFREQ
-        tristate "Calxeda Highbank-based"
-        depends on ARCH_HIGHBANK
-        select CPU_FREQ_TABLE
-        select GENERIC_CPUFREQ_CPU0
-        select PM_OPP
-        select REGULATOR
-
-        default m
-        help
-          This adds the CPUFreq driver for Calxeda Highbank SoC
-          based boards.
-
-          If in doubt, say N.
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index e76992f79683..9c926ca0d718 100644
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -1,3 +1,21 @@
+config CPU_FREQ_CBE
+        tristate "CBE frequency scaling"
+        depends on CBE_RAS && PPC_CELL
+        default m
+        help
+          This adds the cpufreq driver for Cell BE processors.
+          For details, take a look at <file:Documentation/cpu-freq/>.
+          If you don't have such processor, say N
+
+config CPU_FREQ_CBE_PMI
+        bool "CBE frequency scaling using PMI interface"
+        depends on CPU_FREQ_CBE
+        default n
+        help
+          Select this, if you want to use the PMI interface to switch
+          frequencies. Using PMI, the processor will not only be able to run at
+          lower speed, but also at lower core voltage.
+
 config CPU_FREQ_MAPLE
         bool "Support for Maple 970FX Evaluation Board"
         depends on PPC_MAPLE
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index d7dc0ed6adb0..2b8a8c374548 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -129,6 +129,23 @@ config X86_POWERNOW_K8
 
           For details, take a look at <file:Documentation/cpu-freq/>.
 
+config X86_AMD_FREQ_SENSITIVITY
+        tristate "AMD frequency sensitivity feedback powersave bias"
+        depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD
+        help
+          This adds AMD-specific powersave bias function to the ondemand
+          governor, which allows it to make more power-conscious frequency
+          change decisions based on feedback from hardware (availble on AMD
+          Family 16h and above).
+
+          Hardware feedback tells software how "sensitive" to frequency changes
+          the CPUs' workloads are. CPU-bound workloads will be more sensitive
+          -- they will perform better as frequency increases. Memory/IO-bound
+          workloads will be less sensitive -- they will not necessarily perform
+          better as frequency increases.
+
+          If in doubt, say N.
+
 config X86_GX_SUSPMOD
         tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"
         depends on X86_32 && PCI
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 863fd1865d45..315b9231feb1 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -41,23 +41,54 @@ obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)	+= speedstep-centrino.o
 obj-$(CONFIG_X86_P4_CLOCKMOD)           += p4-clockmod.o
 obj-$(CONFIG_X86_CPUFREQ_NFORCE2)       += cpufreq-nforce2.o
 obj-$(CONFIG_X86_INTEL_PSTATE)          += intel_pstate.o
+obj-$(CONFIG_X86_AMD_FREQ_SENSITIVITY)  += amd_freq_sensitivity.o
 
 ##################################################################################
 # ARM SoC drivers
+obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ)    += arm_big_little.o
+# big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big
+# LITTLE drivers, so that it is probed last.
+obj-$(CONFIG_ARM_DT_BL_CPUFREQ)         += arm_big_little_dt.o
+
+obj-$(CONFIG_ARCH_DAVINCI_DA850)        += davinci-cpufreq.o
 obj-$(CONFIG_UX500_SOC_DB8500)          += dbx500-cpufreq.o
-obj-$(CONFIG_ARM_S3C2416_CPUFREQ)       += s3c2416-cpufreq.o
-obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)       += s3c64xx-cpufreq.o
-obj-$(CONFIG_ARM_S5PV210_CPUFREQ)       += s5pv210-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)        += exynos-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)    += exynos4210-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)    += exynos4x12-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)    += exynos5250-cpufreq.o
+obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ)    += exynos5440-cpufreq.o
+obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)      += highbank-cpufreq.o
+obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)         += imx6q-cpufreq.o
+obj-$(CONFIG_ARM_INTEGRATOR)            += integrator-cpufreq.o
 obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)      += kirkwood-cpufreq.o
 obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)     += omap-cpufreq.o
+obj-$(CONFIG_PXA25x)                    += pxa2xx-cpufreq.o
+obj-$(CONFIG_PXA27x)                    += pxa2xx-cpufreq.o
+obj-$(CONFIG_PXA3xx)                    += pxa3xx-cpufreq.o
+obj-$(CONFIG_ARM_S3C2416_CPUFREQ)       += s3c2416-cpufreq.o
+obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)       += s3c64xx-cpufreq.o
+obj-$(CONFIG_ARM_S5PV210_CPUFREQ)       += s5pv210-cpufreq.o
+obj-$(CONFIG_ARM_SA1100_CPUFREQ)        += sa1100-cpufreq.o
+obj-$(CONFIG_ARM_SA1110_CPUFREQ)        += sa1110-cpufreq.o
 obj-$(CONFIG_ARM_SPEAR_CPUFREQ)         += spear-cpufreq.o
-obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)      += highbank-cpufreq.o
-obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)         += imx6q-cpufreq.o
+obj-$(CONFIG_ARCH_TEGRA)                += tegra-cpufreq.o
 
 ##################################################################################
 # PowerPC platform drivers
+obj-$(CONFIG_CPU_FREQ_CBE)              += ppc-cbe-cpufreq.o
+ppc-cbe-cpufreq-y                       += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o
+obj-$(CONFIG_CPU_FREQ_CBE_PMI)          += ppc_cbe_cpufreq_pmi.o
 obj-$(CONFIG_CPU_FREQ_MAPLE)            += maple-cpufreq.o
+
+##################################################################################
+# Other platform drivers
+obj-$(CONFIG_AVR32_AT32AP_CPUFREQ)      += at32ap-cpufreq.o
+obj-$(CONFIG_BLACKFIN)                  += blackfin-cpufreq.o
+obj-$(CONFIG_CRIS_MACH_ARTPEC3)         += cris-artpec3-cpufreq.o
+obj-$(CONFIG_ETRAXFS)                   += cris-etraxfs-cpufreq.o
+obj-$(CONFIG_IA64_ACPI_CPUFREQ)         += ia64-acpi-cpufreq.o
+obj-$(CONFIG_LOONGSON2_CPUFREQ)         += loongson2_cpufreq.o
+obj-$(CONFIG_SH_CPU_FREQ)               += sh-cpufreq.o
+obj-$(CONFIG_SPARC_US2E_CPUFREQ)        += sparc-us2e-cpufreq.o
+obj-$(CONFIG_SPARC_US3_CPUFREQ)         += sparc-us3-cpufreq.o
+obj-$(CONFIG_UNICORE32)                 += unicore2-cpufreq.o
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 57a8774f0b4e..11b8b4b54ceb 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -423,7 +423,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
         struct drv_cmd cmd;
         unsigned int next_state = 0; /* Index into freq_table */
         unsigned int next_perf_state = 0; /* Index into perf table */
-        unsigned int i;
         int result = 0;
 
         pr_debug("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
@@ -486,10 +485,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = perf->states[perf->state].core_frequency * 1000;
         freqs.new = data->freq_table[next_state].frequency;
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         drv_write(&cmd);
 
@@ -502,10 +498,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                 }
         }
 
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         perf->state = next_perf_state;
 
 out:
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
new file mode 100644
index 000000000000..f6b79ab0070b
--- /dev/null
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -0,0 +1,148 @@
+/*
+ * amd_freq_sensitivity.c: AMD frequency sensitivity feedback powersave bias
+ *                         for the ondemand governor.
+ *
+ * Copyright (C) 2013 Advanced Micro Devices, Inc.
+ *
+ * Author: Jacob Shin <jacob.shin@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/percpu-defs.h>
+#include <linux/init.h>
+#include <linux/mod_devicetable.h>
+
+#include <asm/msr.h>
+#include <asm/cpufeature.h>
+
+#include "cpufreq_governor.h"
+
+#define MSR_AMD64_FREQ_SENSITIVITY_ACTUAL       0xc0010080
+#define MSR_AMD64_FREQ_SENSITIVITY_REFERENCE    0xc0010081
+#define CLASS_CODE_SHIFT                        56
+#define POWERSAVE_BIAS_MAX                      1000
+#define POWERSAVE_BIAS_DEF                      400
+
+struct cpu_data_t {
+        u64 actual;
+        u64 reference;
+        unsigned int freq_prev;
+};
+
+static DEFINE_PER_CPU(struct cpu_data_t, cpu_data);
+
+static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,
+                                              unsigned int freq_next,
+                                              unsigned int relation)
+{
+        int sensitivity;
+        long d_actual, d_reference;
+        struct msr actual, reference;
+        struct cpu_data_t *data = &per_cpu(cpu_data, policy->cpu);
+        struct dbs_data *od_data = policy->governor_data;
+        struct od_dbs_tuners *od_tuners = od_data->tuners;
+        struct od_cpu_dbs_info_s *od_info =
+                od_data->cdata->get_cpu_dbs_info_s(policy->cpu);
+
+        if (!od_info->freq_table)
+                return freq_next;
+
+        rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_ACTUAL,
+                &actual.l, &actual.h);
+        rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_REFERENCE,
+                &reference.l, &reference.h);
+        actual.h &= 0x00ffffff;
+        reference.h &= 0x00ffffff;
+
+        /* counter wrapped around, so stay on current frequency */
+        if (actual.q < data->actual || reference.q < data->reference) {
+                freq_next = policy->cur;
+                goto out;
+        }
+
+        d_actual = actual.q - data->actual;
+        d_reference = reference.q - data->reference;
+
+        /* divide by 0, so stay on current frequency as well */
+        if (d_reference == 0) {
+                freq_next = policy->cur;
+                goto out;
+        }
+
+        sensitivity = POWERSAVE_BIAS_MAX -
+                (POWERSAVE_BIAS_MAX * (d_reference - d_actual) / d_reference);
+
+        clamp(sensitivity, 0, POWERSAVE_BIAS_MAX);
+
+        /* this workload is not CPU bound, so choose a lower freq */
+        if (sensitivity < od_tuners->powersave_bias) {
+                if (data->freq_prev == policy->cur)
+                        freq_next = policy->cur;
+
+                if (freq_next > policy->cur)
+                        freq_next = policy->cur;
+                else if (freq_next < policy->cur)
+                        freq_next = policy->min;
+                else {
+                        unsigned int index;
+
+                        cpufreq_frequency_table_target(policy,
+                                od_info->freq_table, policy->cur - 1,
+                                CPUFREQ_RELATION_H, &index);
+                        freq_next = od_info->freq_table[index].frequency;
+                }
+
+                data->freq_prev = freq_next;
+        } else
+                data->freq_prev = 0;
+
+out:
+        data->actual = actual.q;
+        data->reference = reference.q;
+        return freq_next;
+}
+
+static int __init amd_freq_sensitivity_init(void)
+{
+        u64 val;
+
+        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+                return -ENODEV;
+
+        if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))
+                return -ENODEV;
+
+        if (rdmsrl_safe(MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, &val))
+                return -ENODEV;
+
+        if (!(val >> CLASS_CODE_SHIFT))
+                return -ENODEV;
+
+        od_register_powersave_bias_handler(amd_powersave_bias_target,
+                        POWERSAVE_BIAS_DEF);
+        return 0;
+}
+late_initcall(amd_freq_sensitivity_init);
+
+static void __exit amd_freq_sensitivity_exit(void)
+{
+        od_unregister_powersave_bias_handler();
+}
+module_exit(amd_freq_sensitivity_exit);
+
+static const struct x86_cpu_id amd_freq_sensitivity_ids[] = {
+        X86_FEATURE_MATCH(X86_FEATURE_PROC_FEEDBACK),
+        {}
+};
+MODULE_DEVICE_TABLE(x86cpu, amd_freq_sensitivity_ids);
+
+MODULE_AUTHOR("Jacob Shin <jacob.shin@amd.com>");
+MODULE_DESCRIPTION("AMD frequency sensitivity feedback powersave bias for "
+                "the ondemand governor.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
new file mode 100644
index 000000000000..dbdf677d2f36
--- /dev/null
+++ b/drivers/cpufreq/arm_big_little.c
@@ -0,0 +1,278 @@
+/*
+ * ARM big.LITTLE Platforms CPUFreq support
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ * Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
+ *
+ * Copyright (C) 2013 Linaro.
+ * Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/clk.h>
+#include <linux/cpu.h>
+#include <linux/cpufreq.h>
+#include <linux/cpumask.h>
+#include <linux/export.h>
+#include <linux/of_platform.h>
+#include <linux/opp.h>
+#include <linux/slab.h>
+#include <linux/topology.h>
+#include <linux/types.h>
+
+#include "arm_big_little.h"
+
+/* Currently we support only two clusters */
+#define MAX_CLUSTERS    2
+
+static struct cpufreq_arm_bL_ops *arm_bL_ops;
+static struct clk *clk[MAX_CLUSTERS];
+static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS];
+static atomic_t cluster_usage[MAX_CLUSTERS] = {ATOMIC_INIT(0), ATOMIC_INIT(0)};
+
+static int cpu_to_cluster(int cpu)
+{
+        return topology_physical_package_id(cpu);
+}
+
+static unsigned int bL_cpufreq_get(unsigned int cpu)
+{
+        u32 cur_cluster = cpu_to_cluster(cpu);
+
+        return clk_get_rate(clk[cur_cluster]) / 1000;
+}
+
+/* Validate policy frequency range */
+static int bL_cpufreq_verify_policy(struct cpufreq_policy *policy)
+{
+        u32 cur_cluster = cpu_to_cluster(policy->cpu);
+
+        return cpufreq_frequency_table_verify(policy, freq_table[cur_cluster]);
+}
+
+/* Set clock frequency */
+static int bL_cpufreq_set_target(struct cpufreq_policy *policy,
+                unsigned int target_freq, unsigned int relation)
+{
+        struct cpufreq_freqs freqs;
+        u32 cpu = policy->cpu, freq_tab_idx, cur_cluster;
+        int ret = 0;
+
+        cur_cluster = cpu_to_cluster(policy->cpu);
+
+        freqs.old = bL_cpufreq_get(policy->cpu);
+
+        /* Determine valid target frequency using freq_table */
+        cpufreq_frequency_table_target(policy, freq_table[cur_cluster],
+                        target_freq, relation, &freq_tab_idx);
+        freqs.new = freq_table[cur_cluster][freq_tab_idx].frequency;
+
+        pr_debug("%s: cpu: %d, cluster: %d, oldfreq: %d, target freq: %d, new freq: %d\n",
+                        __func__, cpu, cur_cluster, freqs.old, target_freq,
+                        freqs.new);
+
+        if (freqs.old == freqs.new)
+                return 0;
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
+        ret = clk_set_rate(clk[cur_cluster], freqs.new * 1000);
+        if (ret) {
+                pr_err("clk_set_rate failed: %d\n", ret);
+                return ret;
+        }
+
+        policy->cur = freqs.new;
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+
+        return ret;
+}
+
+static void put_cluster_clk_and_freq_table(struct device *cpu_dev)
+{
+        u32 cluster = cpu_to_cluster(cpu_dev->id);
+
+        if (!atomic_dec_return(&cluster_usage[cluster])) {
+                clk_put(clk[cluster]);
+                opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]);
+                dev_dbg(cpu_dev, "%s: cluster: %d\n", __func__, cluster);
+        }
+}
+
+static int get_cluster_clk_and_freq_table(struct device *cpu_dev)
+{
+        u32 cluster = cpu_to_cluster(cpu_dev->id);
+        char name[14] = "cpu-cluster.";
+        int ret;
+
+        if (atomic_inc_return(&cluster_usage[cluster]) != 1)
+                return 0;
+
+        ret = arm_bL_ops->init_opp_table(cpu_dev);
+        if (ret) {
+                dev_err(cpu_dev, "%s: init_opp_table failed, cpu: %d, err: %d\n",
+                                __func__, cpu_dev->id, ret);
+                goto atomic_dec;
+        }
+
+        ret = opp_init_cpufreq_table(cpu_dev, &freq_table[cluster]);
+        if (ret) {
+                dev_err(cpu_dev, "%s: failed to init cpufreq table, cpu: %d, err: %d\n",
+                                __func__, cpu_dev->id, ret);
+                goto atomic_dec;
+        }
+
+        name[12] = cluster + '0';
+        clk[cluster] = clk_get_sys(name, NULL);
+        if (!IS_ERR(clk[cluster])) {
+                dev_dbg(cpu_dev, "%s: clk: %p & freq table: %p, cluster: %d\n",
+                                __func__, clk[cluster], freq_table[cluster],
+                                cluster);
+                return 0;
+        }
+
+        dev_err(cpu_dev, "%s: Failed to get clk for cpu: %d, cluster: %d\n",
+                        __func__, cpu_dev->id, cluster);
+        ret = PTR_ERR(clk[cluster]);
+        opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]);
+
+atomic_dec:
+        atomic_dec(&cluster_usage[cluster]);
+        dev_err(cpu_dev, "%s: Failed to get data for cluster: %d\n", __func__,
+                        cluster);
+        return ret;
+}
+
+/* Per-CPU initialization */
+static int bL_cpufreq_init(struct cpufreq_policy *policy)
+{
+        u32 cur_cluster = cpu_to_cluster(policy->cpu);
+        struct device *cpu_dev;
+        int ret;
+
+        cpu_dev = get_cpu_device(policy->cpu);
+        if (!cpu_dev) {
+                pr_err("%s: failed to get cpu%d device\n", __func__,
+                                policy->cpu);
+                return -ENODEV;
+        }
+
+        ret = get_cluster_clk_and_freq_table(cpu_dev);
+        if (ret)
+                return ret;
+
+        ret = cpufreq_frequency_table_cpuinfo(policy, freq_table[cur_cluster]);
+        if (ret) {
+                dev_err(cpu_dev, "CPU %d, cluster: %d invalid freq table\n",
+                                policy->cpu, cur_cluster);
+                put_cluster_clk_and_freq_table(cpu_dev);
+                return ret;
+        }
+
+        cpufreq_frequency_table_get_attr(freq_table[cur_cluster], policy->cpu);
+
+        if (arm_bL_ops->get_transition_latency)
+                policy->cpuinfo.transition_latency =
+                        arm_bL_ops->get_transition_latency(cpu_dev);
+        else
+                policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
+        policy->cur = bL_cpufreq_get(policy->cpu);
+
+        cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu));
+
+        dev_info(cpu_dev, "CPU %d initialized\n", policy->cpu);
+        return 0;
+}
+
+static int bL_cpufreq_exit(struct cpufreq_policy *policy)
+{
+        struct device *cpu_dev;
+
+        cpu_dev = get_cpu_device(policy->cpu);
+        if (!cpu_dev) {
+                pr_err("%s: failed to get cpu%d device\n", __func__,
+                                policy->cpu);
+                return -ENODEV;
+        }
+
+        put_cluster_clk_and_freq_table(cpu_dev);
+        dev_dbg(cpu_dev, "%s: Exited, cpu: %d\n", __func__, policy->cpu);
+
+        return 0;
+}
+
+/* Export freq_table to sysfs */
+static struct freq_attr *bL_cpufreq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
+static struct cpufreq_driver bL_cpufreq_driver = {
+        .name                   = "arm-big-little",
+        .flags                  = CPUFREQ_STICKY,
+        .verify                 = bL_cpufreq_verify_policy,
+        .target                 = bL_cpufreq_set_target,
+        .get                    = bL_cpufreq_get,
+        .init                   = bL_cpufreq_init,
+        .exit                   = bL_cpufreq_exit,
+        .have_governor_per_policy = true,
+        .attr                   = bL_cpufreq_attr,
+};
+
+int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops)
+{
+        int ret;
+
+        if (arm_bL_ops) {
+                pr_debug("%s: Already registered: %s, exiting\n", __func__,
+                                arm_bL_ops->name);
+                return -EBUSY;
+        }
+
+        if (!ops || !strlen(ops->name) || !ops->init_opp_table) {
+                pr_err("%s: Invalid arm_bL_ops, exiting\n", __func__);
+                return -ENODEV;
+        }
+
+        arm_bL_ops = ops;
+
+        ret = cpufreq_register_driver(&bL_cpufreq_driver);
+        if (ret) {
+                pr_info("%s: Failed registering platform driver: %s, err: %d\n",
+                                __func__, ops->name, ret);
+                arm_bL_ops = NULL;
+        } else {
+                pr_info("%s: Registered platform driver: %s\n", __func__,
+                                ops->name);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(bL_cpufreq_register);
+
+void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops)
+{
+        if (arm_bL_ops != ops) {
+                pr_err("%s: Registered with: %s, can't unregister, exiting\n",
+                                __func__, arm_bL_ops->name);
+                return;
+        }
+
+        cpufreq_unregister_driver(&bL_cpufreq_driver);
+        pr_info("%s: Un-registered platform driver: %s\n", __func__,
+                        arm_bL_ops->name);
+        arm_bL_ops = NULL;
+}
+EXPORT_SYMBOL_GPL(bL_cpufreq_unregister);
diff --git a/drivers/cpufreq/arm_big_little.h b/drivers/cpufreq/arm_big_little.h
new file mode 100644
index 000000000000..70f18fc12d4a
--- /dev/null
+++ b/drivers/cpufreq/arm_big_little.h
@@ -0,0 +1,40 @@
+/*
+ * ARM big.LITTLE platform's CPUFreq header file
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ * Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
+ *
+ * Copyright (C) 2013 Linaro.
+ * Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#ifndef CPUFREQ_ARM_BIG_LITTLE_H
+#define CPUFREQ_ARM_BIG_LITTLE_H
+
+#include <linux/cpufreq.h>
+#include <linux/device.h>
+#include <linux/types.h>
+
+struct cpufreq_arm_bL_ops {
+        char name[CPUFREQ_NAME_LEN];
+        int (*get_transition_latency)(struct device *cpu_dev);
+
+        /*
+         * This must set opp table for cpu_dev in a similar way as done by
+         * of_init_opp_table().
+         */
+        int (*init_opp_table)(struct device *cpu_dev);
+};
+
+int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops);
+void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops);
+
+#endif /* CPUFREQ_ARM_BIG_LITTLE_H */
diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c
new file mode 100644
index 000000000000..44be3115375c
--- /dev/null
+++ b/drivers/cpufreq/arm_big_little_dt.c
@@ -0,0 +1,107 @@
+/*
+ * Generic big.LITTLE CPUFreq Interface driver
+ *
+ * It provides necessary ops to arm_big_little cpufreq driver and gets
+ * Frequency information from Device Tree. Freq table in DT must be in KHz.
+ *
+ * Copyright (C) 2013 Linaro.
+ * Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/cpufreq.h>
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/opp.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include "arm_big_little.h"
+
+static int dt_init_opp_table(struct device *cpu_dev)
+{
+        struct device_node *np, *parent;
+        int count = 0, ret;
+
+        parent = of_find_node_by_path("/cpus");
+        if (!parent) {
+                pr_err("failed to find OF /cpus\n");
+                return -ENOENT;
+        }
+
+        for_each_child_of_node(parent, np) {
+                if (count++ != cpu_dev->id)
+                        continue;
+                if (!of_get_property(np, "operating-points", NULL)) {
+                        ret = -ENODATA;
+                } else {
+                        cpu_dev->of_node = np;
+                        ret = of_init_opp_table(cpu_dev);
+                }
+                of_node_put(np);
+                of_node_put(parent);
+
+                return ret;
+        }
+
+        return -ENODEV;
+}
+
+static int dt_get_transition_latency(struct device *cpu_dev)
+{
+        struct device_node *np, *parent;
+        u32 transition_latency = CPUFREQ_ETERNAL;
+        int count = 0;
+
+        parent = of_find_node_by_path("/cpus");
+        if (!parent) {
+                pr_err("failed to find OF /cpus\n");
+                return -ENOENT;
+        }
+
+        for_each_child_of_node(parent, np) {
+                if (count++ != cpu_dev->id)
+                        continue;
+
+                of_property_read_u32(np, "clock-latency", &transition_latency);
+                of_node_put(np);
+                of_node_put(parent);
+
+                return 0;
+        }
+
+        return -ENODEV;
+}
+
+static struct cpufreq_arm_bL_ops dt_bL_ops = {
+        .name   = "dt-bl",
+        .get_transition_latency = dt_get_transition_latency,
+        .init_opp_table = dt_init_opp_table,
+};
+
+static int generic_bL_init(void)
+{
+        return bL_cpufreq_register(&dt_bL_ops);
+}
+module_init(generic_bL_init);
+
+static void generic_bL_exit(void)
+{
+        return bL_cpufreq_unregister(&dt_bL_ops);
+}
+module_exit(generic_bL_exit);
+
+MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");
+MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver via DT");
+MODULE_LICENSE("GPL");
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/drivers/cpufreq/at32ap-cpufreq.c
index 18b765629a0c..654488723cb5 100644
--- a/arch/avr32/mach-at32ap/cpufreq.c
+++ b/drivers/cpufreq/at32ap-cpufreq.c
@@ -61,7 +61,6 @@ static int at32_set_target(struct cpufreq_policy *policy,
 
         freqs.old = at32_get_speed(0);
         freqs.new = (freq + 500) / 1000;
-        freqs.cpu = 0;
         freqs.flags = 0;
 
         if (!ref_freq) {
@@ -69,7 +68,7 @@ static int at32_set_target(struct cpufreq_policy *policy,
                 loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy;
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         if (freqs.old < freqs.new)
                 boot_cpu_data.loops_per_jiffy = cpufreq_scale(
                                 loops_per_jiffy_ref, ref_freq, freqs.new);
@@ -77,7 +76,7 @@ static int at32_set_target(struct cpufreq_policy *policy,
         if (freqs.new < freqs.old)
                 boot_cpu_data.loops_per_jiffy = cpufreq_scale(
                                 loops_per_jiffy_ref, ref_freq, freqs.new);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         pr_debug("cpufreq: set frequency %lu Hz\n", freq);
 
diff --git a/arch/blackfin/mach-common/cpufreq.c b/drivers/cpufreq/blackfin-cpufreq.c
index d88bd31319e6..995511e80bef 100644
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/drivers/cpufreq/blackfin-cpufreq.c
@@ -127,13 +127,13 @@ unsigned long cpu_set_cclk(int cpu, unsigned long new)
 }
 #endif
 
-static int bfin_target(struct cpufreq_policy *poli,
+static int bfin_target(struct cpufreq_policy *policy,
                         unsigned int target_freq, unsigned int relation)
 {
 #ifndef CONFIG_BF60x
         unsigned int plldiv;
 #endif
-        unsigned int index, cpu;
+        unsigned int index;
         unsigned long cclk_hz;
         struct cpufreq_freqs freqs;
         static unsigned long lpj_ref;
@@ -144,59 +144,48 @@ static int bfin_target(struct cpufreq_policy *poli,
         cycles_t cycles;
 #endif
 
-        for_each_online_cpu(cpu) {
-                struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+        if (cpufreq_frequency_table_target(policy, bfin_freq_table, target_freq,
+                                relation, &index))
+                return -EINVAL;
 
-                if (!policy)
-                        continue;
+        cclk_hz = bfin_freq_table[index].frequency;
 
-                if (cpufreq_frequency_table_target(policy, bfin_freq_table,
-                                 target_freq, relation, &index))
-                        return -EINVAL;
+        freqs.old = bfin_getfreq_khz(0);
+        freqs.new = cclk_hz;
 
-                cclk_hz = bfin_freq_table[index].frequency;
+        pr_debug("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n",
+                        cclk_hz, target_freq, freqs.old);
 
-                freqs.old = bfin_getfreq_khz(0);
-                freqs.new = cclk_hz;
-                freqs.cpu = cpu;
-
-                pr_debug("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n",
-                         cclk_hz, target_freq, freqs.old);
-
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                if (cpu == CPUFREQ_CPU) {
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 #ifndef CONFIG_BF60x
-                        plldiv = (bfin_read_PLL_DIV() & SSEL) |
-                                                dpm_state_table[index].csel;
-                        bfin_write_PLL_DIV(plldiv);
+        plldiv = (bfin_read_PLL_DIV() & SSEL) | dpm_state_table[index].csel;
+        bfin_write_PLL_DIV(plldiv);
 #else
-                        ret = cpu_set_cclk(cpu, freqs.new * 1000);
-                        if (ret != 0) {
-                                WARN_ONCE(ret, "cpufreq set freq failed %d\n", ret);
-                                break;
-                        }
+        ret = cpu_set_cclk(policy->cpu, freqs.new * 1000);
+        if (ret != 0) {
+                WARN_ONCE(ret, "cpufreq set freq failed %d\n", ret);
+                return ret;
+        }
 #endif
-                        on_each_cpu(bfin_adjust_core_timer, &index, 1);
+        on_each_cpu(bfin_adjust_core_timer, &index, 1);
 #if defined(CONFIG_CYCLES_CLOCKSOURCE)
-                        cycles = get_cycles();
-                        SSYNC();
-                        cycles += 10; /* ~10 cycles we lose after get_cycles() */
-                        __bfin_cycles_off +=
-                            (cycles << __bfin_cycles_mod) - (cycles << index);
-                        __bfin_cycles_mod = index;
+        cycles = get_cycles();
+        SSYNC();
+        cycles += 10; /* ~10 cycles we lose after get_cycles() */
+        __bfin_cycles_off += (cycles << __bfin_cycles_mod) - (cycles << index);
+        __bfin_cycles_mod = index;
 #endif
-                        if (!lpj_ref_freq) {
-                                lpj_ref = loops_per_jiffy;
-                                lpj_ref_freq = freqs.old;
-                        }
-                        if (freqs.new != freqs.old) {
-                                loops_per_jiffy = cpufreq_scale(lpj_ref,
-                                                lpj_ref_freq, freqs.new);
-                        }
-                }
-                /* TODO: just test case for cycles clock source, remove later */
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        if (!lpj_ref_freq) {
+                lpj_ref = loops_per_jiffy;
+                lpj_ref_freq = freqs.old;
         }
+        if (freqs.new != freqs.old) {
+                loops_per_jiffy = cpufreq_scale(lpj_ref,
+                                lpj_ref_freq, freqs.new);
+        }
+
+        /* TODO: just test case for cycles clock source, remove later */
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         pr_debug("cpufreq: done\n");
         return ret;
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index 37d23a0f8c56..3ab8294eab04 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -44,8 +44,9 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
 {
         struct cpufreq_freqs freqs;
         struct opp *opp;
-        unsigned long freq_Hz, volt = 0, volt_old = 0, tol = 0;
-        unsigned int index, cpu;
+        unsigned long volt = 0, volt_old = 0, tol = 0;
+        long freq_Hz;
+        unsigned int index;
         int ret;
 
         ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -65,10 +66,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new)
                 return 0;
 
-        for_each_online_cpu(cpu) {
-                freqs.cpu = cpu;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (cpu_reg) {
                 rcu_read_lock();
@@ -76,7 +74,9 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
                 if (IS_ERR(opp)) {
                         rcu_read_unlock();
                         pr_err("failed to find OPP for %ld\n", freq_Hz);
-                        return PTR_ERR(opp);
+                        freqs.new = freqs.old;
+                        ret = PTR_ERR(opp);
+                        goto post_notify;
                 }
                 volt = opp_get_voltage(opp);
                 rcu_read_unlock();
@@ -94,7 +94,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
                 if (ret) {
                         pr_err("failed to scale voltage up: %d\n", ret);
                         freqs.new = freqs.old;
-                        return ret;
+                        goto post_notify;
                 }
         }
 
@@ -103,7 +103,8 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
                 pr_err("failed to set clock rate: %d\n", ret);
                 if (cpu_reg)
                         regulator_set_voltage_tol(cpu_reg, volt_old, tol);
-                return ret;
+                freqs.new = freqs.old;
+                goto post_notify;
         }
 
         /* scaling down?  scale voltage after frequency */
@@ -113,25 +114,19 @@ static int cpu0_set_target(struct cpufreq_policy *policy,
                         pr_err("failed to scale voltage down: %d\n", ret);
                         clk_set_rate(cpu_clk, freqs.old * 1000);
                         freqs.new = freqs.old;
-                        return ret;
                 }
         }
 
-        for_each_online_cpu(cpu) {
-                freqs.cpu = cpu;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+post_notify:
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-        return 0;
+        return ret;
 }
 
 static int cpu0_cpufreq_init(struct cpufreq_policy *policy)
 {
         int ret;
 
-        if (policy->cpu != 0)
-                return -EINVAL;
-
         ret = cpufreq_frequency_table_cpuinfo(policy, freq_table);
         if (ret) {
                 pr_err("invalid frequency table: %d\n", ret);
@@ -262,6 +257,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
         }
 
         of_node_put(np);
+        of_node_put(parent);
         return 0;
 
 out_free_table:
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c
index 13d311ee08b3..af1542d41440 100644
--- a/drivers/cpufreq/cpufreq-nforce2.c
+++ b/drivers/cpufreq/cpufreq-nforce2.c
@@ -263,7 +263,6 @@ static int nforce2_target(struct cpufreq_policy *policy,
 
         freqs.old = nforce2_get(policy->cpu);
         freqs.new = target_fsb * fid * 100;
-        freqs.cpu = 0;          /* Only one CPU on nForce2 platforms */
 
         if (freqs.old == freqs.new)
                 return 0;
@@ -271,7 +270,7 @@ static int nforce2_target(struct cpufreq_policy *policy,
         pr_debug("Old CPU frequency %d kHz, new %d kHz\n",
                freqs.old, freqs.new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* Disable IRQs */
         /* local_irq_save(flags); */
@@ -286,7 +285,7 @@ static int nforce2_target(struct cpufreq_policy *policy,
         /* Enable IRQs */
         /* local_irq_restore(flags); */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
@@ -360,12 +359,10 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
                 min_fsb = NFORCE2_MIN_FSB;
 
         /* cpuinfo and default policy values */
-        policy->cpuinfo.min_freq = min_fsb * fid * 100;
-        policy->cpuinfo.max_freq = max_fsb * fid * 100;
+        policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100;
+        policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100;
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
         policy->cur = nforce2_get(policy->cpu);
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
 
         return 0;
 }
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b02824d092e7..1b8a48eaf90f 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -45,7 +45,7 @@ static DEFINE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_data);
 /* This one keeps track of the previously set governor of a removed CPU */
 static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);
 #endif
-static DEFINE_SPINLOCK(cpufreq_driver_lock);
+static DEFINE_RWLOCK(cpufreq_driver_lock);
 
 /*
  * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure
@@ -128,6 +128,11 @@ void disable_cpufreq(void)
 static LIST_HEAD(cpufreq_governor_list);
 static DEFINE_MUTEX(cpufreq_governor_mutex);
 
+bool have_governor_per_policy(void)
+{
+        return cpufreq_driver->have_governor_per_policy;
+}
+
 static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
 {
         struct cpufreq_policy *data;
@@ -137,7 +142,7 @@ static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
                 goto err_out;
 
         /* get the cpufreq driver */
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        read_lock_irqsave(&cpufreq_driver_lock, flags);
 
         if (!cpufreq_driver)
                 goto err_out_unlock;
@@ -155,13 +160,13 @@ static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
         if (!sysfs && !kobject_get(&data->kobj))
                 goto err_out_put_module;
 
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        read_unlock_irqrestore(&cpufreq_driver_lock, flags);
         return data;
 
 err_out_put_module:
         module_put(cpufreq_driver->owner);
 err_out_unlock:
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        read_unlock_irqrestore(&cpufreq_driver_lock, flags);
 err_out:
         return NULL;
 }
@@ -244,19 +249,9 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
 #endif
 
 
-/**
- * cpufreq_notify_transition - call notifier chain and adjust_jiffies
- * on frequency transition.
- *
- * This function calls the transition notifiers and the "adjust_jiffies"
- * function. It is called twice on all CPU frequency changes that have
- * external effects.
- */
-void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
+void __cpufreq_notify_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, unsigned int state)
 {
-        struct cpufreq_policy *policy;
-        unsigned long flags;
-
         BUG_ON(irqs_disabled());
 
         if (cpufreq_disabled())
@@ -266,10 +261,6 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
         pr_debug("notification %u of frequency transition to %u kHz\n",
                 state, freqs->new);
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
-        policy = per_cpu(cpufreq_cpu_data, freqs->cpu);
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
-
         switch (state) {
 
         case CPUFREQ_PRECHANGE:
@@ -303,6 +294,20 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
                 break;
         }
 }
+/**
+ * cpufreq_notify_transition - call notifier chain and adjust_jiffies
+ * on frequency transition.
+ *
+ * This function calls the transition notifiers and the "adjust_jiffies"
+ * function. It is called twice on all CPU frequency changes that have
+ * external effects.
+ */
+void cpufreq_notify_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, unsigned int state)
+{
+        for_each_cpu(freqs->cpu, policy->cpus)
+                __cpufreq_notify_transition(policy, freqs, state);
+}
 EXPORT_SYMBOL_GPL(cpufreq_notify_transition);
 
 
@@ -765,12 +770,12 @@ static int cpufreq_add_dev_interface(unsigned int cpu,
                         goto err_out_kobj_put;
         }
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
         for_each_cpu(j, policy->cpus) {
                 per_cpu(cpufreq_cpu_data, j) = policy;
                 per_cpu(cpufreq_policy_cpu, j) = policy->cpu;
         }
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         ret = cpufreq_add_dev_symlink(cpu, policy);
         if (ret)
@@ -803,27 +808,30 @@ static int cpufreq_add_policy_cpu(unsigned int cpu, unsigned int sibling,
                                   struct device *dev)
 {
         struct cpufreq_policy *policy;
-        int ret = 0;
+        int ret = 0, has_target = !!cpufreq_driver->target;
         unsigned long flags;
 
         policy = cpufreq_cpu_get(sibling);
         WARN_ON(!policy);
 
-        __cpufreq_governor(policy, CPUFREQ_GOV_STOP);
+        if (has_target)
+                __cpufreq_governor(policy, CPUFREQ_GOV_STOP);
 
         lock_policy_rwsem_write(sibling);
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
 
         cpumask_set_cpu(cpu, policy->cpus);
         per_cpu(cpufreq_policy_cpu, cpu) = policy->cpu;
         per_cpu(cpufreq_cpu_data, cpu) = policy;
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         unlock_policy_rwsem_write(sibling);
 
-        __cpufreq_governor(policy, CPUFREQ_GOV_START);
-        __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
+        if (has_target) {
+                __cpufreq_governor(policy, CPUFREQ_GOV_START);
+                __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
+        }
 
         ret = sysfs_create_link(&dev->kobj, &policy->kobj, "cpufreq");
         if (ret) {
@@ -871,15 +879,15 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
 
 #ifdef CONFIG_HOTPLUG_CPU
         /* Check if this cpu was hot-unplugged earlier and has siblings */
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        read_lock_irqsave(&cpufreq_driver_lock, flags);
         for_each_online_cpu(sibling) {
                 struct cpufreq_policy *cp = per_cpu(cpufreq_cpu_data, sibling);
                 if (cp && cpumask_test_cpu(cpu, cp->related_cpus)) {
-                        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+                        read_unlock_irqrestore(&cpufreq_driver_lock, flags);
                         return cpufreq_add_policy_cpu(cpu, sibling, dev);
                 }
         }
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        read_unlock_irqrestore(&cpufreq_driver_lock, flags);
 #endif
 #endif
 
@@ -952,10 +960,10 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
         return 0;
 
 err_out_unregister:
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
         for_each_cpu(j, policy->cpus)
                 per_cpu(cpufreq_cpu_data, j) = NULL;
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         kobject_put(&policy->kobj);
         wait_for_completion(&policy->kobj_unregister);
@@ -1008,12 +1016,12 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
 
         pr_debug("%s: unregistering CPU %u\n", __func__, cpu);
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
 
         data = per_cpu(cpufreq_cpu_data, cpu);
         per_cpu(cpufreq_cpu_data, cpu) = NULL;
 
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         if (!data) {
                 pr_debug("%s: No cpu_data found\n", __func__);
@@ -1031,7 +1039,9 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
 
         WARN_ON(lock_policy_rwsem_write(cpu));
         cpus = cpumask_weight(data->cpus);
-        cpumask_clear_cpu(cpu, data->cpus);
+
+        if (cpus > 1)
+                cpumask_clear_cpu(cpu, data->cpus);
         unlock_policy_rwsem_write(cpu);
 
         if (cpu != data->cpu) {
@@ -1047,9 +1057,9 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
                         WARN_ON(lock_policy_rwsem_write(cpu));
                         cpumask_set_cpu(cpu, data->cpus);
 
-                        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+                        write_lock_irqsave(&cpufreq_driver_lock, flags);
                         per_cpu(cpufreq_cpu_data, cpu) = data;
-                        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+                        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
                         unlock_policy_rwsem_write(cpu);
 
@@ -1070,6 +1080,9 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
 
         /* If cpu is last user of policy, free policy */
         if (cpus == 1) {
+                if (cpufreq_driver->target)
+                        __cpufreq_governor(data, CPUFREQ_GOV_POLICY_EXIT);
+
                 lock_policy_rwsem_read(cpu);
                 kobj = &data->kobj;
                 cmp = &data->kobj_unregister;
@@ -1134,16 +1147,23 @@ static void handle_update(struct work_struct *work)
 static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq,
                                 unsigned int new_freq)
 {
+        struct cpufreq_policy *policy;
         struct cpufreq_freqs freqs;
+        unsigned long flags;
+
 
         pr_debug("Warning: CPU frequency out of sync: cpufreq and timing "
                "core thinks of %u, is %u kHz.\n", old_freq, new_freq);
 
-        freqs.cpu = cpu;
         freqs.old = old_freq;
         freqs.new = new_freq;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+        read_lock_irqsave(&cpufreq_driver_lock, flags);
+        policy = per_cpu(cpufreq_cpu_data, cpu);
+        read_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 }
 
 
@@ -1544,10 +1564,12 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
                                                 policy->cpu, event);
         ret = policy->governor->governor(policy, event);
 
-        if (event == CPUFREQ_GOV_START)
-                policy->governor->initialized++;
-        else if (event == CPUFREQ_GOV_STOP)
-                policy->governor->initialized--;
+        if (!ret) {
+                if (event == CPUFREQ_GOV_POLICY_INIT)
+                        policy->governor->initialized++;
+                else if (event == CPUFREQ_GOV_POLICY_EXIT)
+                        policy->governor->initialized--;
+        }
 
         /* we keep one module reference alive for
                         each CPU governed by this CPU */
@@ -1651,7 +1673,7 @@ EXPORT_SYMBOL(cpufreq_get_policy);
 static int __cpufreq_set_policy(struct cpufreq_policy *data,
                                 struct cpufreq_policy *policy)
 {
-        int ret = 0;
+        int ret = 0, failed = 1;
 
         pr_debug("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu,
                 policy->min, policy->max);
@@ -1705,18 +1727,31 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data,
                         pr_debug("governor switch\n");
 
                         /* end old governor */
-                        if (data->governor)
+                        if (data->governor) {
                                 __cpufreq_governor(data, CPUFREQ_GOV_STOP);
+                                __cpufreq_governor(data,
+                                                CPUFREQ_GOV_POLICY_EXIT);
+                        }
 
                         /* start new governor */
                         data->governor = policy->governor;
-                        if (__cpufreq_governor(data, CPUFREQ_GOV_START)) {
+                        if (!__cpufreq_governor(data, CPUFREQ_GOV_POLICY_INIT)) {
+                                if (!__cpufreq_governor(data, CPUFREQ_GOV_START))
+                                        failed = 0;
+                                else
+                                        __cpufreq_governor(data,
+                                                        CPUFREQ_GOV_POLICY_EXIT);
+                        }
+
+                        if (failed) {
                                 /* new governor failed, so re-start old one */
                                 pr_debug("starting governor %s failed\n",
                                                         data->governor->name);
                                 if (old_gov) {
                                         data->governor = old_gov;
                                         __cpufreq_governor(data,
+                                                        CPUFREQ_GOV_POLICY_INIT);
+                                        __cpufreq_governor(data,
                                                            CPUFREQ_GOV_START);
                                 }
                                 ret = -EINVAL;
@@ -1848,13 +1883,13 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
         if (driver_data->setpolicy)
                 driver_data->flags |= CPUFREQ_CONST_LOOPS;
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
         if (cpufreq_driver) {
-                spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+                write_unlock_irqrestore(&cpufreq_driver_lock, flags);
                 return -EBUSY;
         }
         cpufreq_driver = driver_data;
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         ret = subsys_interface_register(&cpufreq_interface);
         if (ret)
@@ -1886,9 +1921,9 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
 err_if_unreg:
         subsys_interface_unregister(&cpufreq_interface);
 err_null_driver:
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
         cpufreq_driver = NULL;
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
         return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_driver);
@@ -1914,9 +1949,9 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)
         subsys_interface_unregister(&cpufreq_interface);
         unregister_hotcpu_notifier(&cpufreq_cpu_notifier);
 
-        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
         cpufreq_driver = NULL;
-        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
         return 0;
 }
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 4fd0006b1291..0ceb2eff5a7e 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -20,6 +20,7 @@
 #include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/percpu-defs.h>
+#include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/types.h>
 
@@ -28,25 +29,29 @@
 /* Conservative governor macros */
 #define DEF_FREQUENCY_UP_THRESHOLD              (80)
 #define DEF_FREQUENCY_DOWN_THRESHOLD            (20)
+#define DEF_FREQUENCY_STEP                      (5)
 #define DEF_SAMPLING_DOWN_FACTOR                (1)
 #define MAX_SAMPLING_DOWN_FACTOR                (10)
 
-static struct dbs_data cs_dbs_data;
 static DEFINE_PER_CPU(struct cs_cpu_dbs_info_s, cs_cpu_dbs_info);
 
-static struct cs_dbs_tuners cs_tuners = {
-        .up_threshold = DEF_FREQUENCY_UP_THRESHOLD,
-        .down_threshold = DEF_FREQUENCY_DOWN_THRESHOLD,
-        .sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,
-        .ignore_nice = 0,
-        .freq_step = 5,
-};
+static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,
+                                           struct cpufreq_policy *policy)
+{
+        unsigned int freq_target = (cs_tuners->freq_step * policy->max) / 100;
+
+        /* max freq cannot be less than 100. But who knows... */
+        if (unlikely(freq_target == 0))
+                freq_target = DEF_FREQUENCY_STEP;
+
+        return freq_target;
+}
 
 /*
  * Every sampling_rate, we check, if current idle time is less than 20%
- * (default), then we try to increase frequency Every sampling_rate *
- * sampling_down_factor, we check, if current idle time is more than 80%, then
- * we try to decrease frequency
+ * (default), then we try to increase frequency. Every sampling_rate *
+ * sampling_down_factor, we check, if current idle time is more than 80%
+ * (default), then we try to decrease frequency
  *
  * Any frequency increase takes it to the maximum frequency. Frequency reduction
  * happens at minimum steps of 5% (default) of maximum frequency
@@ -55,30 +60,25 @@ static void cs_check_cpu(int cpu, unsigned int load)
 {
         struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, cpu);
         struct cpufreq_policy *policy = dbs_info->cdbs.cur_policy;
-        unsigned int freq_target;
+        struct dbs_data *dbs_data = policy->governor_data;
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
 
         /*
          * break out if we 'cannot' reduce the speed as the user might
          * want freq_step to be zero
          */
-        if (cs_tuners.freq_step == 0)
+        if (cs_tuners->freq_step == 0)
                 return;
 
         /* Check for frequency increase */
-        if (load > cs_tuners.up_threshold) {
+        if (load > cs_tuners->up_threshold) {
                 dbs_info->down_skip = 0;
 
                 /* if we are already at full speed then break out early */
                 if (dbs_info->requested_freq == policy->max)
                         return;
 
-                freq_target = (cs_tuners.freq_step * policy->max) / 100;
-
-                /* max freq cannot be less than 100. But who knows.... */
-                if (unlikely(freq_target == 0))
-                        freq_target = 5;
-
-                dbs_info->requested_freq += freq_target;
+                dbs_info->requested_freq += get_freq_target(cs_tuners, policy);
                 if (dbs_info->requested_freq > policy->max)
                         dbs_info->requested_freq = policy->max;
 
@@ -87,45 +87,48 @@ static void cs_check_cpu(int cpu, unsigned int load)
                 return;
         }
 
-        /*
-         * The optimal frequency is the frequency that is the lowest that can
-         * support the current CPU usage without triggering the up policy. To be
-         * safe, we focus 10 points under the threshold.
-         */
-        if (load < (cs_tuners.down_threshold - 10)) {
-                freq_target = (cs_tuners.freq_step * policy->max) / 100;
-
-                dbs_info->requested_freq -= freq_target;
-                if (dbs_info->requested_freq < policy->min)
-                        dbs_info->requested_freq = policy->min;
+        /* if sampling_down_factor is active break out early */
+        if (++dbs_info->down_skip < cs_tuners->sampling_down_factor)
+                return;
+        dbs_info->down_skip = 0;
 
+        /* Check for frequency decrease */
+        if (load < cs_tuners->down_threshold) {
                 /*
                  * if we cannot reduce the frequency anymore, break out early
                  */
                 if (policy->cur == policy->min)
                         return;
 
+                dbs_info->requested_freq -= get_freq_target(cs_tuners, policy);
+                if (dbs_info->requested_freq < policy->min)
+                        dbs_info->requested_freq = policy->min;
+
                 __cpufreq_driver_target(policy, dbs_info->requested_freq,
-                                CPUFREQ_RELATION_H);
+                                CPUFREQ_RELATION_L);
                 return;
         }
 }
 
 static void cs_dbs_timer(struct work_struct *work)
 {
-        struct delayed_work *dw = to_delayed_work(work);
         struct cs_cpu_dbs_info_s *dbs_info = container_of(work,
                         struct cs_cpu_dbs_info_s, cdbs.work.work);
         unsigned int cpu = dbs_info->cdbs.cur_policy->cpu;
         struct cs_cpu_dbs_info_s *core_dbs_info = &per_cpu(cs_cpu_dbs_info,
                         cpu);
-        int delay = delay_for_sampling_rate(cs_tuners.sampling_rate);
+        struct dbs_data *dbs_data = dbs_info->cdbs.cur_policy->governor_data;
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
+        int delay = delay_for_sampling_rate(cs_tuners->sampling_rate);
+        bool modify_all = true;
 
         mutex_lock(&core_dbs_info->cdbs.timer_mutex);
-        if (need_load_eval(&core_dbs_info->cdbs, cs_tuners.sampling_rate))
-                dbs_check_cpu(&cs_dbs_data, cpu);
+        if (!need_load_eval(&core_dbs_info->cdbs, cs_tuners->sampling_rate))
+                modify_all = false;
+        else
+                dbs_check_cpu(dbs_data, cpu);
 
-        schedule_delayed_work_on(smp_processor_id(), dw, delay);
+        gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, delay, modify_all);
         mutex_unlock(&core_dbs_info->cdbs.timer_mutex);
 }
 
@@ -154,16 +157,12 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 }
 
 /************************** sysfs interface ************************/
-static ssize_t show_sampling_rate_min(struct kobject *kobj,
-                                      struct attribute *attr, char *buf)
-{
-        return sprintf(buf, "%u\n", cs_dbs_data.min_sampling_rate);
-}
+static struct common_dbs_data cs_dbs_cdata;
 
-static ssize_t store_sampling_down_factor(struct kobject *a,
-                                          struct attribute *b,
-                                          const char *buf, size_t count)
+static ssize_t store_sampling_down_factor(struct dbs_data *dbs_data,
+                const char *buf, size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
@@ -171,13 +170,14 @@ static ssize_t store_sampling_down_factor(struct kobject *a,
         if (ret != 1 || input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
 
-        cs_tuners.sampling_down_factor = input;
+        cs_tuners->sampling_down_factor = input;
         return count;
 }
 
-static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,
-                                   const char *buf, size_t count)
+static ssize_t store_sampling_rate(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
@@ -185,43 +185,46 @@ static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,
         if (ret != 1)
                 return -EINVAL;
 
-        cs_tuners.sampling_rate = max(input, cs_dbs_data.min_sampling_rate);
+        cs_tuners->sampling_rate = max(input, dbs_data->min_sampling_rate);
         return count;
 }
 
-static ssize_t store_up_threshold(struct kobject *a, struct attribute *b,
-                                  const char *buf, size_t count)
+static ssize_t store_up_threshold(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
 
-        if (ret != 1 || input > 100 || input <= cs_tuners.down_threshold)
+        if (ret != 1 || input > 100 || input <= cs_tuners->down_threshold)
                 return -EINVAL;
 
-        cs_tuners.up_threshold = input;
+        cs_tuners->up_threshold = input;
         return count;
 }
 
-static ssize_t store_down_threshold(struct kobject *a, struct attribute *b,
-                                    const char *buf, size_t count)
+static ssize_t store_down_threshold(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
 
         /* cannot be lower than 11 otherwise freq will not fall */
         if (ret != 1 || input < 11 || input > 100 ||
-                        input >= cs_tuners.up_threshold)
+                        input >= cs_tuners->up_threshold)
                 return -EINVAL;
 
-        cs_tuners.down_threshold = input;
+        cs_tuners->down_threshold = input;
         return count;
 }
 
-static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
-                                      const char *buf, size_t count)
+static ssize_t store_ignore_nice(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input, j;
         int ret;
 
@@ -232,27 +235,28 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
         if (input > 1)
                 input = 1;
 
-        if (input == cs_tuners.ignore_nice) /* nothing to do */
+        if (input == cs_tuners->ignore_nice) /* nothing to do */
                 return count;
 
-        cs_tuners.ignore_nice = input;
+        cs_tuners->ignore_nice = input;
 
         /* we need to re-evaluate prev_cpu_idle */
         for_each_online_cpu(j) {
                 struct cs_cpu_dbs_info_s *dbs_info;
                 dbs_info = &per_cpu(cs_cpu_dbs_info, j);
                 dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
-                                                &dbs_info->cdbs.prev_cpu_wall);
-                if (cs_tuners.ignore_nice)
+                                        &dbs_info->cdbs.prev_cpu_wall, 0);
+                if (cs_tuners->ignore_nice)
                         dbs_info->cdbs.prev_cpu_nice =
                                 kcpustat_cpu(j).cpustat[CPUTIME_NICE];
         }
         return count;
 }
 
-static ssize_t store_freq_step(struct kobject *a, struct attribute *b,
-                               const char *buf, size_t count)
+static ssize_t store_freq_step(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
@@ -267,43 +271,88 @@ static ssize_t store_freq_step(struct kobject *a, struct attribute *b,
          * no need to test here if freq_step is zero as the user might actually
          * want this, they would be crazy though :)
          */
-        cs_tuners.freq_step = input;
+        cs_tuners->freq_step = input;
         return count;
 }
 
-show_one(cs, sampling_rate, sampling_rate);
-show_one(cs, sampling_down_factor, sampling_down_factor);
-show_one(cs, up_threshold, up_threshold);
-show_one(cs, down_threshold, down_threshold);
-show_one(cs, ignore_nice_load, ignore_nice);
-show_one(cs, freq_step, freq_step);
-
-define_one_global_rw(sampling_rate);
-define_one_global_rw(sampling_down_factor);
-define_one_global_rw(up_threshold);
-define_one_global_rw(down_threshold);
-define_one_global_rw(ignore_nice_load);
-define_one_global_rw(freq_step);
-define_one_global_ro(sampling_rate_min);
-
-static struct attribute *dbs_attributes[] = {
-        &sampling_rate_min.attr,
-        &sampling_rate.attr,
-        &sampling_down_factor.attr,
-        &up_threshold.attr,
-        &down_threshold.attr,
-        &ignore_nice_load.attr,
-        &freq_step.attr,
+show_store_one(cs, sampling_rate);
+show_store_one(cs, sampling_down_factor);
+show_store_one(cs, up_threshold);
+show_store_one(cs, down_threshold);
+show_store_one(cs, ignore_nice);
+show_store_one(cs, freq_step);
+declare_show_sampling_rate_min(cs);
+
+gov_sys_pol_attr_rw(sampling_rate);
+gov_sys_pol_attr_rw(sampling_down_factor);
+gov_sys_pol_attr_rw(up_threshold);
+gov_sys_pol_attr_rw(down_threshold);
+gov_sys_pol_attr_rw(ignore_nice);
+gov_sys_pol_attr_rw(freq_step);
+gov_sys_pol_attr_ro(sampling_rate_min);
+
+static struct attribute *dbs_attributes_gov_sys[] = {
+        &sampling_rate_min_gov_sys.attr,
+        &sampling_rate_gov_sys.attr,
+        &sampling_down_factor_gov_sys.attr,
+        &up_threshold_gov_sys.attr,
+        &down_threshold_gov_sys.attr,
+        &ignore_nice_gov_sys.attr,
+        &freq_step_gov_sys.attr,
         NULL
 };
 
-static struct attribute_group cs_attr_group = {
-        .attrs = dbs_attributes,
+static struct attribute_group cs_attr_group_gov_sys = {
+        .attrs = dbs_attributes_gov_sys,
+        .name = "conservative",
+};
+
+static struct attribute *dbs_attributes_gov_pol[] = {
+        &sampling_rate_min_gov_pol.attr,
+        &sampling_rate_gov_pol.attr,
+        &sampling_down_factor_gov_pol.attr,
+        &up_threshold_gov_pol.attr,
+        &down_threshold_gov_pol.attr,
+        &ignore_nice_gov_pol.attr,
+        &freq_step_gov_pol.attr,
+        NULL
+};
+
+static struct attribute_group cs_attr_group_gov_pol = {
+        .attrs = dbs_attributes_gov_pol,
         .name = "conservative",
 };
 
 /************************** sysfs end ************************/
 
+static int cs_init(struct dbs_data *dbs_data)
+{
+        struct cs_dbs_tuners *tuners;
+
+        tuners = kzalloc(sizeof(struct cs_dbs_tuners), GFP_KERNEL);
+        if (!tuners) {
+                pr_err("%s: kzalloc failed\n", __func__);
+                return -ENOMEM;
+        }
+
+        tuners->up_threshold = DEF_FREQUENCY_UP_THRESHOLD;
+        tuners->down_threshold = DEF_FREQUENCY_DOWN_THRESHOLD;
+        tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
+        tuners->ignore_nice = 0;
+        tuners->freq_step = DEF_FREQUENCY_STEP;
+
+        dbs_data->tuners = tuners;
+        dbs_data->min_sampling_rate = MIN_SAMPLING_RATE_RATIO *
+                jiffies_to_usecs(10);
+        mutex_init(&dbs_data->mutex);
+        return 0;
+}
+
+static void cs_exit(struct dbs_data *dbs_data)
+{
+        kfree(dbs_data->tuners);
+}
+
 define_get_cpu_dbs_routines(cs_cpu_dbs_info);
 
 static struct notifier_block cs_cpufreq_notifier_block = {
@@ -314,21 +363,23 @@ static struct cs_ops cs_ops = {
         .notifier_block = &cs_cpufreq_notifier_block,
 };
 
-static struct dbs_data cs_dbs_data = {
+static struct common_dbs_data cs_dbs_cdata = {
         .governor = GOV_CONSERVATIVE,
-        .attr_group = &cs_attr_group,
-        .tuners = &cs_tuners,
+        .attr_group_gov_sys = &cs_attr_group_gov_sys,
+        .attr_group_gov_pol = &cs_attr_group_gov_pol,
         .get_cpu_cdbs = get_cpu_cdbs,
         .get_cpu_dbs_info_s = get_cpu_dbs_info_s,
         .gov_dbs_timer = cs_dbs_timer,
         .gov_check_cpu = cs_check_cpu,
         .gov_ops = &cs_ops,
+        .init = cs_init,
+        .exit = cs_exit,
 };
 
 static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
                                    unsigned int event)
 {
-        return cpufreq_governor_dbs(&cs_dbs_data, policy, event);
+        return cpufreq_governor_dbs(policy, &cs_dbs_cdata, event);
 }
 
 #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
@@ -343,7 +394,6 @@ struct cpufreq_governor cpufreq_gov_conservative = {
 
 static int __init cpufreq_gov_dbs_init(void)
 {
-        mutex_init(&cs_dbs_data.mutex);
         return cpufreq_register_governor(&cpufreq_gov_conservative);
 }
 
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 5a76086ff09b..443442df113b 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -22,12 +22,29 @@
 #include <linux/export.h>
 #include <linux/kernel_stat.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/tick.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
 #include "cpufreq_governor.h"
 
+static struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
+{
+        if (have_governor_per_policy())
+                return &policy->kobj;
+        else
+                return cpufreq_global_kobject;
+}
+
+static struct attribute_group *get_sysfs_attr(struct dbs_data *dbs_data)
+{
+        if (have_governor_per_policy())
+                return dbs_data->cdata->attr_group_gov_pol;
+        else
+                return dbs_data->cdata->attr_group_gov_sys;
+}
+
 static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
 {
         u64 idle_time;
@@ -50,13 +67,13 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
         return cputime_to_usecs(idle_time);
 }
 
-u64 get_cpu_idle_time(unsigned int cpu, u64 *wall)
+u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
 {
-        u64 idle_time = get_cpu_idle_time_us(cpu, NULL);
+        u64 idle_time = get_cpu_idle_time_us(cpu, io_busy ? wall : NULL);
 
         if (idle_time == -1ULL)
                 return get_cpu_idle_time_jiffy(cpu, wall);
-        else
+        else if (!io_busy)
                 idle_time += get_cpu_iowait_time_us(cpu, wall);
 
         return idle_time;
@@ -65,7 +82,7 @@ EXPORT_SYMBOL_GPL(get_cpu_idle_time);
 
 void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
 {
-        struct cpu_dbs_common_info *cdbs = dbs_data->get_cpu_cdbs(cpu);
+        struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
         struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         struct cpufreq_policy *policy;
@@ -73,7 +90,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
         unsigned int ignore_nice;
         unsigned int j;
 
-        if (dbs_data->governor == GOV_ONDEMAND)
+        if (dbs_data->cdata->governor == GOV_ONDEMAND)
                 ignore_nice = od_tuners->ignore_nice;
         else
                 ignore_nice = cs_tuners->ignore_nice;
@@ -83,13 +100,22 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
         /* Get Absolute Load (in terms of freq for ondemand gov) */
         for_each_cpu(j, policy->cpus) {
                 struct cpu_dbs_common_info *j_cdbs;
-                u64 cur_wall_time, cur_idle_time, cur_iowait_time;
-                unsigned int idle_time, wall_time, iowait_time;
+                u64 cur_wall_time, cur_idle_time;
+                unsigned int idle_time, wall_time;
                 unsigned int load;
+                int io_busy = 0;
 
-                j_cdbs = dbs_data->get_cpu_cdbs(j);
+                j_cdbs = dbs_data->cdata->get_cpu_cdbs(j);
 
-                cur_idle_time = get_cpu_idle_time(j, &cur_wall_time);
+                /*
+                 * For the purpose of ondemand, waiting for disk IO is
+                 * an indication that you're performance critical, and
+                 * not that the system is actually idle. So do not add
+                 * the iowait time to the cpu idle time.
+                 */
+                if (dbs_data->cdata->governor == GOV_ONDEMAND)
+                        io_busy = od_tuners->io_is_busy;
+                cur_idle_time = get_cpu_idle_time(j, &cur_wall_time, io_busy);
 
                 wall_time = (unsigned int)
                         (cur_wall_time - j_cdbs->prev_cpu_wall);
@@ -117,35 +143,12 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
                         idle_time += jiffies_to_usecs(cur_nice_jiffies);
                 }
 
-                if (dbs_data->governor == GOV_ONDEMAND) {
-                        struct od_cpu_dbs_info_s *od_j_dbs_info =
-                                dbs_data->get_cpu_dbs_info_s(cpu);
-
-                        cur_iowait_time = get_cpu_iowait_time_us(j,
-                                        &cur_wall_time);
-                        if (cur_iowait_time == -1ULL)
-                                cur_iowait_time = 0;
-
-                        iowait_time = (unsigned int) (cur_iowait_time -
-                                        od_j_dbs_info->prev_cpu_iowait);
-                        od_j_dbs_info->prev_cpu_iowait = cur_iowait_time;
-
-                        /*
-                         * For the purpose of ondemand, waiting for disk IO is
-                         * an indication that you're performance critical, and
-                         * not that the system is actually idle. So subtract the
-                         * iowait time from the cpu idle time.
-                         */
-                        if (od_tuners->io_is_busy && idle_time >= iowait_time)
-                                idle_time -= iowait_time;
-                }
-
                 if (unlikely(!wall_time || wall_time < idle_time))
                         continue;
 
                 load = 100 * (wall_time - idle_time) / wall_time;
 
-                if (dbs_data->governor == GOV_ONDEMAND) {
+                if (dbs_data->cdata->governor == GOV_ONDEMAND) {
                         int freq_avg = __cpufreq_driver_getavg(policy, j);
                         if (freq_avg <= 0)
                                 freq_avg = policy->cur;
@@ -157,24 +160,42 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
                         max_load = load;
         }
 
-        dbs_data->gov_check_cpu(cpu, max_load);
+        dbs_data->cdata->gov_check_cpu(cpu, max_load);
 }
 EXPORT_SYMBOL_GPL(dbs_check_cpu);
 
-static inline void dbs_timer_init(struct dbs_data *dbs_data, int cpu,
-                                  unsigned int sampling_rate)
+static inline void __gov_queue_work(int cpu, struct dbs_data *dbs_data,
+                unsigned int delay)
 {
-        int delay = delay_for_sampling_rate(sampling_rate);
-        struct cpu_dbs_common_info *cdbs = dbs_data->get_cpu_cdbs(cpu);
+        struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
 
-        schedule_delayed_work_on(cpu, &cdbs->work, delay);
+        mod_delayed_work_on(cpu, system_wq, &cdbs->work, delay);
 }
 
-static inline void dbs_timer_exit(struct dbs_data *dbs_data, int cpu)
+void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
+                unsigned int delay, bool all_cpus)
 {
-        struct cpu_dbs_common_info *cdbs = dbs_data->get_cpu_cdbs(cpu);
+        int i;
 
-        cancel_delayed_work_sync(&cdbs->work);
+        if (!all_cpus) {
+                __gov_queue_work(smp_processor_id(), dbs_data, delay);
+        } else {
+                for_each_cpu(i, policy->cpus)
+                        __gov_queue_work(i, dbs_data, delay);
+        }
+}
+EXPORT_SYMBOL_GPL(gov_queue_work);
+
+static inline void gov_cancel_work(struct dbs_data *dbs_data,
+                struct cpufreq_policy *policy)
+{
+        struct cpu_dbs_common_info *cdbs;
+        int i;
+
+        for_each_cpu(i, policy->cpus) {
+                cdbs = dbs_data->cdata->get_cpu_cdbs(i);
+                cancel_delayed_work_sync(&cdbs->work);
+        }
 }
 
 /* Will return if we need to evaluate cpu load again or not */
@@ -196,31 +217,130 @@ bool need_load_eval(struct cpu_dbs_common_info *cdbs,
 }
 EXPORT_SYMBOL_GPL(need_load_eval);
 
-int cpufreq_governor_dbs(struct dbs_data *dbs_data,
-                struct cpufreq_policy *policy, unsigned int event)
+static void set_sampling_rate(struct dbs_data *dbs_data,
+                unsigned int sampling_rate)
 {
+        if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {
+                struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
+                cs_tuners->sampling_rate = sampling_rate;
+        } else {
+                struct od_dbs_tuners *od_tuners = dbs_data->tuners;
+                od_tuners->sampling_rate = sampling_rate;
+        }
+}
+
+int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+                struct common_dbs_data *cdata, unsigned int event)
+{
+        struct dbs_data *dbs_data;
         struct od_cpu_dbs_info_s *od_dbs_info = NULL;
         struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
-        struct cs_ops *cs_ops = NULL;
         struct od_ops *od_ops = NULL;
-        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
-        struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
+        struct od_dbs_tuners *od_tuners = NULL;
+        struct cs_dbs_tuners *cs_tuners = NULL;
         struct cpu_dbs_common_info *cpu_cdbs;
-        unsigned int *sampling_rate, latency, ignore_nice, j, cpu = policy->cpu;
+        unsigned int sampling_rate, latency, ignore_nice, j, cpu = policy->cpu;
+        int io_busy = 0;
         int rc;
 
-        cpu_cdbs = dbs_data->get_cpu_cdbs(cpu);
+        if (have_governor_per_policy())
+                dbs_data = policy->governor_data;
+        else
+                dbs_data = cdata->gdbs_data;
+
+        WARN_ON(!dbs_data && (event != CPUFREQ_GOV_POLICY_INIT));
+
+        switch (event) {
+        case CPUFREQ_GOV_POLICY_INIT:
+                if (have_governor_per_policy()) {
+                        WARN_ON(dbs_data);
+                } else if (dbs_data) {
+                        policy->governor_data = dbs_data;
+                        return 0;
+                }
+
+                dbs_data = kzalloc(sizeof(*dbs_data), GFP_KERNEL);
+                if (!dbs_data) {
+                        pr_err("%s: POLICY_INIT: kzalloc failed\n", __func__);
+                        return -ENOMEM;
+                }
+
+                dbs_data->cdata = cdata;
+                rc = cdata->init(dbs_data);
+                if (rc) {
+                        pr_err("%s: POLICY_INIT: init() failed\n", __func__);
+                        kfree(dbs_data);
+                        return rc;
+                }
+
+                rc = sysfs_create_group(get_governor_parent_kobj(policy),
+                                get_sysfs_attr(dbs_data));
+                if (rc) {
+                        cdata->exit(dbs_data);
+                        kfree(dbs_data);
+                        return rc;
+                }
+
+                policy->governor_data = dbs_data;
 
-        if (dbs_data->governor == GOV_CONSERVATIVE) {
-                cs_dbs_info = dbs_data->get_cpu_dbs_info_s(cpu);
-                sampling_rate = &cs_tuners->sampling_rate;
+                /* policy latency is in nS. Convert it to uS first */
+                latency = policy->cpuinfo.transition_latency / 1000;
+                if (latency == 0)
+                        latency = 1;
+
+                /* Bring kernel and HW constraints together */
+                dbs_data->min_sampling_rate = max(dbs_data->min_sampling_rate,
+                                MIN_LATENCY_MULTIPLIER * latency);
+                set_sampling_rate(dbs_data, max(dbs_data->min_sampling_rate,
+                                        latency * LATENCY_MULTIPLIER));
+
+                if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {
+                        struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
+
+                        cpufreq_register_notifier(cs_ops->notifier_block,
+                                        CPUFREQ_TRANSITION_NOTIFIER);
+                }
+
+                if (!have_governor_per_policy())
+                        cdata->gdbs_data = dbs_data;
+
+                return 0;
+        case CPUFREQ_GOV_POLICY_EXIT:
+                if ((policy->governor->initialized == 1) ||
+                                have_governor_per_policy()) {
+                        sysfs_remove_group(get_governor_parent_kobj(policy),
+                                        get_sysfs_attr(dbs_data));
+
+                        if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {
+                                struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
+
+                                cpufreq_unregister_notifier(cs_ops->notifier_block,
+                                                CPUFREQ_TRANSITION_NOTIFIER);
+                        }
+
+                        cdata->exit(dbs_data);
+                        kfree(dbs_data);
+                        cdata->gdbs_data = NULL;
+                }
+
+                policy->governor_data = NULL;
+                return 0;
+        }
+
+        cpu_cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
+
+        if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {
+                cs_tuners = dbs_data->tuners;
+                cs_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
+                sampling_rate = cs_tuners->sampling_rate;
                 ignore_nice = cs_tuners->ignore_nice;
-                cs_ops = dbs_data->gov_ops;
         } else {
-                od_dbs_info = dbs_data->get_cpu_dbs_info_s(cpu);
-                sampling_rate = &od_tuners->sampling_rate;
+                od_tuners = dbs_data->tuners;
+                od_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
+                sampling_rate = od_tuners->sampling_rate;
                 ignore_nice = od_tuners->ignore_nice;
-                od_ops = dbs_data->gov_ops;
+                od_ops = dbs_data->cdata->gov_ops;
+                io_busy = od_tuners->io_is_busy;
         }
 
         switch (event) {
@@ -232,96 +352,53 @@ int cpufreq_governor_dbs(struct dbs_data *dbs_data,
 
                 for_each_cpu(j, policy->cpus) {
                         struct cpu_dbs_common_info *j_cdbs =
-                                dbs_data->get_cpu_cdbs(j);
+                                dbs_data->cdata->get_cpu_cdbs(j);
 
                         j_cdbs->cpu = j;
                         j_cdbs->cur_policy = policy;
                         j_cdbs->prev_cpu_idle = get_cpu_idle_time(j,
-                                        &j_cdbs->prev_cpu_wall);
+                                               &j_cdbs->prev_cpu_wall, io_busy);
                         if (ignore_nice)
                                 j_cdbs->prev_cpu_nice =
                                         kcpustat_cpu(j).cpustat[CPUTIME_NICE];
 
                         mutex_init(&j_cdbs->timer_mutex);
                         INIT_DEFERRABLE_WORK(&j_cdbs->work,
-                                             dbs_data->gov_dbs_timer);
-                }
-
-                if (!policy->governor->initialized) {
-                        rc = sysfs_create_group(cpufreq_global_kobject,
-                                        dbs_data->attr_group);
-                        if (rc) {
-                                mutex_unlock(&dbs_data->mutex);
-                                return rc;
-                        }
+                                             dbs_data->cdata->gov_dbs_timer);
                 }
 
                 /*
                  * conservative does not implement micro like ondemand
                  * governor, thus we are bound to jiffes/HZ
                  */
-                if (dbs_data->governor == GOV_CONSERVATIVE) {
+                if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {
                         cs_dbs_info->down_skip = 0;
                         cs_dbs_info->enable = 1;
                         cs_dbs_info->requested_freq = policy->cur;
-
-                        if (!policy->governor->initialized) {
-                                cpufreq_register_notifier(cs_ops->notifier_block,
-                                                CPUFREQ_TRANSITION_NOTIFIER);
-
-                                dbs_data->min_sampling_rate =
-                                        MIN_SAMPLING_RATE_RATIO *
-                                        jiffies_to_usecs(10);
-                        }
                 } else {
                         od_dbs_info->rate_mult = 1;
                         od_dbs_info->sample_type = OD_NORMAL_SAMPLE;
                         od_ops->powersave_bias_init_cpu(cpu);
-
-                        if (!policy->governor->initialized)
-                                od_tuners->io_is_busy = od_ops->io_busy();
                 }
 
-                if (policy->governor->initialized)
-                        goto unlock;
-
-                /* policy latency is in nS. Convert it to uS first */
-                latency = policy->cpuinfo.transition_latency / 1000;
-                if (latency == 0)
-                        latency = 1;
-
-                /* Bring kernel and HW constraints together */
-                dbs_data->min_sampling_rate = max(dbs_data->min_sampling_rate,
-                                MIN_LATENCY_MULTIPLIER * latency);
-                *sampling_rate = max(dbs_data->min_sampling_rate, latency *
-                                LATENCY_MULTIPLIER);
-unlock:
                 mutex_unlock(&dbs_data->mutex);
 
                 /* Initiate timer time stamp */
                 cpu_cdbs->time_stamp = ktime_get();
 
-                for_each_cpu(j, policy->cpus)
-                        dbs_timer_init(dbs_data, j, *sampling_rate);
+                gov_queue_work(dbs_data, policy,
+                                delay_for_sampling_rate(sampling_rate), true);
                 break;
 
         case CPUFREQ_GOV_STOP:
-                if (dbs_data->governor == GOV_CONSERVATIVE)
+                if (dbs_data->cdata->governor == GOV_CONSERVATIVE)
                         cs_dbs_info->enable = 0;
 
-                for_each_cpu(j, policy->cpus)
-                        dbs_timer_exit(dbs_data, j);
+                gov_cancel_work(dbs_data, policy);
 
                 mutex_lock(&dbs_data->mutex);
                 mutex_destroy(&cpu_cdbs->timer_mutex);
 
-                if (policy->governor->initialized == 1) {
-                        sysfs_remove_group(cpufreq_global_kobject,
-                                        dbs_data->attr_group);
-                        if (dbs_data->governor == GOV_CONSERVATIVE)
-                                cpufreq_unregister_notifier(cs_ops->notifier_block,
-                                                CPUFREQ_TRANSITION_NOTIFIER);
-                }
                 mutex_unlock(&dbs_data->mutex);
 
                 break;
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index cc4bd2f6838a..8ac33538d0bd 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -34,20 +34,81 @@
  */
 #define MIN_SAMPLING_RATE_RATIO                 (2)
 #define LATENCY_MULTIPLIER                      (1000)
-#define MIN_LATENCY_MULTIPLIER                  (100)
+#define MIN_LATENCY_MULTIPLIER                  (20)
 #define TRANSITION_LATENCY_LIMIT                (10 * 1000 * 1000)
 
 /* Ondemand Sampling types */
 enum {OD_NORMAL_SAMPLE, OD_SUB_SAMPLE};
 
-/* Macro creating sysfs show routines */
-#define show_one(_gov, file_name, object)                               \
-static ssize_t show_##file_name                                         \
+/*
+ * Macro for creating governors sysfs routines
+ *
+ * - gov_sys: One governor instance per whole system
+ * - gov_pol: One governor instance per policy
+ */
+
+/* Create attributes */
+#define gov_sys_attr_ro(_name)                                          \
+static struct global_attr _name##_gov_sys =                             \
+__ATTR(_name, 0444, show_##_name##_gov_sys, NULL)
+
+#define gov_sys_attr_rw(_name)                                          \
+static struct global_attr _name##_gov_sys =                             \
+__ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys)
+
+#define gov_pol_attr_ro(_name)                                          \
+static struct freq_attr _name##_gov_pol =                               \
+__ATTR(_name, 0444, show_##_name##_gov_pol, NULL)
+
+#define gov_pol_attr_rw(_name)                                          \
+static struct freq_attr _name##_gov_pol =                               \
+__ATTR(_name, 0644, show_##_name##_gov_pol, store_##_name##_gov_pol)
+
+#define gov_sys_pol_attr_rw(_name)                                      \
+        gov_sys_attr_rw(_name);                                         \
+        gov_pol_attr_rw(_name)
+
+#define gov_sys_pol_attr_ro(_name)                                      \
+        gov_sys_attr_ro(_name);                                         \
+        gov_pol_attr_ro(_name)
+
+/* Create show/store routines */
+#define show_one(_gov, file_name)                                       \
+static ssize_t show_##file_name##_gov_sys                               \
 (struct kobject *kobj, struct attribute *attr, char *buf)               \
 {                                                                       \
-        return sprintf(buf, "%u\n", _gov##_tuners.object);              \
+        struct _gov##_dbs_tuners *tuners = _gov##_dbs_cdata.gdbs_data->tuners; \
+        return sprintf(buf, "%u\n", tuners->file_name);                 \
+}                                                                       \
+                                                                        \
+static ssize_t show_##file_name##_gov_pol                                       \
+(struct cpufreq_policy *policy, char *buf)                              \
+{                                                                       \
+        struct dbs_data *dbs_data = policy->governor_data;              \
+        struct _gov##_dbs_tuners *tuners = dbs_data->tuners;            \
+        return sprintf(buf, "%u\n", tuners->file_name);                 \
+}
+
+#define store_one(_gov, file_name)                                      \
+static ssize_t store_##file_name##_gov_sys                              \
+(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count)   \
+{                                                                       \
+        struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
+        return store_##file_name(dbs_data, buf, count);                 \
+}                                                                       \
+                                                                        \
+static ssize_t store_##file_name##_gov_pol                              \
+(struct cpufreq_policy *policy, const char *buf, size_t count)          \
+{                                                                       \
+        struct dbs_data *dbs_data = policy->governor_data;              \
+        return store_##file_name(dbs_data, buf, count);                 \
 }
 
+#define show_store_one(_gov, file_name)                                 \
+show_one(_gov, file_name);                                              \
+store_one(_gov, file_name)
+
+/* create helper routines */
 #define define_get_cpu_dbs_routines(_dbs_info)                          \
 static struct cpu_dbs_common_info *get_cpu_cdbs(int cpu)                \
 {                                                                       \
@@ -87,7 +148,6 @@ struct cpu_dbs_common_info {
 
 struct od_cpu_dbs_info_s {
         struct cpu_dbs_common_info cdbs;
-        u64 prev_cpu_iowait;
         struct cpufreq_frequency_table *freq_table;
         unsigned int freq_lo;
         unsigned int freq_lo_jiffies;
@@ -103,7 +163,7 @@ struct cs_cpu_dbs_info_s {
         unsigned int enable:1;
 };
 
-/* Governers sysfs tunables */
+/* Per policy Governers sysfs tunables */
 struct od_dbs_tuners {
         unsigned int ignore_nice;
         unsigned int sampling_rate;
@@ -123,31 +183,42 @@ struct cs_dbs_tuners {
         unsigned int freq_step;
 };
 
-/* Per Governer data */
-struct dbs_data {
+/* Common Governer data across policies */
+struct dbs_data;
+struct common_dbs_data {
         /* Common across governors */
         #define GOV_ONDEMAND            0
         #define GOV_CONSERVATIVE        1
         int governor;
-        unsigned int min_sampling_rate;
-        struct attribute_group *attr_group;
-        void *tuners;
+        struct attribute_group *attr_group_gov_sys; /* one governor - system */
+        struct attribute_group *attr_group_gov_pol; /* one governor - policy */
 
-        /* dbs_mutex protects dbs_enable in governor start/stop */
-        struct mutex mutex;
+        /* Common data for platforms that don't set have_governor_per_policy */
+        struct dbs_data *gdbs_data;
 
         struct cpu_dbs_common_info *(*get_cpu_cdbs)(int cpu);
         void *(*get_cpu_dbs_info_s)(int cpu);
         void (*gov_dbs_timer)(struct work_struct *work);
         void (*gov_check_cpu)(int cpu, unsigned int load);
+        int (*init)(struct dbs_data *dbs_data);
+        void (*exit)(struct dbs_data *dbs_data);
 
         /* Governor specific ops, see below */
         void *gov_ops;
 };
 
+/* Governer Per policy data */
+struct dbs_data {
+        struct common_dbs_data *cdata;
+        unsigned int min_sampling_rate;
+        void *tuners;
+
+        /* dbs_mutex protects dbs_enable in governor start/stop */
+        struct mutex mutex;
+};
+
 /* Governor specific ops, will be passed to dbs_data->gov_ops */
 struct od_ops {
-        int (*io_busy)(void);
         void (*powersave_bias_init_cpu)(int cpu);
         unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
                         unsigned int freq_next, unsigned int relation);
@@ -169,10 +240,31 @@ static inline int delay_for_sampling_rate(unsigned int sampling_rate)
         return delay;
 }
 
-u64 get_cpu_idle_time(unsigned int cpu, u64 *wall);
+#define declare_show_sampling_rate_min(_gov)                            \
+static ssize_t show_sampling_rate_min_gov_sys                           \
+(struct kobject *kobj, struct attribute *attr, char *buf)               \
+{                                                                       \
+        struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
+        return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
+}                                                                       \
+                                                                        \
+static ssize_t show_sampling_rate_min_gov_pol                           \
+(struct cpufreq_policy *policy, char *buf)                              \
+{                                                                       \
+        struct dbs_data *dbs_data = policy->governor_data;              \
+        return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
+}
+
+u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
 void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
 bool need_load_eval(struct cpu_dbs_common_info *cdbs,
                 unsigned int sampling_rate);
-int cpufreq_governor_dbs(struct dbs_data *dbs_data,
-                struct cpufreq_policy *policy, unsigned int event);
+int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+                struct common_dbs_data *cdata, unsigned int event);
+void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
+                unsigned int delay, bool all_cpus);
+void od_register_powersave_bias_handler(unsigned int (*f)
+                (struct cpufreq_policy *, unsigned int, unsigned int),
+                unsigned int powersave_bias);
+void od_unregister_powersave_bias_handler(void);
 #endif /* _CPUFREQ_GOVERNOR_H */
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index f3eb26cd848f..b0ffef96bf77 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -20,9 +20,11 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/percpu-defs.h>
+#include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/tick.h>
 #include <linux/types.h>
+#include <linux/cpu.h>
 
 #include "cpufreq_governor.h"
 
@@ -37,22 +39,14 @@
 #define MIN_FREQUENCY_UP_THRESHOLD              (11)
 #define MAX_FREQUENCY_UP_THRESHOLD              (100)
 
-static struct dbs_data od_dbs_data;
 static DEFINE_PER_CPU(struct od_cpu_dbs_info_s, od_cpu_dbs_info);
 
+static struct od_ops od_ops;
+
 #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
 static struct cpufreq_governor cpufreq_gov_ondemand;
 #endif
 
-static struct od_dbs_tuners od_tuners = {
-        .up_threshold = DEF_FREQUENCY_UP_THRESHOLD,
-        .sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,
-        .adj_up_threshold = DEF_FREQUENCY_UP_THRESHOLD -
-                            DEF_FREQUENCY_DOWN_DIFFERENTIAL,
-        .ignore_nice = 0,
-        .powersave_bias = 0,
-};
-
 static void ondemand_powersave_bias_init_cpu(int cpu)
 {
         struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
@@ -89,7 +83,7 @@ static int should_io_be_busy(void)
  * Returns the freq_hi to be used right now and will set freq_hi_jiffies,
  * freq_lo, and freq_lo_jiffies in percpu area for averaging freqs.
  */
-static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
+static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
                 unsigned int freq_next, unsigned int relation)
 {
         unsigned int freq_req, freq_reduc, freq_avg;
@@ -98,6 +92,8 @@ static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
         unsigned int jiffies_total, jiffies_hi, jiffies_lo;
         struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
                                                    policy->cpu);
+        struct dbs_data *dbs_data = policy->governor_data;
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
 
         if (!dbs_info->freq_table) {
                 dbs_info->freq_lo = 0;
@@ -108,7 +104,7 @@ static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
         cpufreq_frequency_table_target(policy, dbs_info->freq_table, freq_next,
                         relation, &index);
         freq_req = dbs_info->freq_table[index].frequency;
-        freq_reduc = freq_req * od_tuners.powersave_bias / 1000;
+        freq_reduc = freq_req * od_tuners->powersave_bias / 1000;
         freq_avg = freq_req - freq_reduc;
 
         /* Find freq bounds for freq_avg in freq_table */
@@ -127,7 +123,7 @@ static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
                 dbs_info->freq_lo_jiffies = 0;
                 return freq_lo;
         }
-        jiffies_total = usecs_to_jiffies(od_tuners.sampling_rate);
+        jiffies_total = usecs_to_jiffies(od_tuners->sampling_rate);
         jiffies_hi = (freq_avg - freq_lo) * jiffies_total;
         jiffies_hi += ((freq_hi - freq_lo) / 2);
         jiffies_hi /= (freq_hi - freq_lo);
@@ -148,12 +144,16 @@ static void ondemand_powersave_bias_init(void)
 
 static void dbs_freq_increase(struct cpufreq_policy *p, unsigned int freq)
 {
-        if (od_tuners.powersave_bias)
-                freq = powersave_bias_target(p, freq, CPUFREQ_RELATION_H);
+        struct dbs_data *dbs_data = p->governor_data;
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
+
+        if (od_tuners->powersave_bias)
+                freq = od_ops.powersave_bias_target(p, freq,
+                                CPUFREQ_RELATION_H);
         else if (p->cur == p->max)
                 return;
 
-        __cpufreq_driver_target(p, freq, od_tuners.powersave_bias ?
+        __cpufreq_driver_target(p, freq, od_tuners->powersave_bias ?
                         CPUFREQ_RELATION_L : CPUFREQ_RELATION_H);
 }
 
@@ -170,15 +170,17 @@ static void od_check_cpu(int cpu, unsigned int load_freq)
 {
         struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
         struct cpufreq_policy *policy = dbs_info->cdbs.cur_policy;
+        struct dbs_data *dbs_data = policy->governor_data;
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
 
         dbs_info->freq_lo = 0;
 
         /* Check for frequency increase */
-        if (load_freq > od_tuners.up_threshold * policy->cur) {
+        if (load_freq > od_tuners->up_threshold * policy->cur) {
                 /* If switching to max speed, apply sampling_down_factor */
                 if (policy->cur < policy->max)
                         dbs_info->rate_mult =
-                                od_tuners.sampling_down_factor;
+                                od_tuners->sampling_down_factor;
                 dbs_freq_increase(policy, policy->max);
                 return;
         }
@@ -193,9 +195,10 @@ static void od_check_cpu(int cpu, unsigned int load_freq)
          * support the current CPU usage without triggering the up policy. To be
          * safe, we focus 10 points under the threshold.
          */
-        if (load_freq < od_tuners.adj_up_threshold * policy->cur) {
+        if (load_freq < od_tuners->adj_up_threshold
+                        * policy->cur) {
                 unsigned int freq_next;
-                freq_next = load_freq / od_tuners.adj_up_threshold;
+                freq_next = load_freq / od_tuners->adj_up_threshold;
 
                 /* No longer fully busy, reset rate_mult */
                 dbs_info->rate_mult = 1;
@@ -203,65 +206,62 @@ static void od_check_cpu(int cpu, unsigned int load_freq)
                 if (freq_next < policy->min)
                         freq_next = policy->min;
 
-                if (!od_tuners.powersave_bias) {
+                if (!od_tuners->powersave_bias) {
                         __cpufreq_driver_target(policy, freq_next,
                                         CPUFREQ_RELATION_L);
-                } else {
-                        int freq = powersave_bias_target(policy, freq_next,
-                                        CPUFREQ_RELATION_L);
-                        __cpufreq_driver_target(policy, freq,
-                                        CPUFREQ_RELATION_L);
+                        return;
                 }
+
+                freq_next = od_ops.powersave_bias_target(policy, freq_next,
+                                        CPUFREQ_RELATION_L);
+                __cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L);
         }
 }
 
 static void od_dbs_timer(struct work_struct *work)
 {
-        struct delayed_work *dw = to_delayed_work(work);
         struct od_cpu_dbs_info_s *dbs_info =
                 container_of(work, struct od_cpu_dbs_info_s, cdbs.work.work);
         unsigned int cpu = dbs_info->cdbs.cur_policy->cpu;
         struct od_cpu_dbs_info_s *core_dbs_info = &per_cpu(od_cpu_dbs_info,
                         cpu);
-        int delay, sample_type = core_dbs_info->sample_type;
-        bool eval_load;
+        struct dbs_data *dbs_data = dbs_info->cdbs.cur_policy->governor_data;
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
+        int delay = 0, sample_type = core_dbs_info->sample_type;
+        bool modify_all = true;
 
         mutex_lock(&core_dbs_info->cdbs.timer_mutex);
-        eval_load = need_load_eval(&core_dbs_info->cdbs,
-                        od_tuners.sampling_rate);
+        if (!need_load_eval(&core_dbs_info->cdbs, od_tuners->sampling_rate)) {
+                modify_all = false;
+                goto max_delay;
+        }
 
         /* Common NORMAL_SAMPLE setup */
         core_dbs_info->sample_type = OD_NORMAL_SAMPLE;
         if (sample_type == OD_SUB_SAMPLE) {
                 delay = core_dbs_info->freq_lo_jiffies;
-                if (eval_load)
-                        __cpufreq_driver_target(core_dbs_info->cdbs.cur_policy,
-                                                core_dbs_info->freq_lo,
-                                                CPUFREQ_RELATION_H);
+                __cpufreq_driver_target(core_dbs_info->cdbs.cur_policy,
+                                core_dbs_info->freq_lo, CPUFREQ_RELATION_H);
         } else {
-                if (eval_load)
-                        dbs_check_cpu(&od_dbs_data, cpu);
+                dbs_check_cpu(dbs_data, cpu);
                 if (core_dbs_info->freq_lo) {
                         /* Setup timer for SUB_SAMPLE */
                         core_dbs_info->sample_type = OD_SUB_SAMPLE;
                         delay = core_dbs_info->freq_hi_jiffies;
-                } else {
-                        delay = delay_for_sampling_rate(od_tuners.sampling_rate
-                                                * core_dbs_info->rate_mult);
                 }
         }
 
-        schedule_delayed_work_on(smp_processor_id(), dw, delay);
+max_delay:
+        if (!delay)
+                delay = delay_for_sampling_rate(od_tuners->sampling_rate
+                                * core_dbs_info->rate_mult);
+
+        gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, delay, modify_all);
         mutex_unlock(&core_dbs_info->cdbs.timer_mutex);
 }
 
 /************************** sysfs interface ************************/
-
-static ssize_t show_sampling_rate_min(struct kobject *kobj,
-                                      struct attribute *attr, char *buf)
-{
-        return sprintf(buf, "%u\n", od_dbs_data.min_sampling_rate);
-}
+static struct common_dbs_data od_dbs_cdata;
 
 /**
  * update_sampling_rate - update sampling rate effective immediately if needed.
@@ -276,12 +276,14 @@ static ssize_t show_sampling_rate_min(struct kobject *kobj,
  * reducing the sampling rate, we need to make the new value effective
  * immediately.
  */
-static void update_sampling_rate(unsigned int new_rate)
+static void update_sampling_rate(struct dbs_data *dbs_data,
+                unsigned int new_rate)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         int cpu;
 
-        od_tuners.sampling_rate = new_rate = max(new_rate,
-                        od_dbs_data.min_sampling_rate);
+        od_tuners->sampling_rate = new_rate = max(new_rate,
+                        dbs_data->min_sampling_rate);
 
         for_each_online_cpu(cpu) {
                 struct cpufreq_policy *policy;
@@ -314,42 +316,54 @@ static void update_sampling_rate(unsigned int new_rate)
                         cancel_delayed_work_sync(&dbs_info->cdbs.work);
                         mutex_lock(&dbs_info->cdbs.timer_mutex);
 
-                        schedule_delayed_work_on(cpu, &dbs_info->cdbs.work,
-                                        usecs_to_jiffies(new_rate));
+                        gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy,
+                                        usecs_to_jiffies(new_rate), true);
 
                 }
                 mutex_unlock(&dbs_info->cdbs.timer_mutex);
         }
 }
 
-static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,
-                                   const char *buf, size_t count)
+static ssize_t store_sampling_rate(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
         if (ret != 1)
                 return -EINVAL;
-        update_sampling_rate(input);
+
+        update_sampling_rate(dbs_data, input);
         return count;
 }
 
-static ssize_t store_io_is_busy(struct kobject *a, struct attribute *b,
-                                   const char *buf, size_t count)
+static ssize_t store_io_is_busy(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
+        unsigned int j;
 
         ret = sscanf(buf, "%u", &input);
         if (ret != 1)
                 return -EINVAL;
-        od_tuners.io_is_busy = !!input;
+        od_tuners->io_is_busy = !!input;
+
+        /* we need to re-evaluate prev_cpu_idle */
+        for_each_online_cpu(j) {
+                struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
+                                                                        j);
+                dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
+                        &dbs_info->cdbs.prev_cpu_wall, od_tuners->io_is_busy);
+        }
         return count;
 }
 
-static ssize_t store_up_threshold(struct kobject *a, struct attribute *b,
-                                  const char *buf, size_t count)
+static ssize_t store_up_threshold(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
@@ -359,23 +373,24 @@ static ssize_t store_up_threshold(struct kobject *a, struct attribute *b,
                 return -EINVAL;
         }
         /* Calculate the new adj_up_threshold */
-        od_tuners.adj_up_threshold += input;
-        od_tuners.adj_up_threshold -= od_tuners.up_threshold;
+        od_tuners->adj_up_threshold += input;
+        od_tuners->adj_up_threshold -= od_tuners->up_threshold;
 
-        od_tuners.up_threshold = input;
+        od_tuners->up_threshold = input;
         return count;
 }
 
-static ssize_t store_sampling_down_factor(struct kobject *a,
-                        struct attribute *b, const char *buf, size_t count)
+static ssize_t store_sampling_down_factor(struct dbs_data *dbs_data,
+                const char *buf, size_t count)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         unsigned int input, j;
         int ret;
         ret = sscanf(buf, "%u", &input);
 
         if (ret != 1 || input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
-        od_tuners.sampling_down_factor = input;
+        od_tuners->sampling_down_factor = input;
 
         /* Reset down sampling multiplier in case it was active */
         for_each_online_cpu(j) {
@@ -386,9 +401,10 @@ static ssize_t store_sampling_down_factor(struct kobject *a,
         return count;
 }
 
-static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
-                                      const char *buf, size_t count)
+static ssize_t store_ignore_nice(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
 
@@ -401,18 +417,18 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
         if (input > 1)
                 input = 1;
 
-        if (input == od_tuners.ignore_nice) { /* nothing to do */
+        if (input == od_tuners->ignore_nice) { /* nothing to do */
                 return count;
         }
-        od_tuners.ignore_nice = input;
+        od_tuners->ignore_nice = input;
 
         /* we need to re-evaluate prev_cpu_idle */
         for_each_online_cpu(j) {
                 struct od_cpu_dbs_info_s *dbs_info;
                 dbs_info = &per_cpu(od_cpu_dbs_info, j);
                 dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
-                                                &dbs_info->cdbs.prev_cpu_wall);
-                if (od_tuners.ignore_nice)
+                        &dbs_info->cdbs.prev_cpu_wall, od_tuners->io_is_busy);
+                if (od_tuners->ignore_nice)
                         dbs_info->cdbs.prev_cpu_nice =
                                 kcpustat_cpu(j).cpustat[CPUTIME_NICE];
 
@@ -420,9 +436,10 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b,
         return count;
 }
 
-static ssize_t store_powersave_bias(struct kobject *a, struct attribute *b,
-                                    const char *buf, size_t count)
+static ssize_t store_powersave_bias(struct dbs_data *dbs_data, const char *buf,
+                size_t count)
 {
+        struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         unsigned int input;
         int ret;
         ret = sscanf(buf, "%u", &input);
@@ -433,68 +450,179 @@ static ssize_t store_powersave_bias(struct kobject *a, struct attribute *b,
         if (input > 1000)
                 input = 1000;
 
-        od_tuners.powersave_bias = input;
+        od_tuners->powersave_bias = input;
         ondemand_powersave_bias_init();
         return count;
 }
 
-show_one(od, sampling_rate, sampling_rate);
-show_one(od, io_is_busy, io_is_busy);
-show_one(od, up_threshold, up_threshold);
-show_one(od, sampling_down_factor, sampling_down_factor);
-show_one(od, ignore_nice_load, ignore_nice);
-show_one(od, powersave_bias, powersave_bias);
-
-define_one_global_rw(sampling_rate);
-define_one_global_rw(io_is_busy);
-define_one_global_rw(up_threshold);
-define_one_global_rw(sampling_down_factor);
-define_one_global_rw(ignore_nice_load);
-define_one_global_rw(powersave_bias);
-define_one_global_ro(sampling_rate_min);
-
-static struct attribute *dbs_attributes[] = {
-        &sampling_rate_min.attr,
-        &sampling_rate.attr,
-        &up_threshold.attr,
-        &sampling_down_factor.attr,
-        &ignore_nice_load.attr,
-        &powersave_bias.attr,
-        &io_is_busy.attr,
+show_store_one(od, sampling_rate);
+show_store_one(od, io_is_busy);
+show_store_one(od, up_threshold);
+show_store_one(od, sampling_down_factor);
+show_store_one(od, ignore_nice);
+show_store_one(od, powersave_bias);
+declare_show_sampling_rate_min(od);
+
+gov_sys_pol_attr_rw(sampling_rate);
+gov_sys_pol_attr_rw(io_is_busy);
+gov_sys_pol_attr_rw(up_threshold);
+gov_sys_pol_attr_rw(sampling_down_factor);
+gov_sys_pol_attr_rw(ignore_nice);
+gov_sys_pol_attr_rw(powersave_bias);
+gov_sys_pol_attr_ro(sampling_rate_min);
+
+static struct attribute *dbs_attributes_gov_sys[] = {
+        &sampling_rate_min_gov_sys.attr,
+        &sampling_rate_gov_sys.attr,
+        &up_threshold_gov_sys.attr,
+        &sampling_down_factor_gov_sys.attr,
+        &ignore_nice_gov_sys.attr,
+        &powersave_bias_gov_sys.attr,
+        &io_is_busy_gov_sys.attr,
+        NULL
+};
+
+static struct attribute_group od_attr_group_gov_sys = {
+        .attrs = dbs_attributes_gov_sys,
+        .name = "ondemand",
+};
+
+static struct attribute *dbs_attributes_gov_pol[] = {
+        &sampling_rate_min_gov_pol.attr,
+        &sampling_rate_gov_pol.attr,
+        &up_threshold_gov_pol.attr,
+        &sampling_down_factor_gov_pol.attr,
+        &ignore_nice_gov_pol.attr,
+        &powersave_bias_gov_pol.attr,
+        &io_is_busy_gov_pol.attr,
         NULL
 };
 
-static struct attribute_group od_attr_group = {
-        .attrs = dbs_attributes,
+static struct attribute_group od_attr_group_gov_pol = {
+        .attrs = dbs_attributes_gov_pol,
         .name = "ondemand",
 };
 
 /************************** sysfs end ************************/
 
+static int od_init(struct dbs_data *dbs_data)
+{
+        struct od_dbs_tuners *tuners;
+        u64 idle_time;
+        int cpu;
+
+        tuners = kzalloc(sizeof(struct od_dbs_tuners), GFP_KERNEL);
+        if (!tuners) {
+                pr_err("%s: kzalloc failed\n", __func__);
+                return -ENOMEM;
+        }
+
+        cpu = get_cpu();
+        idle_time = get_cpu_idle_time_us(cpu, NULL);
+        put_cpu();
+        if (idle_time != -1ULL) {
+                /* Idle micro accounting is supported. Use finer thresholds */
+                tuners->up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;
+                tuners->adj_up_threshold = MICRO_FREQUENCY_UP_THRESHOLD -
+                        MICRO_FREQUENCY_DOWN_DIFFERENTIAL;
+                /*
+                 * In nohz/micro accounting case we set the minimum frequency
+                 * not depending on HZ, but fixed (very low). The deferred
+                 * timer might skip some samples if idle/sleeping as needed.
+                */
+                dbs_data->min_sampling_rate = MICRO_FREQUENCY_MIN_SAMPLE_RATE;
+        } else {
+                tuners->up_threshold = DEF_FREQUENCY_UP_THRESHOLD;
+                tuners->adj_up_threshold = DEF_FREQUENCY_UP_THRESHOLD -
+                        DEF_FREQUENCY_DOWN_DIFFERENTIAL;
+
+                /* For correct statistics, we need 10 ticks for each measure */
+                dbs_data->min_sampling_rate = MIN_SAMPLING_RATE_RATIO *
+                        jiffies_to_usecs(10);
+        }
+
+        tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
+        tuners->ignore_nice = 0;
+        tuners->powersave_bias = 0;
+        tuners->io_is_busy = should_io_be_busy();
+
+        dbs_data->tuners = tuners;
+        pr_info("%s: tuners %p\n", __func__, tuners);
+        mutex_init(&dbs_data->mutex);
+        return 0;
+}
+
+static void od_exit(struct dbs_data *dbs_data)
+{
+        kfree(dbs_data->tuners);
+}
+
 define_get_cpu_dbs_routines(od_cpu_dbs_info);
 
 static struct od_ops od_ops = {
-        .io_busy = should_io_be_busy,
         .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
-        .powersave_bias_target = powersave_bias_target,
+        .powersave_bias_target = generic_powersave_bias_target,
         .freq_increase = dbs_freq_increase,
 };
 
-static struct dbs_data od_dbs_data = {
+static struct common_dbs_data od_dbs_cdata = {
         .governor = GOV_ONDEMAND,
-        .attr_group = &od_attr_group,
-        .tuners = &od_tuners,
+        .attr_group_gov_sys = &od_attr_group_gov_sys,
+        .attr_group_gov_pol = &od_attr_group_gov_pol,
         .get_cpu_cdbs = get_cpu_cdbs,
         .get_cpu_dbs_info_s = get_cpu_dbs_info_s,
         .gov_dbs_timer = od_dbs_timer,
         .gov_check_cpu = od_check_cpu,
         .gov_ops = &od_ops,
+        .init = od_init,
+        .exit = od_exit,
 };
 
+static void od_set_powersave_bias(unsigned int powersave_bias)
+{
+        struct cpufreq_policy *policy;
+        struct dbs_data *dbs_data;
+        struct od_dbs_tuners *od_tuners;
+        unsigned int cpu;
+        cpumask_t done;
+
+        cpumask_clear(&done);
+
+        get_online_cpus();
+        for_each_online_cpu(cpu) {
+                if (cpumask_test_cpu(cpu, &done))
+                        continue;
+
+                policy = per_cpu(od_cpu_dbs_info, cpu).cdbs.cur_policy;
+                dbs_data = policy->governor_data;
+                od_tuners = dbs_data->tuners;
+                od_tuners->powersave_bias = powersave_bias;
+
+                cpumask_or(&done, &done, policy->cpus);
+        }
+        put_online_cpus();
+}
+
+void od_register_powersave_bias_handler(unsigned int (*f)
+                (struct cpufreq_policy *, unsigned int, unsigned int),
+                unsigned int powersave_bias)
+{
+        od_ops.powersave_bias_target = f;
+        od_set_powersave_bias(powersave_bias);
+}
+EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
+
+void od_unregister_powersave_bias_handler(void)
+{
+        od_ops.powersave_bias_target = generic_powersave_bias_target;
+        od_set_powersave_bias(0);
+}
+EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
+
 static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 unsigned int event)
 {
-        return cpufreq_governor_dbs(&od_dbs_data, policy, event);
+        return cpufreq_governor_dbs(policy, &od_dbs_cdata, event);
 }
 
 #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
@@ -509,29 +637,6 @@ struct cpufreq_governor cpufreq_gov_ondemand = {
 
 static int __init cpufreq_gov_dbs_init(void)
 {
-        u64 idle_time;
-        int cpu = get_cpu();
-
-        mutex_init(&od_dbs_data.mutex);
-        idle_time = get_cpu_idle_time_us(cpu, NULL);
-        put_cpu();
-        if (idle_time != -1ULL) {
-                /* Idle micro accounting is supported. Use finer thresholds */
-                od_tuners.up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;
-                od_tuners.adj_up_threshold = MICRO_FREQUENCY_UP_THRESHOLD -
-                                             MICRO_FREQUENCY_DOWN_DIFFERENTIAL;
-                /*
-                 * In nohz/micro accounting case we set the minimum frequency
-                 * not depending on HZ, but fixed (very low). The deferred
-                 * timer might skip some samples if idle/sleeping as needed.
-                */
-                od_dbs_data.min_sampling_rate = MICRO_FREQUENCY_MIN_SAMPLE_RATE;
-        } else {
-                /* For correct statistics, we need 10 ticks for each measure */
-                od_dbs_data.min_sampling_rate = MIN_SAMPLING_RATE_RATIO *
-                        jiffies_to_usecs(10);
-        }
-
         return cpufreq_register_governor(&cpufreq_gov_ondemand);
 }
 
diff --git a/arch/cris/arch-v32/mach-a3/cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
index ee391ecb5bc9..ee142c490575 100644
--- a/arch/cris/arch-v32/mach-a3/cpufreq.c
+++ b/drivers/cpufreq/cris-artpec3-cpufreq.c
@@ -27,23 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
         return clk_ctrl.pll ? 200000 : 6000;
 }
 
-static void cris_freq_set_cpu_state(unsigned int state)
+static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,
+                unsigned int state)
 {
-        int i = 0;
         struct cpufreq_freqs freqs;
         reg_clkgen_rw_clk_ctrl clk_ctrl;
         clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl);
 
-#ifdef CONFIG_SMP
-        for_each_present_cpu(i)
-#endif
-        {
-                freqs.old = cris_freq_get_cpu_frequency(i);
-                freqs.new = cris_freq_table[state].frequency;
-                freqs.cpu = i;
-        }
+        freqs.old = cris_freq_get_cpu_frequency(policy->cpu);
+        freqs.new = cris_freq_table[state].frequency;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         local_irq_disable();
 
@@ -57,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)
 
         local_irq_enable();
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 };
 
 static int cris_freq_verify(struct cpufreq_policy *policy)
@@ -75,7 +69,7 @@ static int cris_freq_target(struct cpufreq_policy *policy,
                         target_freq, relation, &newstate))
                 return -EINVAL;
 
-        cris_freq_set_cpu_state(newstate);
+        cris_freq_set_cpu_state(policy, newstate);
 
         return 0;
 }
diff --git a/arch/cris/arch-v32/mach-fs/cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
index d92cf70d1cbe..12952235d5db 100644
--- a/arch/cris/arch-v32/mach-fs/cpufreq.c
+++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c
@@ -27,20 +27,17 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
         return clk_ctrl.pll ? 200000 : 6000;
 }
 
-static void cris_freq_set_cpu_state(unsigned int state)
+static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,
+                unsigned int state)
 {
-        int i;
         struct cpufreq_freqs freqs;
         reg_config_rw_clk_ctrl clk_ctrl;
         clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl);
 
-        for_each_possible_cpu(i) {
-                freqs.old = cris_freq_get_cpu_frequency(i);
-                freqs.new = cris_freq_table[state].frequency;
-                freqs.cpu = i;
-        }
+        freqs.old = cris_freq_get_cpu_frequency(policy->cpu);
+        freqs.new = cris_freq_table[state].frequency;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         local_irq_disable();
 
@@ -54,7 +51,7 @@ static void cris_freq_set_cpu_state(unsigned int state)
 
         local_irq_enable();
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 };
 
 static int cris_freq_verify(struct cpufreq_policy *policy)
@@ -71,7 +68,7 @@ static int cris_freq_target(struct cpufreq_policy *policy,
             (policy, cris_freq_table, target_freq, relation, &newstate))
                 return -EINVAL;
 
-        cris_freq_set_cpu_state(newstate);
+        cris_freq_set_cpu_state(policy, newstate);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 4729eaab0f40..c33c76c360fa 100644
--- a/arch/arm/mach-davinci/cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -30,8 +30,6 @@
 #include <mach/cpufreq.h>
 #include <mach/common.h>
 
-#include "clock.h"
-
 struct davinci_cpufreq {
         struct device *dev;
         struct clk *armclk;
@@ -79,18 +77,8 @@ static int davinci_target(struct cpufreq_policy *policy,
         struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
         struct clk *armclk = cpufreq.armclk;
 
-        /*
-         * Ensure desired rate is within allowed range.  Some govenors
-         * (ondemand) will just pass target_freq=0 to get the minimum.
-         */
-        if (target_freq < policy->cpuinfo.min_freq)
-                target_freq = policy->cpuinfo.min_freq;
-        if (target_freq > policy->cpuinfo.max_freq)
-                target_freq = policy->cpuinfo.max_freq;
-
         freqs.old = davinci_getspeed(0);
         freqs.new = clk_round_rate(armclk, target_freq * 1000) / 1000;
-        freqs.cpu = 0;
 
         if (freqs.old == freqs.new)
                 return ret;
@@ -102,7 +90,7 @@ static int davinci_target(struct cpufreq_policy *policy,
         if (ret)
                 return -EINVAL;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* if moving to higher frequency, up the voltage beforehand */
         if (pdata->set_voltage && freqs.new > freqs.old) {
@@ -126,7 +114,7 @@ static int davinci_target(struct cpufreq_policy *policy,
                 pdata->set_voltage(idx);
 
 out:
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
@@ -147,21 +135,16 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
                         return result;
         }
 
-        policy->cur = policy->min = policy->max = davinci_getspeed(0);
+        policy->cur = davinci_getspeed(0);
 
-        if (freq_table) {
-                result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
-                if (!result)
-                        cpufreq_frequency_table_get_attr(freq_table,
-                                                        policy->cpu);
-        } else {
-                policy->cpuinfo.min_freq = policy->min;
-                policy->cpuinfo.max_freq = policy->max;
+        result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
+        if (result) {
+                pr_err("%s: cpufreq_frequency_table_cpuinfo() failed",
+                                __func__);
+                return result;
         }
 
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-        policy->cur = davinci_getspeed(0);
+        cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
 
         /*
          * Time measurement across the target() function yields ~1500-1800us
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 72f0c3efa76e..6ec6539ae041 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -37,12 +37,6 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
         unsigned int idx;
         int ret;
 
-        /* scale the target frequency to one of the extremes supported */
-        if (target_freq < policy->cpuinfo.min_freq)
-                target_freq = policy->cpuinfo.min_freq;
-        if (target_freq > policy->cpuinfo.max_freq)
-                target_freq = policy->cpuinfo.max_freq;
-
         /* Lookup the next frequency */
         if (cpufreq_frequency_table_target(policy, freq_table, target_freq,
                                         relation, &idx))
@@ -55,8 +49,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
                 return 0;
 
         /* pre-change notification */
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* update armss clk frequency */
         ret = clk_set_rate(armss_clk, freqs.new * 1000);
@@ -68,8 +61,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
         }
 
         /* post change notification */
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
@@ -79,15 +71,15 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
         int i = 0;
         unsigned long freq = clk_get_rate(armss_clk) / 1000;
 
-        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
-                if (freq <= freq_table[i].frequency)
+        /* The value is rounded to closest frequency in the defined table. */
+        while (freq_table[i + 1].frequency != CPUFREQ_TABLE_END) {
+                if (freq < freq_table[i].frequency +
+                   (freq_table[i + 1].frequency - freq_table[i].frequency) / 2)
                         return freq_table[i].frequency;
                 i++;
         }
 
-        /* We could not find a corresponding frequency. */
-        pr_err("dbx500-cpufreq: Failed to find cpufreq speed\n");
-        return 0;
+        return freq_table[i].frequency;
 }
 
 static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index 3fffbe6025cd..37380fb92621 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -104,7 +104,7 @@ static unsigned int eps_get(unsigned int cpu)
 }
 
 static int eps_set_state(struct eps_cpu_data *centaur,
-                         unsigned int cpu,
+                         struct cpufreq_policy *policy,
                          u32 dest_state)
 {
         struct cpufreq_freqs freqs;
@@ -112,10 +112,9 @@ static int eps_set_state(struct eps_cpu_data *centaur,
         int err = 0;
         int i;
 
-        freqs.old = eps_get(cpu);
+        freqs.old = eps_get(policy->cpu);
         freqs.new = centaur->fsb * ((dest_state >> 8) & 0xff);
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* Wait while CPU is busy */
         rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
@@ -162,7 +161,7 @@ postchange:
                 current_multiplier);
         }
 #endif
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return err;
 }
 
@@ -190,7 +189,7 @@ static int eps_target(struct cpufreq_policy *policy,
 
         /* Make frequency transition */
         dest_state = centaur->freq_table[newstate].index & 0xffff;
-        ret = eps_set_state(centaur, cpu, dest_state);
+        ret = eps_set_state(centaur, policy, dest_state);
         if (ret)
                 printk(KERN_ERR "eps: Timeout!\n");
         return ret;
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index 960671fd3d7e..658d860344b0 100644
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -117,15 +117,15 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
  *      There is no return value.
  */
 
-static void elanfreq_set_cpu_state(unsigned int state)
+static void elanfreq_set_cpu_state(struct cpufreq_policy *policy,
+                unsigned int state)
 {
         struct cpufreq_freqs    freqs;
 
         freqs.old = elanfreq_get_cpu_frequency(0);
         freqs.new = elan_multiplier[state].clock;
-        freqs.cpu = 0; /* elanfreq.c is UP only driver */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         printk(KERN_INFO "elanfreq: attempting to set frequency to %i kHz\n",
                         elan_multiplier[state].clock);
@@ -161,7 +161,7 @@ static void elanfreq_set_cpu_state(unsigned int state)
         udelay(10000);
         local_irq_enable();
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 };
 
 
@@ -188,7 +188,7 @@ static int elanfreq_target(struct cpufreq_policy *policy,
                                 target_freq, relation, &newstate))
                 return -EINVAL;
 
-        elanfreq_set_cpu_state(newstate);
+        elanfreq_set_cpu_state(policy, newstate);
 
         return 0;
 }
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 78057a357ddb..475b4f607f0d 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -70,7 +70,6 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
 
         freqs.old = policy->cur;
         freqs.new = target_freq;
-        freqs.cpu = policy->cpu;
 
         if (freqs.new == freqs.old)
                 goto out;
@@ -105,8 +104,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
         }
         arm_volt = volt_table[index];
 
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* When the new frequency is higher than current frequency */
         if ((freqs.new > freqs.old) && !safe_arm_volt) {
@@ -131,8 +129,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
 
         exynos_info->set_freq(old_index, index);
 
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         /* When the new frequency is lower than current frequency */
         if ((freqs.new < freqs.old) ||
@@ -297,7 +294,7 @@ static int __init exynos_cpufreq_init(void)
         else if (soc_is_exynos5250())
                 ret = exynos5250_cpufreq_init(exynos_info);
         else
-                pr_err("%s: CPU type not found\n", __func__);
+                return 0;
 
         if (ret)
                 goto err_vdd_arm;
diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c
new file mode 100644
index 000000000000..0c74018eda47
--- /dev/null
+++ b/drivers/cpufreq/exynos5440-cpufreq.c
@@ -0,0 +1,481 @@
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Amit Daniel Kachhap <amit.daniel@samsung.com>
+ *
+ * EXYNOS5440 - CPU frequency scaling support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/clk.h>
+#include <linux/cpu.h>
+#include <linux/cpufreq.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/opp.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+/* Register definitions */
+#define XMU_DVFS_CTRL           0x0060
+#define XMU_PMU_P0_7            0x0064
+#define XMU_C0_3_PSTATE         0x0090
+#define XMU_P_LIMIT             0x00a0
+#define XMU_P_STATUS            0x00a4
+#define XMU_PMUEVTEN            0x00d0
+#define XMU_PMUIRQEN            0x00d4
+#define XMU_PMUIRQ              0x00d8
+
+/* PMU mask and shift definations */
+#define P_VALUE_MASK            0x7
+
+#define XMU_DVFS_CTRL_EN_SHIFT  0
+
+#define P0_7_CPUCLKDEV_SHIFT    21
+#define P0_7_CPUCLKDEV_MASK     0x7
+#define P0_7_ATBCLKDEV_SHIFT    18
+#define P0_7_ATBCLKDEV_MASK     0x7
+#define P0_7_CSCLKDEV_SHIFT     15
+#define P0_7_CSCLKDEV_MASK      0x7
+#define P0_7_CPUEMA_SHIFT       28
+#define P0_7_CPUEMA_MASK        0xf
+#define P0_7_L2EMA_SHIFT        24
+#define P0_7_L2EMA_MASK         0xf
+#define P0_7_VDD_SHIFT          8
+#define P0_7_VDD_MASK           0x7f
+#define P0_7_FREQ_SHIFT         0
+#define P0_7_FREQ_MASK          0xff
+
+#define C0_3_PSTATE_VALID_SHIFT 8
+#define C0_3_PSTATE_CURR_SHIFT  4
+#define C0_3_PSTATE_NEW_SHIFT   0
+
+#define PSTATE_CHANGED_EVTEN_SHIFT      0
+
+#define PSTATE_CHANGED_IRQEN_SHIFT      0
+
+#define PSTATE_CHANGED_SHIFT            0
+
+/* some constant values for clock divider calculation */
+#define CPU_DIV_FREQ_MAX        500
+#define CPU_DBG_FREQ_MAX        375
+#define CPU_ATB_FREQ_MAX        500
+
+#define PMIC_LOW_VOLT           0x30
+#define PMIC_HIGH_VOLT          0x28
+
+#define CPUEMA_HIGH             0x2
+#define CPUEMA_MID              0x4
+#define CPUEMA_LOW              0x7
+
+#define L2EMA_HIGH              0x1
+#define L2EMA_MID               0x3
+#define L2EMA_LOW               0x4
+
+#define DIV_TAB_MAX     2
+/* frequency unit is 20MHZ */
+#define FREQ_UNIT       20
+#define MAX_VOLTAGE     1550000 /* In microvolt */
+#define VOLTAGE_STEP    12500   /* In microvolt */
+
+#define CPUFREQ_NAME            "exynos5440_dvfs"
+#define DEF_TRANS_LATENCY       100000
+
+enum cpufreq_level_index {
+        L0, L1, L2, L3, L4,
+        L5, L6, L7, L8, L9,
+};
+#define CPUFREQ_LEVEL_END       (L7 + 1)
+
+struct exynos_dvfs_data {
+        void __iomem *base;
+        struct resource *mem;
+        int irq;
+        struct clk *cpu_clk;
+        unsigned int cur_frequency;
+        unsigned int latency;
+        struct cpufreq_frequency_table *freq_table;
+        unsigned int freq_count;
+        struct device *dev;
+        bool dvfs_enabled;
+        struct work_struct irq_work;
+};
+
+static struct exynos_dvfs_data *dvfs_info;
+static DEFINE_MUTEX(cpufreq_lock);
+static struct cpufreq_freqs freqs;
+
+static int init_div_table(void)
+{
+        struct cpufreq_frequency_table *freq_tbl = dvfs_info->freq_table;
+        unsigned int tmp, clk_div, ema_div, freq, volt_id;
+        int i = 0;
+        struct opp *opp;
+
+        rcu_read_lock();
+        for (i = 0; freq_tbl[i].frequency != CPUFREQ_TABLE_END; i++) {
+
+                opp = opp_find_freq_exact(dvfs_info->dev,
+                                        freq_tbl[i].frequency * 1000, true);
+                if (IS_ERR(opp)) {
+                        rcu_read_unlock();
+                        dev_err(dvfs_info->dev,
+                                "failed to find valid OPP for %u KHZ\n",
+                                freq_tbl[i].frequency);
+                        return PTR_ERR(opp);
+                }
+
+                freq = freq_tbl[i].frequency / 1000; /* In MHZ */
+                clk_div = ((freq / CPU_DIV_FREQ_MAX) & P0_7_CPUCLKDEV_MASK)
+                                        << P0_7_CPUCLKDEV_SHIFT;
+                clk_div |= ((freq / CPU_ATB_FREQ_MAX) & P0_7_ATBCLKDEV_MASK)
+                                        << P0_7_ATBCLKDEV_SHIFT;
+                clk_div |= ((freq / CPU_DBG_FREQ_MAX) & P0_7_CSCLKDEV_MASK)
+                                        << P0_7_CSCLKDEV_SHIFT;
+
+                /* Calculate EMA */
+                volt_id = opp_get_voltage(opp);
+                volt_id = (MAX_VOLTAGE - volt_id) / VOLTAGE_STEP;
+                if (volt_id < PMIC_HIGH_VOLT) {
+                        ema_div = (CPUEMA_HIGH << P0_7_CPUEMA_SHIFT) |
+                                (L2EMA_HIGH << P0_7_L2EMA_SHIFT);
+                } else if (volt_id > PMIC_LOW_VOLT) {
+                        ema_div = (CPUEMA_LOW << P0_7_CPUEMA_SHIFT) |
+                                (L2EMA_LOW << P0_7_L2EMA_SHIFT);
+                } else {
+                        ema_div = (CPUEMA_MID << P0_7_CPUEMA_SHIFT) |
+                                (L2EMA_MID << P0_7_L2EMA_SHIFT);
+                }
+
+                tmp = (clk_div | ema_div | (volt_id << P0_7_VDD_SHIFT)
+                        | ((freq / FREQ_UNIT) << P0_7_FREQ_SHIFT));
+
+                __raw_writel(tmp, dvfs_info->base + XMU_PMU_P0_7 + 4 * i);
+        }
+
+        rcu_read_unlock();
+        return 0;
+}
+
+static void exynos_enable_dvfs(void)
+{
+        unsigned int tmp, i, cpu;
+        struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;
+        /* Disable DVFS */
+        __raw_writel(0, dvfs_info->base + XMU_DVFS_CTRL);
+
+        /* Enable PSTATE Change Event */
+        tmp = __raw_readl(dvfs_info->base + XMU_PMUEVTEN);
+        tmp |= (1 << PSTATE_CHANGED_EVTEN_SHIFT);
+         __raw_writel(tmp, dvfs_info->base + XMU_PMUEVTEN);
+
+        /* Enable PSTATE Change IRQ */
+        tmp = __raw_readl(dvfs_info->base + XMU_PMUIRQEN);
+        tmp |= (1 << PSTATE_CHANGED_IRQEN_SHIFT);
+         __raw_writel(tmp, dvfs_info->base + XMU_PMUIRQEN);
+
+        /* Set initial performance index */
+        for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++)
+                if (freq_table[i].frequency == dvfs_info->cur_frequency)
+                        break;
+
+        if (freq_table[i].frequency == CPUFREQ_TABLE_END) {
+                dev_crit(dvfs_info->dev, "Boot up frequency not supported\n");
+                /* Assign the highest frequency */
+                i = 0;
+                dvfs_info->cur_frequency = freq_table[i].frequency;
+        }
+
+        dev_info(dvfs_info->dev, "Setting dvfs initial frequency = %uKHZ",
+                                                dvfs_info->cur_frequency);
+
+        for (cpu = 0; cpu < CONFIG_NR_CPUS; cpu++) {
+                tmp = __raw_readl(dvfs_info->base + XMU_C0_3_PSTATE + cpu * 4);
+                tmp &= ~(P_VALUE_MASK << C0_3_PSTATE_NEW_SHIFT);
+                tmp |= (i << C0_3_PSTATE_NEW_SHIFT);
+                __raw_writel(tmp, dvfs_info->base + XMU_C0_3_PSTATE + cpu * 4);
+        }
+
+        /* Enable DVFS */
+        __raw_writel(1 << XMU_DVFS_CTRL_EN_SHIFT,
+                                dvfs_info->base + XMU_DVFS_CTRL);
+}
+
+static int exynos_verify_speed(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy,
+                                              dvfs_info->freq_table);
+}
+
+static unsigned int exynos_getspeed(unsigned int cpu)
+{
+        return dvfs_info->cur_frequency;
+}
+
+static int exynos_target(struct cpufreq_policy *policy,
+                          unsigned int target_freq,
+                          unsigned int relation)
+{
+        unsigned int index, tmp;
+        int ret = 0, i;
+        struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;
+
+        mutex_lock(&cpufreq_lock);
+
+        ret = cpufreq_frequency_table_target(policy, freq_table,
+                                           target_freq, relation, &index);
+        if (ret)
+                goto out;
+
+        freqs.old = dvfs_info->cur_frequency;
+        freqs.new = freq_table[index].frequency;
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
+        /* Set the target frequency in all C0_3_PSTATE register */
+        for_each_cpu(i, policy->cpus) {
+                tmp = __raw_readl(dvfs_info->base + XMU_C0_3_PSTATE + i * 4);
+                tmp &= ~(P_VALUE_MASK << C0_3_PSTATE_NEW_SHIFT);
+                tmp |= (index << C0_3_PSTATE_NEW_SHIFT);
+
+                __raw_writel(tmp, dvfs_info->base + XMU_C0_3_PSTATE + i * 4);
+        }
+out:
+        mutex_unlock(&cpufreq_lock);
+        return ret;
+}
+
+static void exynos_cpufreq_work(struct work_struct *work)
+{
+        unsigned int cur_pstate, index;
+        struct cpufreq_policy *policy = cpufreq_cpu_get(0); /* boot CPU */
+        struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;
+
+        /* Ensure we can access cpufreq structures */
+        if (unlikely(dvfs_info->dvfs_enabled == false))
+                goto skip_work;
+
+        mutex_lock(&cpufreq_lock);
+        freqs.old = dvfs_info->cur_frequency;
+
+        cur_pstate = __raw_readl(dvfs_info->base + XMU_P_STATUS);
+        if (cur_pstate >> C0_3_PSTATE_VALID_SHIFT & 0x1)
+                index = (cur_pstate >> C0_3_PSTATE_CURR_SHIFT) & P_VALUE_MASK;
+        else
+                index = (cur_pstate >> C0_3_PSTATE_NEW_SHIFT) & P_VALUE_MASK;
+
+        if (likely(index < dvfs_info->freq_count)) {
+                freqs.new = freq_table[index].frequency;
+                dvfs_info->cur_frequency = freqs.new;
+        } else {
+                dev_crit(dvfs_info->dev, "New frequency out of range\n");
+                freqs.new = dvfs_info->cur_frequency;
+        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+
+        cpufreq_cpu_put(policy);
+        mutex_unlock(&cpufreq_lock);
+skip_work:
+        enable_irq(dvfs_info->irq);
+}
+
+static irqreturn_t exynos_cpufreq_irq(int irq, void *id)
+{
+        unsigned int tmp;
+
+        tmp = __raw_readl(dvfs_info->base + XMU_PMUIRQ);
+        if (tmp >> PSTATE_CHANGED_SHIFT & 0x1) {
+                __raw_writel(tmp, dvfs_info->base + XMU_PMUIRQ);
+                disable_irq_nosync(irq);
+                schedule_work(&dvfs_info->irq_work);
+        }
+        return IRQ_HANDLED;
+}
+
+static void exynos_sort_descend_freq_table(void)
+{
+        struct cpufreq_frequency_table *freq_tbl = dvfs_info->freq_table;
+        int i = 0, index;
+        unsigned int tmp_freq;
+        /*
+         * Exynos5440 clock controller state logic expects the cpufreq table to
+         * be in descending order. But the OPP library constructs the table in
+         * ascending order. So to make the table descending we just need to
+         * swap the i element with the N - i element.
+         */
+        for (i = 0; i < dvfs_info->freq_count / 2; i++) {
+                index = dvfs_info->freq_count - i - 1;
+                tmp_freq = freq_tbl[i].frequency;
+                freq_tbl[i].frequency = freq_tbl[index].frequency;
+                freq_tbl[index].frequency = tmp_freq;
+        }
+}
+
+static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        int ret;
+
+        ret = cpufreq_frequency_table_cpuinfo(policy, dvfs_info->freq_table);
+        if (ret) {
+                dev_err(dvfs_info->dev, "Invalid frequency table: %d\n", ret);
+                return ret;
+        }
+
+        policy->cur = dvfs_info->cur_frequency;
+        policy->cpuinfo.transition_latency = dvfs_info->latency;
+        cpumask_setall(policy->cpus);
+
+        cpufreq_frequency_table_get_attr(dvfs_info->freq_table, policy->cpu);
+
+        return 0;
+}
+
+static struct cpufreq_driver exynos_driver = {
+        .flags          = CPUFREQ_STICKY,
+        .verify         = exynos_verify_speed,
+        .target         = exynos_target,
+        .get            = exynos_getspeed,
+        .init           = exynos_cpufreq_cpu_init,
+        .name           = CPUFREQ_NAME,
+};
+
+static const struct of_device_id exynos_cpufreq_match[] = {
+        {
+                .compatible = "samsung,exynos5440-cpufreq",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, exynos_cpufreq_match);
+
+static int exynos_cpufreq_probe(struct platform_device *pdev)
+{
+        int ret = -EINVAL;
+        struct device_node *np;
+        struct resource res;
+
+        np =  pdev->dev.of_node;
+        if (!np)
+                return -ENODEV;
+
+        dvfs_info = devm_kzalloc(&pdev->dev, sizeof(*dvfs_info), GFP_KERNEL);
+        if (!dvfs_info) {
+                ret = -ENOMEM;
+                goto err_put_node;
+        }
+
+        dvfs_info->dev = &pdev->dev;
+
+        ret = of_address_to_resource(np, 0, &res);
+        if (ret)
+                goto err_put_node;
+
+        dvfs_info->base = devm_ioremap_resource(dvfs_info->dev, &res);
+        if (IS_ERR(dvfs_info->base)) {
+                ret = PTR_ERR(dvfs_info->base);
+                goto err_put_node;
+        }
+
+        dvfs_info->irq = irq_of_parse_and_map(np, 0);
+        if (!dvfs_info->irq) {
+                dev_err(dvfs_info->dev, "No cpufreq irq found\n");
+                ret = -ENODEV;
+                goto err_put_node;
+        }
+
+        ret = of_init_opp_table(dvfs_info->dev);
+        if (ret) {
+                dev_err(dvfs_info->dev, "failed to init OPP table: %d\n", ret);
+                goto err_put_node;
+        }
+
+        ret = opp_init_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table);
+        if (ret) {
+                dev_err(dvfs_info->dev,
+                        "failed to init cpufreq table: %d\n", ret);
+                goto err_put_node;
+        }
+        dvfs_info->freq_count = opp_get_opp_count(dvfs_info->dev);
+        exynos_sort_descend_freq_table();
+
+        if (of_property_read_u32(np, "clock-latency", &dvfs_info->latency))
+                dvfs_info->latency = DEF_TRANS_LATENCY;
+
+        dvfs_info->cpu_clk = devm_clk_get(dvfs_info->dev, "armclk");
+        if (IS_ERR(dvfs_info->cpu_clk)) {
+                dev_err(dvfs_info->dev, "Failed to get cpu clock\n");
+                ret = PTR_ERR(dvfs_info->cpu_clk);
+                goto err_free_table;
+        }
+
+        dvfs_info->cur_frequency = clk_get_rate(dvfs_info->cpu_clk);
+        if (!dvfs_info->cur_frequency) {
+                dev_err(dvfs_info->dev, "Failed to get clock rate\n");
+                ret = -EINVAL;
+                goto err_free_table;
+        }
+        dvfs_info->cur_frequency /= 1000;
+
+        INIT_WORK(&dvfs_info->irq_work, exynos_cpufreq_work);
+        ret = devm_request_irq(dvfs_info->dev, dvfs_info->irq,
+                                exynos_cpufreq_irq, IRQF_TRIGGER_NONE,
+                                CPUFREQ_NAME, dvfs_info);
+        if (ret) {
+                dev_err(dvfs_info->dev, "Failed to register IRQ\n");
+                goto err_free_table;
+        }
+
+        ret = init_div_table();
+        if (ret) {
+                dev_err(dvfs_info->dev, "Failed to initialise div table\n");
+                goto err_free_table;
+        }
+
+        exynos_enable_dvfs();
+        ret = cpufreq_register_driver(&exynos_driver);
+        if (ret) {
+                dev_err(dvfs_info->dev,
+                        "%s: failed to register cpufreq driver\n", __func__);
+                goto err_free_table;
+        }
+
+        of_node_put(np);
+        dvfs_info->dvfs_enabled = true;
+        return 0;
+
+err_free_table:
+        opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table);
+err_put_node:
+        of_node_put(np);
+        dev_err(dvfs_info->dev, "%s: failed initialization\n", __func__);
+        return ret;
+}
+
+static int exynos_cpufreq_remove(struct platform_device *pdev)
+{
+        cpufreq_unregister_driver(&exynos_driver);
+        opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table);
+        return 0;
+}
+
+static struct platform_driver exynos_cpufreq_platdrv = {
+        .driver = {
+                .name   = "exynos5440-cpufreq",
+                .owner  = THIS_MODULE,
+                .of_match_table = exynos_cpufreq_match,
+        },
+        .probe          = exynos_cpufreq_probe,
+        .remove         = exynos_cpufreq_remove,
+};
+module_platform_driver(exynos_cpufreq_platdrv);
+
+MODULE_AUTHOR("Amit Daniel Kachhap <amit.daniel@samsung.com>");
+MODULE_DESCRIPTION("Exynos5440 cpufreq driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c
index 456bee058fe6..3dfc99b9ca86 100644
--- a/drivers/cpufreq/gx-suspmod.c
+++ b/drivers/cpufreq/gx-suspmod.c
@@ -251,14 +251,13 @@ static unsigned int gx_validate_speed(unsigned int khz, u8 *on_duration,
  * set cpu speed in khz.
  **/
 
-static void gx_set_cpuspeed(unsigned int khz)
+static void gx_set_cpuspeed(struct cpufreq_policy *policy, unsigned int khz)
 {
         u8 suscfg, pmer1;
         unsigned int new_khz;
         unsigned long flags;
         struct cpufreq_freqs freqs;
 
-        freqs.cpu = 0;
         freqs.old = gx_get_cpuspeed(0);
 
         new_khz = gx_validate_speed(khz, &gx_params->on_duration,
@@ -266,11 +265,9 @@ static void gx_set_cpuspeed(unsigned int khz)
 
         freqs.new = new_khz;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         local_irq_save(flags);
 
-
-
         if (new_khz != stock_freq) {
                 /* if new khz == 100% of CPU speed, it is special case */
                 switch (gx_params->cs55x0->device) {
@@ -317,7 +314,7 @@ static void gx_set_cpuspeed(unsigned int khz)
 
         gx_params->pci_suscfg = suscfg;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         pr_debug("suspend modulation w/ duration of ON:%d us, OFF:%d us\n",
                 gx_params->on_duration * 32, gx_params->off_duration * 32);
@@ -397,7 +394,7 @@ static int cpufreq_gx_target(struct cpufreq_policy *policy,
                 tmp_freq = gx_validate_speed(tmp_freq, &tmp1, &tmp2);
         }
 
-        gx_set_cpuspeed(tmp_freq);
+        gx_set_cpuspeed(policy, tmp_freq);
 
         return 0;
 }
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c
index f09b174244d5..c0075dbaa633 100644
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
@@ -1,5 +1,4 @@
 /*
- * arch/ia64/kernel/cpufreq/acpi-cpufreq.c
  * This file provides the ACPI based P-state support. This
  * module works with generic cpufreq infrastructure. Most of
  * the code is based on i386 version
@@ -137,7 +136,7 @@ migrate_end:
 static int
 processor_set_freq (
         struct cpufreq_acpi_io  *data,
-        unsigned int            cpu,
+        struct cpufreq_policy   *policy,
         int                     state)
 {
         int                     ret = 0;
@@ -149,8 +148,8 @@ processor_set_freq (
         pr_debug("processor_set_freq\n");
 
         saved_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-        if (smp_processor_id() != cpu) {
+        set_cpus_allowed_ptr(current, cpumask_of(policy->cpu));
+        if (smp_processor_id() != policy->cpu) {
                 retval = -EAGAIN;
                 goto migrate_end;
         }
@@ -170,12 +169,11 @@ processor_set_freq (
                 data->acpi_data.state, state);
 
         /* cpufreq frequency struct */
-        cpufreq_freqs.cpu = cpu;
         cpufreq_freqs.old = data->freq_table[data->acpi_data.state].frequency;
         cpufreq_freqs.new = data->freq_table[state].frequency;
 
         /* notify cpufreq */
-        cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &cpufreq_freqs, CPUFREQ_PRECHANGE);
 
         /*
          * First we write the target state's 'control' value to the
@@ -189,17 +187,20 @@ processor_set_freq (
         ret = processor_set_pstate(value);
         if (ret) {
                 unsigned int tmp = cpufreq_freqs.new;
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
+                cpufreq_notify_transition(policy, &cpufreq_freqs,
+                                CPUFREQ_POSTCHANGE);
                 cpufreq_freqs.new = cpufreq_freqs.old;
                 cpufreq_freqs.old = tmp;
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE);
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
+                cpufreq_notify_transition(policy, &cpufreq_freqs,
+                                CPUFREQ_PRECHANGE);
+                cpufreq_notify_transition(policy, &cpufreq_freqs,
+                                CPUFREQ_POSTCHANGE);
                 printk(KERN_WARNING "Transition failed with error %d\n", ret);
                 retval = -ENODEV;
                 goto migrate_end;
         }
 
-        cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &cpufreq_freqs, CPUFREQ_POSTCHANGE);
 
         data->acpi_data.state = state;
 
@@ -240,7 +241,7 @@ acpi_cpufreq_target (
         if (result)
                 return (result);
 
-        result = processor_set_freq(data, policy->cpu, next_state);
+        result = processor_set_freq(data, policy, next_state);
 
         return (result);
 }
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 54e336de373b..b78bc35973ba 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -50,7 +50,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
         struct cpufreq_freqs freqs;
         struct opp *opp;
         unsigned long freq_hz, volt, volt_old;
-        unsigned int index, cpu;
+        unsigned int index;
         int ret;
 
         ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
@@ -68,10 +68,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new)
                 return 0;
 
-        for_each_online_cpu(cpu) {
-                freqs.cpu = cpu;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         rcu_read_lock();
         opp = opp_find_freq_ceil(cpu_dev, &freq_hz);
@@ -166,10 +163,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
                 }
         }
 
-        for_each_online_cpu(cpu) {
-                freqs.cpu = cpu;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/arch/arm/mach-integrator/cpu.c b/drivers/cpufreq/integrator-cpufreq.c
index 590c192cdf4d..f7c99df0880b 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/drivers/cpufreq/integrator-cpufreq.c
@@ -1,6 +1,4 @@
 /*
- *  linux/arch/arm/mach-integrator/cpu.c
- *
  *  Copyright (C) 2001-2002 Deep Blue Solutions Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -123,14 +121,12 @@ static int integrator_set_target(struct cpufreq_policy *policy,
         vco = icst_hz_to_vco(&cclk_params, target_freq * 1000);
         freqs.new = icst_hz(&cclk_params, vco) / 1000;
 
-        freqs.cpu = policy->cpu;
-
         if (freqs.old == freqs.new) {
                 set_cpus_allowed(current, cpus_allowed);
                 return 0;
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         cm_osc = __raw_readl(CM_OSC);
 
@@ -151,7 +147,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
          */
         set_cpus_allowed(current, cpus_allowed);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6133ef5cf671..cc3a8e6c92be 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1,5 +1,5 @@
 /*
- * cpufreq_snb.c: Native P state management for Intel processors
+ * intel_pstate.c: Native P state management for Intel processors
  *
  * (C) Copyright 2012 Intel Corporation
  * Author: Dirk Brandewie <dirk.j.brandewie@intel.com>
@@ -657,30 +657,27 @@ static unsigned int intel_pstate_get(unsigned int cpu_num)
 static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 {
         struct cpudata *cpu;
-        int min, max;
 
         cpu = all_cpu_data[policy->cpu];
 
         if (!policy->cpuinfo.max_freq)
                 return -ENODEV;
 
-        intel_pstate_get_min_max(cpu, &min, &max);
-
-        limits.min_perf_pct = (policy->min * 100) / policy->cpuinfo.max_freq;
-        limits.min_perf_pct = clamp_t(int, limits.min_perf_pct, 0 , 100);
-        limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
-
-        limits.max_perf_pct = policy->max * 100 / policy->cpuinfo.max_freq;
-        limits.max_perf_pct = clamp_t(int, limits.max_perf_pct, 0 , 100);
-        limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));
-
         if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
                 limits.min_perf_pct = 100;
                 limits.min_perf = int_tofp(1);
                 limits.max_perf_pct = 100;
                 limits.max_perf = int_tofp(1);
                 limits.no_turbo = 0;
+                return 0;
         }
+        limits.min_perf_pct = (policy->min * 100) / policy->cpuinfo.max_freq;
+        limits.min_perf_pct = clamp_t(int, limits.min_perf_pct, 0 , 100);
+        limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
+
+        limits.max_perf_pct = policy->max * 100 / policy->cpuinfo.max_freq;
+        limits.max_perf_pct = clamp_t(int, limits.max_perf_pct, 0 , 100);
+        limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));
 
         return 0;
 }
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 0e83e3c24f5b..d36ea8dc96eb 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -55,7 +55,8 @@ static unsigned int kirkwood_cpufreq_get_cpu_frequency(unsigned int cpu)
         return kirkwood_freq_table[0].frequency;
 }
 
-static void kirkwood_cpufreq_set_cpu_state(unsigned int index)
+static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy,
+                unsigned int index)
 {
         struct cpufreq_freqs freqs;
         unsigned int state = kirkwood_freq_table[index].index;
@@ -63,9 +64,8 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index)
 
         freqs.old = kirkwood_cpufreq_get_cpu_frequency(0);
         freqs.new = kirkwood_freq_table[index].frequency;
-        freqs.cpu = 0; /* Kirkwood is UP */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         dev_dbg(priv.dev, "Attempting to set frequency to %i KHz\n",
                 kirkwood_freq_table[index].frequency);
@@ -99,7 +99,7 @@ static void kirkwood_cpufreq_set_cpu_state(unsigned int index)
 
                 local_irq_enable();
         }
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 };
 
 static int kirkwood_cpufreq_verify(struct cpufreq_policy *policy)
@@ -117,7 +117,7 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy,
                                 target_freq, relation, &index))
                 return -EINVAL;
 
-        kirkwood_cpufreq_set_cpu_state(index);
+        kirkwood_cpufreq_set_cpu_state(policy, index);
 
         return 0;
 }
@@ -175,11 +175,9 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "Cannot get memory resource\n");
                 return -ENODEV;
         }
-        priv.base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!priv.base) {
-                dev_err(&pdev->dev, "Cannot ioremap\n");
-                return -EADDRNOTAVAIL;
-        }
+        priv.base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv.base))
+                return PTR_ERR(priv.base);
 
         np = of_find_node_by_path("/cpus/cpu@0");
         if (!np)
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 1180d536d1eb..b448638e34de 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -242,7 +242,8 @@ static void do_powersaver(int cx_address, unsigned int mults_index,
  * Sets a new clock ratio.
  */
 
-static void longhaul_setstate(unsigned int table_index)
+static void longhaul_setstate(struct cpufreq_policy *policy,
+                unsigned int table_index)
 {
         unsigned int mults_index;
         int speed, mult;
@@ -267,9 +268,8 @@ static void longhaul_setstate(unsigned int table_index)
 
         freqs.old = calc_speed(longhaul_get_cpu_mult());
         freqs.new = speed;
-        freqs.cpu = 0; /* longhaul.c is UP only driver */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         pr_debug("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
                         fsb, mult/10, mult%10, print_speed(speed/1000));
@@ -386,7 +386,7 @@ retry_loop:
                 }
         }
         /* Report true CPU frequency */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         if (!bm_timeout)
                 printk(KERN_INFO PFX "Warning: Timeout while waiting for "
@@ -648,7 +648,7 @@ static int longhaul_target(struct cpufreq_policy *policy,
                 return 0;
 
         if (!can_scale_voltage)
-                longhaul_setstate(table_index);
+                longhaul_setstate(policy, table_index);
         else {
                 /* On test system voltage transitions exceeding single
                  * step up or down were turning motherboard off. Both
@@ -663,7 +663,7 @@ static int longhaul_target(struct cpufreq_policy *policy,
                 while (i != table_index) {
                         vid = (longhaul_table[i].index >> 8) & 0x1f;
                         if (vid != current_vid) {
-                                longhaul_setstate(i);
+                                longhaul_setstate(policy, i);
                                 current_vid = vid;
                                 msleep(200);
                         }
@@ -672,7 +672,7 @@ static int longhaul_target(struct cpufreq_policy *policy,
                         else
                                 i--;
                 }
-                longhaul_setstate(table_index);
+                longhaul_setstate(policy, table_index);
         }
         longhaul_index = table_index;
         return 0;
@@ -998,15 +998,17 @@ static int __init longhaul_init(void)
 
 static void __exit longhaul_exit(void)
 {
+        struct cpufreq_policy *policy = cpufreq_cpu_get(0);
         int i;
 
         for (i = 0; i < numscales; i++) {
                 if (mults[i] == maxmult) {
-                        longhaul_setstate(i);
+                        longhaul_setstate(policy, i);
                         break;
                 }
         }
 
+        cpufreq_cpu_put(policy);
         cpufreq_unregister_driver(&longhaul_driver);
         kfree(longhaul_table);
 }
diff --git a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index 3237c5235f9c..84889573b566 100644
--- a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -61,9 +61,6 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
         struct cpufreq_freqs freqs;
         unsigned int freq;
 
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
         cpus_allowed = current->cpus_allowed;
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -80,7 +77,6 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
 
         pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
 
-        freqs.cpu = cpu;
         freqs.old = loongson2_cpufreq_get(cpu);
         freqs.new = freq;
         freqs.flags = 0;
@@ -89,7 +85,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
                 return 0;
 
         /* notifiers */
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         set_cpus_allowed_ptr(current, &cpus_allowed);
 
@@ -97,7 +93,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
         clk_set_rate(cpuclk, freq);
 
         /* notifiers */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         pr_debug("cpufreq: set frequency %u kHz\n", freq);
 
@@ -110,9 +106,6 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
         unsigned long rate;
         int ret;
 
-        if (!cpu_online(policy->cpu))
-                return -ENODEV;
-
         cpuclk = clk_get(NULL, "cpu_clk");
         if (IS_ERR(cpuclk)) {
                 printk(KERN_ERR "cpufreq: couldn't get CPU clk\n");
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index d4c4989823dc..cdd62915efaf 100644
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -158,11 +158,10 @@ static int maple_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency;
         freqs.new = maple_cpu_freqs[newstate].frequency;
-        freqs.cpu = 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         rc = maple_scom_switch_freq(newstate);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         mutex_unlock(&maple_switch_mutex);
 
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 9128c07bafba..0279d18a57f9 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -25,6 +25,7 @@
 #include <linux/opp.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 
 #include <asm/smp_plat.h>
@@ -88,16 +89,12 @@ static int omap_target(struct cpufreq_policy *policy,
         }
 
         freqs.old = omap_getspeed(policy->cpu);
-        freqs.cpu = policy->cpu;
 
         if (freqs.old == freqs.new && policy->cur == freqs.new)
                 return ret;
 
         /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         freq = freqs.new * 1000;
         ret = clk_round_rate(mpu_clk, freq);
@@ -157,10 +154,7 @@ static int omap_target(struct cpufreq_policy *policy,
 
 done:
         /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
@@ -184,7 +178,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
                 goto fail_ck;
         }
 
-        policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
+        policy->cur = omap_getspeed(policy->cpu);
 
         if (!freq_table)
                 result = opp_init_cpufreq_table(mpu_dev, &freq_table);
@@ -203,8 +197,6 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
 
         cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
 
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
         policy->cur = omap_getspeed(policy->cpu);
 
         /*
@@ -252,7 +244,7 @@ static struct cpufreq_driver omap_driver = {
         .attr           = omap_cpufreq_attr,
 };
 
-static int __init omap_cpufreq_init(void)
+static int omap_cpufreq_probe(struct platform_device *pdev)
 {
         mpu_dev = get_cpu_device(0);
         if (!mpu_dev) {
@@ -280,12 +272,20 @@ static int __init omap_cpufreq_init(void)
         return cpufreq_register_driver(&omap_driver);
 }
 
-static void __exit omap_cpufreq_exit(void)
+static int omap_cpufreq_remove(struct platform_device *pdev)
 {
-        cpufreq_unregister_driver(&omap_driver);
+        return cpufreq_unregister_driver(&omap_driver);
 }
 
+static struct platform_driver omap_cpufreq_platdrv = {
+        .driver = {
+                .name   = "omap-cpufreq",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = omap_cpufreq_probe,
+        .remove         = omap_cpufreq_remove,
+};
+module_platform_driver(omap_cpufreq_platdrv);
+
 MODULE_DESCRIPTION("cpufreq driver for OMAP SoCs");
 MODULE_LICENSE("GPL");
-module_init(omap_cpufreq_init);
-module_exit(omap_cpufreq_exit);
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index 827629c9aad7..421ef37d0bb3 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -58,8 +58,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)
 {
         u32 l, h;
 
-        if (!cpu_online(cpu) ||
-            (newstate > DC_DISABLE) || (newstate == DC_RESV))
+        if ((newstate > DC_DISABLE) || (newstate == DC_RESV))
                 return -EINVAL;
 
         rdmsr_on_cpu(cpu, MSR_IA32_THERM_STATUS, &l, &h);
@@ -125,10 +124,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,
                 return 0;
 
         /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* run on each logical CPU,
          * see section 13.15.3 of IA32 Intel Architecture Software
@@ -138,10 +134,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,
                 cpufreq_p4_setdc(i, p4clockmod_table[newstate].index);
 
         /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 503996a94a6a..0de00081a81e 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -215,8 +215,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
                 (pcch_virt_addr + pcc_cpu_data->input_offset));
 
         freqs.new = target_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         input_buffer = 0x1 | (((target_freq * 100)
                                / (ioread32(&pcch_hdr->nominal) * 1000)) << 8);
@@ -237,7 +236,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
         }
         iowrite16(0, &pcch_hdr->status);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         pr_debug("target: was SUCCESSFUL for cpu %d\n", cpu);
         spin_unlock(&pcc_lock);
 
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index af23e0b9ec92..ea0222a45b7b 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -68,7 +68,8 @@ static int powernow_k6_get_cpu_multiplier(void)
  *
  *   Tries to change the PowerNow! multiplier
  */
-static void powernow_k6_set_state(unsigned int best_i)
+static void powernow_k6_set_state(struct cpufreq_policy *policy,
+                unsigned int best_i)
 {
         unsigned long outvalue = 0, invalue = 0;
         unsigned long msrval;
@@ -81,9 +82,8 @@ static void powernow_k6_set_state(unsigned int best_i)
 
         freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
         freqs.new = busfreq * clock_ratio[best_i].index;
-        freqs.cpu = 0; /* powernow-k6.c is UP only driver */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* we now need to transform best_i to the BVC format, see AMD#23446 */
 
@@ -98,7 +98,7 @@ static void powernow_k6_set_state(unsigned int best_i)
         msrval = POWERNOW_IOPORT + 0x0;
         wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return;
 }
@@ -136,7 +136,7 @@ static int powernow_k6_target(struct cpufreq_policy *policy,
                                 target_freq, relation, &newstate))
                 return -EINVAL;
 
-        powernow_k6_set_state(newstate);
+        powernow_k6_set_state(policy, newstate);
 
         return 0;
 }
@@ -182,7 +182,7 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
         unsigned int i;
         for (i = 0; i < 8; i++) {
                 if (i == max_multiplier)
-                        powernow_k6_set_state(i);
+                        powernow_k6_set_state(policy, i);
         }
         cpufreq_frequency_table_put_attr(policy->cpu);
         return 0;
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 334cc2f1e9f1..53888dacbe58 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -248,7 +248,7 @@ static void change_VID(int vid)
 }
 
 
-static void change_speed(unsigned int index)
+static void change_speed(struct cpufreq_policy *policy, unsigned int index)
 {
         u8 fid, vid;
         struct cpufreq_freqs freqs;
@@ -263,15 +263,13 @@ static void change_speed(unsigned int index)
         fid = powernow_table[index].index & 0xFF;
         vid = (powernow_table[index].index & 0xFF00) >> 8;
 
-        freqs.cpu = 0;
-
         rdmsrl(MSR_K7_FID_VID_STATUS, fidvidstatus.val);
         cfid = fidvidstatus.bits.CFID;
         freqs.old = fsb * fid_codes[cfid] / 10;
 
         freqs.new = powernow_table[index].frequency;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* Now do the magic poking into the MSRs.  */
 
@@ -292,7 +290,7 @@ static void change_speed(unsigned int index)
         if (have_a0 == 1)
                 local_irq_enable();
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 }
 
 
@@ -546,7 +544,7 @@ static int powernow_target(struct cpufreq_policy *policy,
                                 relation, &newstate))
                 return -EINVAL;
 
-        change_speed(newstate);
+        change_speed(policy, newstate);
 
         return 0;
 }
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index d13a13678b5f..b828efe4b2f8 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -928,9 +928,10 @@ static int get_transition_latency(struct powernow_k8_data *data)
 static int transition_frequency_fidvid(struct powernow_k8_data *data,
                 unsigned int index)
 {
+        struct cpufreq_policy *policy;
         u32 fid = 0;
         u32 vid = 0;
-        int res, i;
+        int res;
         struct cpufreq_freqs freqs;
 
         pr_debug("cpu %d transition to index %u\n", smp_processor_id(), index);
@@ -959,10 +960,10 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
         freqs.old = find_khz_freq_from_fid(data->currfid);
         freqs.new = find_khz_freq_from_fid(fid);
 
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        policy = cpufreq_cpu_get(smp_processor_id());
+        cpufreq_cpu_put(policy);
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         res = transition_fid_vid(data, fid, vid);
         if (res)
@@ -970,10 +971,7 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
 
         freqs.new = find_khz_freq_from_fid(data->currfid);
 
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return res;
 }
 
@@ -1104,9 +1102,6 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
         struct init_on_cpu init_on_cpu;
         int rc;
 
-        if (!cpu_online(pol->cpu))
-                return -ENODEV;
-
         smp_call_function_single(pol->cpu, check_supported_cpu, &rc, 1);
         if (rc)
                 return -ENODEV;
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index d4c39e32f147..e577a1dbbfcd 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -27,7 +27,8 @@
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/cell-regs.h>
-#include "cbe_cpufreq.h"
+
+#include "ppc_cbe_cpufreq.h"
 
 static DEFINE_MUTEX(cbe_switch_mutex);
 
@@ -156,10 +157,9 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = policy->cur;
         freqs.new = cbe_freqs[cbe_pmode_new].frequency;
-        freqs.cpu = policy->cpu;
 
         mutex_lock(&cbe_switch_mutex);
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         pr_debug("setting frequency for cpu %d to %d kHz, " \
                  "1/%d of max frequency\n",
@@ -169,7 +169,7 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy,
 
         rc = set_pmode(policy->cpu, cbe_pmode_new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         mutex_unlock(&cbe_switch_mutex);
 
         return rc;
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.h b/drivers/cpufreq/ppc_cbe_cpufreq.h
index c1d86bfa92ff..b4c00a5a6a59 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.h
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.h
@@ -1,5 +1,5 @@
 /*
- * cbe_cpufreq.h
+ * ppc_cbe_cpufreq.h
  *
  * This file contains the definitions used by the cbe_cpufreq driver.
  *
@@ -17,7 +17,7 @@ int cbe_cpufreq_get_pmode(int cpu);
 
 int cbe_cpufreq_set_pmode_pmi(int cpu, unsigned int pmode);
 
-#if defined(CONFIG_CBE_CPUFREQ_PMI) || defined(CONFIG_CBE_CPUFREQ_PMI_MODULE)
+#if defined(CONFIG_CPU_FREQ_CBE_PMI) || defined(CONFIG_CPU_FREQ_CBE_PMI_MODULE)
 extern bool cbe_cpufreq_has_pmi;
 #else
 #define cbe_cpufreq_has_pmi (0)
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
index 20472e487b6f..84d2f2cf5ba7 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
@@ -30,7 +30,7 @@
 #include <asm/hw_irq.h>
 #include <asm/cell-regs.h>
 
-#include "cbe_cpufreq.h"
+#include "ppc_cbe_cpufreq.h"
 
 /* to write to MIC register */
 static u64 MIC_Slow_Fast_Timer_table[] = {
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
index 60a07a4f9326..d29e8da396a0 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
@@ -35,7 +35,7 @@
 #include <asm/time.h>
 #endif
 
-#include "cbe_cpufreq.h"
+#include "ppc_cbe_cpufreq.h"
 
 static u8 pmi_slow_mode_limit[MAX_CBE];
 
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/drivers/cpufreq/pxa2xx-cpufreq.c
index 6a7aeab42f6c..9e5bc8e388a0 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ b/drivers/cpufreq/pxa2xx-cpufreq.c
@@ -1,6 +1,4 @@
 /*
- *  linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c
- *
  *  Copyright (C) 2002,2003 Intrinsyc Software
  *
  * This program is free software; you can redistribute it and/or modify
@@ -223,10 +221,11 @@ static void find_freq_tables(struct cpufreq_frequency_table **freq_table,
                         *pxa_freqs = pxa255_turbo_freqs;
                         *freq_table = pxa255_turbo_freq_table;
                 }
-        }
-        if (cpu_is_pxa27x()) {
+        } else if (cpu_is_pxa27x()) {
                 *pxa_freqs = pxa27x_freqs;
                 *freq_table = pxa27x_freq_table;
+        } else {
+                BUG();
         }
 }
 
@@ -311,7 +310,6 @@ static int pxa_set_target(struct cpufreq_policy *policy,
         new_freq_mem = pxa_freq_settings[idx].membus;
         freqs.old = policy->cur;
         freqs.new = new_freq_cpu;
-        freqs.cpu = policy->cpu;
 
         if (freq_debug)
                 pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
@@ -327,7 +325,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,
          * you should add a notify client with any platform specific
          * Vcc changing capability
          */
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* Calculate the next MDREFR.  If we're slowing down the SDRAM clock
          * we need to preset the smaller DRI before the change.  If we're
@@ -382,7 +380,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,
          * you should add a notify client with any platform specific
          * SDRAM refresh timer adjustments
          */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         /*
          * Even if voltage setting fails, we don't report it, as the frequency
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index b85b4ab7aac6..15d60f857ad5 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -1,6 +1,4 @@
 /*
- * linux/arch/arm/mach-pxa/cpufreq-pxa3xx.c
- *
  * Copyright (C) 2008 Marvell International Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,10 +15,9 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 
+#include <mach/generic.h>
 #include <mach/pxa3xx-regs.h>
 
-#include "generic.h"
-
 #define HSS_104M        (0)
 #define HSS_156M        (1)
 #define HSS_208M        (2)
@@ -184,7 +181,6 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,
 
         freqs.old = policy->cur;
         freqs.new = next->cpufreq_mhz * 1000;
-        freqs.cpu = policy->cpu;
 
         pr_debug("CPU frequency from %d MHz to %d MHz%s\n",
                         freqs.old / 1000, freqs.new / 1000,
@@ -193,14 +189,14 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,
         if (freqs.old == target_freq)
                 return 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         local_irq_save(flags);
         __update_core_freq(next);
         __update_bus_freq(next);
         local_irq_restore(flags);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index bcc053bc02c4..4f1881eee3f1 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -256,7 +256,6 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
                 goto out;
         }
 
-        freqs.cpu = 0;
         freqs.flags = 0;
         freqs.old = s3c_freq->is_dvs ? FREQ_DVS
                                      : clk_get_rate(s3c_freq->armclk) / 1000;
@@ -274,7 +273,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
         if (!to_dvs && freqs.old == freqs.new)
                 goto out;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (to_dvs) {
                 pr_debug("cpufreq: enter dvs\n");
@@ -287,7 +286,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
                 ret = s3c2416_cpufreq_set_armdiv(s3c_freq, freqs.new);
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
 out:
         mutex_unlock(&cpufreq_lock);
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 6f9490b3c356..27cacb524796 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -84,7 +84,6 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
         if (ret != 0)
                 return ret;
 
-        freqs.cpu = 0;
         freqs.old = clk_get_rate(armclk) / 1000;
         freqs.new = s3c64xx_freq_table[i].frequency;
         freqs.flags = 0;
@@ -95,7 +94,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
 
         pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
 #ifdef CONFIG_REGULATOR
         if (vddarm && freqs.new > freqs.old) {
@@ -117,7 +116,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
                 goto err;
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
 #ifdef CONFIG_REGULATOR
         if (vddarm && freqs.new < freqs.old) {
@@ -141,7 +140,7 @@ err_clk:
         if (clk_set_rate(armclk, freqs.old * 1000) < 0)
                 pr_err("Failed to restore original clock rate\n");
 err:
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index a484aaea9809..5c7757073793 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -229,7 +229,6 @@ static int s5pv210_target(struct cpufreq_policy *policy,
         }
 
         freqs.new = s5pv210_freq_table[index].frequency;
-        freqs.cpu = 0;
 
         if (freqs.new == freqs.old)
                 goto exit;
@@ -256,7 +255,7 @@ static int s5pv210_target(struct cpufreq_policy *policy,
                         goto exit;
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /* Check if there need to change PLL */
         if ((index == L0) || (priv_index == L0))
@@ -468,7 +467,7 @@ static int s5pv210_target(struct cpufreq_policy *policy,
                 }
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         if (freqs.new < freqs.old) {
                 regulator_set_voltage(int_regulator,
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/drivers/cpufreq/sa1100-cpufreq.c
index e8f4d1e19233..cff18e87ca58 100644
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/drivers/cpufreq/sa1100-cpufreq.c
@@ -91,10 +91,9 @@
 
 #include <asm/cputype.h>
 
+#include <mach/generic.h>
 #include <mach/hardware.h>
 
-#include "generic.h"
-
 struct sa1100_dram_regs {
         int speed;
         u32 mdcnfg;
@@ -201,9 +200,8 @@ static int sa1100_target(struct cpufreq_policy *policy,
 
         freqs.old = cur;
         freqs.new = sa11x0_ppcr_to_freq(new_ppcr);
-        freqs.cpu = 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (freqs.new > cur)
                 sa1100_update_dram_timings(cur, freqs.new);
@@ -213,7 +211,7 @@ static int sa1100_target(struct cpufreq_policy *policy,
         if (freqs.new < cur)
                 sa1100_update_dram_timings(cur, freqs.new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/drivers/cpufreq/sa1110-cpufreq.c
index 48c45b0c92bb..39c90b6f4286 100644
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/drivers/cpufreq/sa1110-cpufreq.c
@@ -27,10 +27,9 @@
 #include <asm/cputype.h>
 #include <asm/mach-types.h>
 
+#include <mach/generic.h>
 #include <mach/hardware.h>
 
-#include "generic.h"
-
 #undef DEBUG
 
 struct sdram_params {
@@ -258,7 +257,6 @@ static int sa1110_target(struct cpufreq_policy *policy,
 
         freqs.old = sa11x0_getspeed(0);
         freqs.new = sa11x0_ppcr_to_freq(ppcr);
-        freqs.cpu = 0;
 
         sdram_calculate_timing(&sd, freqs.new, sdram);
 
@@ -279,7 +277,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         sd.mdcas[2] = 0xaaaaaaaa;
 #endif
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         /*
          * The clock could be going away for some time.  Set the SDRAMs
@@ -327,7 +325,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
          */
         sdram_update_refresh(freqs.new, sdram);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c
index e42e073cd9b8..f740b134d27b 100644
--- a/drivers/cpufreq/sc520_freq.c
+++ b/drivers/cpufreq/sc520_freq.c
@@ -53,7 +53,8 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu)
         }
 }
 
-static void sc520_freq_set_cpu_state(unsigned int state)
+static void sc520_freq_set_cpu_state(struct cpufreq_policy *policy,
+                unsigned int state)
 {
 
         struct cpufreq_freqs    freqs;
@@ -61,9 +62,8 @@ static void sc520_freq_set_cpu_state(unsigned int state)
 
         freqs.old = sc520_freq_get_cpu_frequency(0);
         freqs.new = sc520_freq_table[state].frequency;
-        freqs.cpu = 0; /* AMD Elan is UP */
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         pr_debug("attempting to set frequency to %i kHz\n",
                         sc520_freq_table[state].frequency);
@@ -75,7 +75,7 @@ static void sc520_freq_set_cpu_state(unsigned int state)
 
         local_irq_enable();
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 };
 
 static int sc520_freq_verify(struct cpufreq_policy *policy)
@@ -93,7 +93,7 @@ static int sc520_freq_target(struct cpufreq_policy *policy,
                                 target_freq, relation, &newstate))
                 return -EINVAL;
 
-        sc520_freq_set_cpu_state(newstate);
+        sc520_freq_set_cpu_state(policy, newstate);
 
         return 0;
 }
diff --git a/arch/sh/kernel/cpufreq.c b/drivers/cpufreq/sh-cpufreq.c
index e68b45b6f3f9..73adb64651e8 100644
--- a/arch/sh/kernel/cpufreq.c
+++ b/drivers/cpufreq/sh-cpufreq.c
@@ -1,6 +1,4 @@
 /*
- * arch/sh/kernel/cpufreq.c
- *
  * cpufreq driver for the SuperH processors.
  *
  * Copyright (C) 2002 - 2012 Paul Mundt
@@ -51,9 +49,6 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,
         struct device *dev;
         long freq;
 
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
         cpus_allowed = current->cpus_allowed;
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -69,15 +64,14 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,
 
         dev_dbg(dev, "requested frequency %u Hz\n", target_freq * 1000);
 
-        freqs.cpu       = cpu;
         freqs.old       = sh_cpufreq_get(cpu);
         freqs.new       = (freq + 500) / 1000;
         freqs.flags     = 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         set_cpus_allowed_ptr(current, &cpus_allowed);
         clk_set_rate(cpuclk, freq);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         dev_dbg(dev, "set frequency %lu Hz\n", freq);
 
@@ -112,9 +106,6 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
         struct cpufreq_frequency_table *freq_table;
         struct device *dev;
 
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
         dev = get_cpu_device(cpu);
 
         cpuclk = clk_get(dev, "cpu_clk");
@@ -123,7 +114,7 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 return PTR_ERR(cpuclk);
         }
 
-        policy->cur = policy->min = policy->max = sh_cpufreq_get(cpu);
+        policy->cur = sh_cpufreq_get(cpu);
 
         freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
         if (freq_table) {
@@ -136,15 +127,12 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 dev_notice(dev, "no frequency table found, falling back "
                            "to rate rounding.\n");
 
-                policy->cpuinfo.min_freq =
+                policy->min = policy->cpuinfo.min_freq =
                         (clk_round_rate(cpuclk, 1) + 500) / 1000;
-                policy->cpuinfo.max_freq =
+                policy->max = policy->cpuinfo.max_freq =
                         (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
         }
 
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
         dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, "
diff --git a/arch/sparc/kernel/us2e_cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c
index 489fc15f3194..306ae462bba6 100644
--- a/arch/sparc/kernel/us2e_cpufreq.c
+++ b/drivers/cpufreq/sparc-us2e-cpufreq.c
@@ -234,9 +234,6 @@ static unsigned int us2e_freq_get(unsigned int cpu)
         cpumask_t cpus_allowed;
         unsigned long clock_tick, estar;
 
-        if (!cpu_online(cpu))
-                return 0;
-
         cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -248,16 +245,15 @@ static unsigned int us2e_freq_get(unsigned int cpu)
         return clock_tick / estar_to_divisor(estar);
 }
 
-static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index)
+static void us2e_set_cpu_divider_index(struct cpufreq_policy *policy,
+                unsigned int index)
 {
+        unsigned int cpu = policy->cpu;
         unsigned long new_bits, new_freq;
         unsigned long clock_tick, divisor, old_divisor, estar;
         cpumask_t cpus_allowed;
         struct cpufreq_freqs freqs;
 
-        if (!cpu_online(cpu))
-                return;
-
         cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -272,14 +268,13 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index)
 
         freqs.old = clock_tick / old_divisor;
         freqs.new = new_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (old_divisor != divisor)
                 us2e_transition(estar, new_bits, clock_tick * 1000,
                                 old_divisor, divisor);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         set_cpus_allowed_ptr(current, &cpus_allowed);
 }
@@ -295,7 +290,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy,
                                            target_freq, relation, &new_index))
                 return -EINVAL;
 
-        us2e_set_cpu_divider_index(policy->cpu, new_index);
+        us2e_set_cpu_divider_index(policy, new_index);
 
         return 0;
 }
@@ -335,7 +330,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
 static int us2e_freq_cpu_exit(struct cpufreq_policy *policy)
 {
         if (cpufreq_us2e_driver)
-                us2e_set_cpu_divider_index(policy->cpu, 0);
+                us2e_set_cpu_divider_index(policy, 0);
 
         return 0;
 }
diff --git a/arch/sparc/kernel/us3_cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
index eb1624b931d9..c71ee142347a 100644
--- a/arch/sparc/kernel/us3_cpufreq.c
+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
@@ -82,9 +82,6 @@ static unsigned int us3_freq_get(unsigned int cpu)
         unsigned long reg;
         unsigned int ret;
 
-        if (!cpu_online(cpu))
-                return 0;
-
         cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -96,15 +93,14 @@ static unsigned int us3_freq_get(unsigned int cpu)
         return ret;
 }
 
-static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)
+static void us3_set_cpu_divider_index(struct cpufreq_policy *policy,
+                unsigned int index)
 {
+        unsigned int cpu = policy->cpu;
         unsigned long new_bits, new_freq, reg;
         cpumask_t cpus_allowed;
         struct cpufreq_freqs freqs;
 
-        if (!cpu_online(cpu))
-                return;
-
         cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
@@ -131,14 +127,13 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)
 
         freqs.old = get_current_freq(cpu, reg);
         freqs.new = new_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         reg &= ~SAFARI_CFG_DIV_MASK;
         reg |= new_bits;
         write_safari_cfg(reg);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         set_cpus_allowed_ptr(current, &cpus_allowed);
 }
@@ -156,7 +151,7 @@ static int us3_freq_target(struct cpufreq_policy *policy,
                                            &new_index))
                 return -EINVAL;
 
-        us3_set_cpu_divider_index(policy->cpu, new_index);
+        us3_set_cpu_divider_index(policy, new_index);
 
         return 0;
 }
@@ -192,7 +187,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
 {
         if (cpufreq_us3_driver)
-                us3_set_cpu_divider_index(policy->cpu, 0);
+                us3_set_cpu_divider_index(policy, 0);
 
         return 0;
 }
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 7e4d77327957..156829f4576d 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -121,7 +121,6 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
                                 target_freq, relation, &index))
                 return -EINVAL;
 
-        freqs.cpu = policy->cpu;
         freqs.old = spear_cpufreq_get(0);
 
         newfreq = spear_cpufreq.freq_tbl[index].frequency * 1000;
@@ -158,8 +157,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
         freqs.new = newfreq / 1000;
         freqs.new /= mult;
 
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (mult == 2)
                 ret = spear1340_set_cpu_rate(srcclk, newfreq);
@@ -172,8 +170,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
                 freqs.new = clk_get_rate(spear_cpufreq.clk) / 1000;
         }
 
-        for_each_cpu(freqs.cpu, policy->cpus)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return ret;
 }
 
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 3a953d519f46..618e6f417b1c 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -457,7 +457,7 @@ static int centrino_target (struct cpufreq_policy *policy,
         unsigned int    msr, oldmsr = 0, h = 0, cpu = policy->cpu;
         struct cpufreq_freqs    freqs;
         int                     retval = 0;
-        unsigned int            j, k, first_cpu, tmp;
+        unsigned int            j, first_cpu, tmp;
         cpumask_var_t covered_cpus;
 
         if (unlikely(!zalloc_cpumask_var(&covered_cpus, GFP_KERNEL)))
@@ -481,10 +481,6 @@ static int centrino_target (struct cpufreq_policy *policy,
         for_each_cpu(j, policy->cpus) {
                 int good_cpu;
 
-                /* cpufreq holds the hotplug lock, so we are safe here */
-                if (!cpu_online(j))
-                        continue;
-
                 /*
                  * Support for SMP systems.
                  * Make sure we are running on CPU that wants to change freq
@@ -522,13 +518,8 @@ static int centrino_target (struct cpufreq_policy *policy,
                         pr_debug("target=%dkHz old=%d new=%d msr=%04x\n",
                                 target_freq, freqs.old, freqs.new, msr);
 
-                        for_each_cpu(k, policy->cpus) {
-                                if (!cpu_online(k))
-                                        continue;
-                                freqs.cpu = k;
-                                cpufreq_notify_transition(&freqs,
+                        cpufreq_notify_transition(policy, &freqs,
                                         CPUFREQ_PRECHANGE);
-                        }
 
                         first_cpu = 0;
                         /* all but 16 LSB are reserved, treat them with care */
@@ -544,12 +535,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                 cpumask_set_cpu(j, covered_cpus);
         }
 
-        for_each_cpu(k, policy->cpus) {
-                if (!cpu_online(k))
-                        continue;
-                freqs.cpu = k;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         if (unlikely(retval)) {
                 /*
@@ -565,12 +551,8 @@ static int centrino_target (struct cpufreq_policy *policy,
                 tmp = freqs.new;
                 freqs.new = freqs.old;
                 freqs.old = tmp;
-                for_each_cpu(j, policy->cpus) {
-                        if (!cpu_online(j))
-                                continue;
-                        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-                }
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         }
         retval = 0;
 
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index e29b59aa68a8..e2e5aa971452 100644
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -263,7 +263,6 @@ static int speedstep_target(struct cpufreq_policy *policy,
 {
         unsigned int newstate = 0, policy_cpu;
         struct cpufreq_freqs freqs;
-        int i;
 
         if (cpufreq_frequency_table_target(policy, &speedstep_freqs[0],
                                 target_freq, relation, &newstate))
@@ -272,7 +271,6 @@ static int speedstep_target(struct cpufreq_policy *policy,
         policy_cpu = cpumask_any_and(policy->cpus, cpu_online_mask);
         freqs.old = speedstep_get(policy_cpu);
         freqs.new = speedstep_freqs[newstate].frequency;
-        freqs.cpu = policy->cpu;
 
         pr_debug("transiting from %u to %u kHz\n", freqs.old, freqs.new);
 
@@ -280,18 +278,12 @@ static int speedstep_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new)
                 return 0;
 
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         smp_call_function_single(policy_cpu, _speedstep_set_state, &newstate,
                                  true);
 
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index 6a457fcaaad5..f5a6b70ee6c0 100644
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -252,14 +252,13 @@ static int speedstep_target(struct cpufreq_policy *policy,
 
         freqs.old = speedstep_freqs[speedstep_get_state()].frequency;
         freqs.new = speedstep_freqs[newstate].frequency;
-        freqs.cpu = 0; /* speedstep.c is UP only driver */
 
         if (freqs.old == freqs.new)
                 return 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         speedstep_set_state(newstate);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/drivers/cpufreq/tegra-cpufreq.c
index e3d6e15ff188..c74c0e130ef4 100644
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -1,6 +1,4 @@
 /*
- * arch/arm/mach-tegra/cpu-tegra.c
- *
  * Copyright (C) 2010 Google, Inc.
  *
  * Author:
@@ -106,7 +104,8 @@ out:
         return ret;
 }
 
-static int tegra_update_cpu_speed(unsigned long rate)
+static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
+                unsigned long rate)
 {
         int ret = 0;
         struct cpufreq_freqs freqs;
@@ -128,8 +127,7 @@ static int tegra_update_cpu_speed(unsigned long rate)
         else
                 clk_set_rate(emc_clk, 100000000);  /* emc 50Mhz */
 
-        for_each_online_cpu(freqs.cpu)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
 #ifdef CONFIG_CPU_FREQ_DEBUG
         printk(KERN_DEBUG "cpufreq-tegra: transition: %u --> %u\n",
@@ -143,8 +141,7 @@ static int tegra_update_cpu_speed(unsigned long rate)
                 return ret;
         }
 
-        for_each_online_cpu(freqs.cpu)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
@@ -181,7 +178,7 @@ static int tegra_target(struct cpufreq_policy *policy,
 
         target_cpu_speed[policy->cpu] = freq;
 
-        ret = tegra_update_cpu_speed(tegra_cpu_highest_speed());
+        ret = tegra_update_cpu_speed(policy, tegra_cpu_highest_speed());
 
 out:
         mutex_unlock(&tegra_cpu_lock);
@@ -193,10 +190,12 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event,
 {
         mutex_lock(&tegra_cpu_lock);
         if (event == PM_SUSPEND_PREPARE) {
+                struct cpufreq_policy *policy = cpufreq_cpu_get(0);
                 is_suspended = true;
                 pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n",
                         freq_table[0].frequency);
-                tegra_update_cpu_speed(freq_table[0].frequency);
+                tegra_update_cpu_speed(policy, freq_table[0].frequency);
+                cpufreq_cpu_put(policy);
         } else if (event == PM_POST_SUSPEND) {
                 is_suspended = false;
         }
diff --git a/arch/unicore32/kernel/cpu-ucv2.c b/drivers/cpufreq/unicore2-cpufreq.c
index 4a99f62584c7..12fc904d7dab 100644
--- a/arch/unicore32/kernel/cpu-ucv2.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/unicore32/kernel/cpu-ucv2.c: clock scaling for the UniCore-II
+ * clock scaling for the UniCore-II
  *
  * Code specific to PKUnity SoC and UniCore ISA
  *
@@ -52,15 +52,14 @@ static int ucv2_target(struct cpufreq_policy *policy,
         struct cpufreq_freqs freqs;
         struct clk *mclk = clk_get(NULL, "MAIN_CLK");
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         if (!clk_set_rate(mclk, target_freq * 1000)) {
                 freqs.old = cur;
                 freqs.new = target_freq;
-                freqs.cpu = 0;
         }
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index 071e2c3eec4f..c4cc27e5c8a5 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -39,10 +39,4 @@ config CPU_IDLE_CALXEDA
         help
           Select this to enable cpuidle on Calxeda processors.
 
-config CPU_IDLE_KIRKWOOD
-        bool "CPU Idle Driver for Kirkwood processors"
-        depends on ARCH_KIRKWOOD
-        help
-          Select this to enable cpuidle on Kirkwood processors.
-
 endif
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 24c6e7d945ed..0d8bd55e776f 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -6,4 +6,4 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
 obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 
 obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
-obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o
+obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c
index e1aab38c5a8d..223379169cb0 100644
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012 Calxeda, Inc.
  *
- * Based on arch/arm/plat-mxc/cpuidle.c:
+ * Based on arch/arm/plat-mxc/cpuidle.c: #v3.7
  * Copyright 2012 Freescale Semiconductor, Inc.
  * Copyright 2012 Linaro Ltd.
  *
@@ -16,6 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Maintainer: Rob Herring <rob.herring@calxeda.com>
  */
 
 #include <linux/cpuidle.h>
@@ -35,8 +37,6 @@
 extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
 extern void *scu_base_addr;
 
-static struct cpuidle_device __percpu *calxeda_idle_cpuidle_devices;
-
 static inline unsigned int get_auxcr(void)
 {
         unsigned int val;
@@ -85,22 +85,8 @@ static int calxeda_pwrdown_idle(struct cpuidle_device *dev,
         return index;
 }
 
-static void calxeda_idle_cpuidle_devices_uninit(void)
-{
-        int i;
-        struct cpuidle_device *dev;
-
-        for_each_possible_cpu(i) {
-                dev = per_cpu_ptr(calxeda_idle_cpuidle_devices, i);
-                cpuidle_unregister_device(dev);
-        }
-
-        free_percpu(calxeda_idle_cpuidle_devices);
-}
-
 static struct cpuidle_driver calxeda_idle_driver = {
         .name = "calxeda_idle",
-        .en_core_tk_irqen = 1,
         .states = {
                 ARM_CPUIDLE_WFI_STATE,
                 {
@@ -118,44 +104,9 @@ static struct cpuidle_driver calxeda_idle_driver = {
 
 static int __init calxeda_cpuidle_init(void)
 {
-        int cpu_id;
-        int ret;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &calxeda_idle_driver;
-
         if (!of_machine_is_compatible("calxeda,highbank"))
                 return -ENODEV;
 
-        ret = cpuidle_register_driver(drv);
-        if (ret)
-                return ret;
-
-        calxeda_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (calxeda_idle_cpuidle_devices == NULL) {
-                ret = -ENOMEM;
-                goto unregister_drv;
-        }
-
-        /* initialize state data for each cpuidle_device */
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(calxeda_idle_cpuidle_devices, cpu_id);
-                dev->cpu = cpu_id;
-                dev->state_count = drv->state_count;
-
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("Failed to register cpu %u, error: %d\n",
-                               cpu_id, ret);
-                        goto uninit;
-                }
-        }
-
-        return 0;
-
-uninit:
-        calxeda_idle_cpuidle_devices_uninit();
-unregister_drv:
-        cpuidle_unregister_driver(drv);
-        return ret;
+        return cpuidle_register(&calxeda_idle_driver, NULL);
 }
 module_init(calxeda_cpuidle_init);
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 670aa1e55cd6..521b0a7fdd89 100644
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -1,6 +1,4 @@
 /*
- * arch/arm/mach-kirkwood/cpuidle.c
- *
  * CPU idle Marvell Kirkwood SoCs
  *
  * This file is licensed under the terms of the GNU General Public
@@ -11,6 +9,9 @@
  * to implement two idle states -
  * #1 wait-for-interrupt
  * #2 wait-for-interrupt and DDR self refresh
+ *
+ * Maintainer: Jason Cooper <jason@lakedaemon.net>
+ * Maintainer: Andrew Lunn <andrew@lunn.ch>
  */
 
 #include <linux/kernel.h>
@@ -41,7 +42,6 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver kirkwood_idle_driver = {
         .name                   = "kirkwood_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = kirkwood_enter_idle,
@@ -53,9 +53,6 @@ static struct cpuidle_driver kirkwood_idle_driver = {
         },
         .state_count = KIRKWOOD_MAX_STATES,
 };
-static struct cpuidle_device *device;
-
-static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
 
 /* Initialize CPU idle by registering the idle states */
 static int kirkwood_cpuidle_probe(struct platform_device *pdev)
@@ -66,26 +63,16 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -EINVAL;
 
-        ddr_operation_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!ddr_operation_base)
-                return -EADDRNOTAVAIL;
+        ddr_operation_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ddr_operation_base))
+                return PTR_ERR(ddr_operation_base);
 
-        device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
-        device->state_count = KIRKWOOD_MAX_STATES;
-
-        cpuidle_register_driver(&kirkwood_idle_driver);
-        if (cpuidle_register_device(device)) {
-                pr_err("kirkwood_init_cpuidle: Failed registering\n");
-                return -EIO;
-        }
-        return 0;
+        return cpuidle_register(&kirkwood_idle_driver, NULL);
 }
 
 int kirkwood_cpuidle_remove(struct platform_device *pdev)
 {
-        cpuidle_unregister_device(device);
-        cpuidle_unregister_driver(&kirkwood_idle_driver);
-
+        cpuidle_unregister(&kirkwood_idle_driver);
         return 0;
 }
 
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index eba69290e074..c3a93fece819 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -8,6 +8,7 @@
  * This code is licenced under the GPL.
  */
 
+#include <linux/clockchips.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
@@ -23,6 +24,7 @@
 #include "cpuidle.h"
 
 DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
+DEFINE_PER_CPU(struct cpuidle_device, cpuidle_dev);
 
 DEFINE_MUTEX(cpuidle_lock);
 LIST_HEAD(cpuidle_detected_devices);
@@ -42,24 +44,6 @@ void disable_cpuidle(void)
 
 static int __cpuidle_register_device(struct cpuidle_device *dev);
 
-static inline int cpuidle_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index)
-{
-        struct cpuidle_state *target_state = &drv->states[index];
-        return target_state->enter(dev, drv, index);
-}
-
-static inline int cpuidle_enter_tk(struct cpuidle_device *dev,
-                               struct cpuidle_driver *drv, int index)
-{
-        return cpuidle_wrap_enter(dev, drv, index, cpuidle_enter);
-}
-
-typedef int (*cpuidle_enter_t)(struct cpuidle_device *dev,
-                               struct cpuidle_driver *drv, int index);
-
-static cpuidle_enter_t cpuidle_enter_ops;
-
 /**
  * cpuidle_play_dead - cpu off-lining
  *
@@ -89,11 +73,27 @@ int cpuidle_play_dead(void)
  * @next_state: index into drv->states of the state to enter
  */
 int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
-                int next_state)
+                        int index)
 {
         int entered_state;
 
-        entered_state = cpuidle_enter_ops(dev, drv, next_state);
+        struct cpuidle_state *target_state = &drv->states[index];
+        ktime_t time_start, time_end;
+        s64 diff;
+
+        time_start = ktime_get();
+
+        entered_state = target_state->enter(dev, drv, index);
+
+        time_end = ktime_get();
+
+        local_irq_enable();
+
+        diff = ktime_to_us(ktime_sub(time_end, time_start));
+        if (diff > INT_MAX)
+                diff = INT_MAX;
+
+        dev->last_residency = (int) diff;
 
         if (entered_state >= 0) {
                 /* Update cpuidle counters */
@@ -146,12 +146,20 @@ int cpuidle_idle_call(void)
 
         trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
+        if (drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP)
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
+                                   &dev->cpu);
+
         if (cpuidle_state_is_coupled(dev, drv, next_state))
                 entered_state = cpuidle_enter_state_coupled(dev, drv,
                                                             next_state);
         else
                 entered_state = cpuidle_enter_state(dev, drv, next_state);
 
+        if (drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP)
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
+                                   &dev->cpu);
+
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
         /* give the governor an opportunity to reflect on the outcome */
@@ -222,37 +230,6 @@ void cpuidle_resume(void)
         mutex_unlock(&cpuidle_lock);
 }
 
-/**
- * cpuidle_wrap_enter - performs timekeeping and irqen around enter function
- * @dev: pointer to a valid cpuidle_device object
- * @drv: pointer to a valid cpuidle_driver object
- * @index: index of the target cpuidle state.
- */
-int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index))
-{
-        ktime_t time_start, time_end;
-        s64 diff;
-
-        time_start = ktime_get();
-
-        index = enter(dev, drv, index);
-
-        time_end = ktime_get();
-
-        local_irq_enable();
-
-        diff = ktime_to_us(ktime_sub(time_end, time_start));
-        if (diff > INT_MAX)
-                diff = INT_MAX;
-
-        dev->last_residency = (int) diff;
-
-        return index;
-}
-
 #ifdef CONFIG_ARCH_HAS_CPU_RELAX
 static int poll_idle(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
@@ -324,9 +301,6 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
                         return ret;
         }
 
-        cpuidle_enter_ops = drv->en_core_tk_irqen ?
-                cpuidle_enter_tk : cpuidle_enter;
-
         poll_idle_init(drv);
 
         ret = cpuidle_add_device_sysfs(dev);
@@ -480,6 +454,77 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
 
 EXPORT_SYMBOL_GPL(cpuidle_unregister_device);
 
+/**
+ * cpuidle_unregister: unregister a driver and the devices. This function
+ * can be used only if the driver has been previously registered through
+ * the cpuidle_register function.
+ *
+ * @drv: a valid pointer to a struct cpuidle_driver
+ */
+void cpuidle_unregister(struct cpuidle_driver *drv)
+{
+        int cpu;
+        struct cpuidle_device *device;
+
+        for_each_possible_cpu(cpu) {
+                device = &per_cpu(cpuidle_dev, cpu);
+                cpuidle_unregister_device(device);
+        }
+
+        cpuidle_unregister_driver(drv);
+}
+EXPORT_SYMBOL_GPL(cpuidle_unregister);
+
+/**
+ * cpuidle_register: registers the driver and the cpu devices with the
+ * coupled_cpus passed as parameter. This function is used for all common
+ * initialization pattern there are in the arch specific drivers. The
+ * devices is globally defined in this file.
+ *
+ * @drv         : a valid pointer to a struct cpuidle_driver
+ * @coupled_cpus: a cpumask for the coupled states
+ *
+ * Returns 0 on success, < 0 otherwise
+ */
+int cpuidle_register(struct cpuidle_driver *drv,
+                     const struct cpumask *const coupled_cpus)
+{
+        int ret, cpu;
+        struct cpuidle_device *device;
+
+        ret = cpuidle_register_driver(drv);
+        if (ret) {
+                pr_err("failed to register cpuidle driver\n");
+                return ret;
+        }
+
+        for_each_possible_cpu(cpu) {
+                device = &per_cpu(cpuidle_dev, cpu);
+                device->cpu = cpu;
+
+#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
+                /*
+                 * On multiplatform for ARM, the coupled idle states could
+                 * enabled in the kernel even if the cpuidle driver does not
+                 * use it. Note, coupled_cpus is a struct copy.
+                 */
+                if (coupled_cpus)
+                        device->coupled_cpus = *coupled_cpus;
+#endif
+                ret = cpuidle_register_device(device);
+                if (!ret)
+                        continue;
+
+                pr_err("Failed to register cpuidle device for cpu%d\n", cpu);
+
+                cpuidle_unregister(drv);
+                break;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(cpuidle_register);
+
 #ifdef CONFIG_SMP
 
 static void smp_callback(void *v)
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 422c7b69ba7c..8dfaaae94444 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -11,6 +11,8 @@
 #include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/cpuidle.h>
+#include <linux/cpumask.h>
+#include <linux/clockchips.h>
 
 #include "cpuidle.h"
 
@@ -19,9 +21,28 @@ DEFINE_SPINLOCK(cpuidle_driver_lock);
 static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu);
 static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu);
 
-static void __cpuidle_driver_init(struct cpuidle_driver *drv)
+static void cpuidle_setup_broadcast_timer(void *arg)
 {
+        int cpu = smp_processor_id();
+        clockevents_notify((long)(arg), &cpu);
+}
+
+static void __cpuidle_driver_init(struct cpuidle_driver *drv, int cpu)
+{
+        int i;
+
         drv->refcnt = 0;
+
+        for (i = drv->state_count - 1; i >= 0 ; i--) {
+
+                if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP))
+                        continue;
+
+                drv->bctimer = 1;
+                on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
+                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1);
+                break;
+        }
 }
 
 static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu)
@@ -35,7 +56,7 @@ static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu)
         if (__cpuidle_get_cpu_driver(cpu))
                 return -EBUSY;
 
-        __cpuidle_driver_init(drv);
+        __cpuidle_driver_init(drv, cpu);
 
         __cpuidle_set_cpu_driver(drv, cpu);
 
@@ -49,6 +70,12 @@ static void __cpuidle_unregister_driver(struct cpuidle_driver *drv, int cpu)
 
         if (!WARN_ON(drv->refcnt > 0))
                 __cpuidle_set_cpu_driver(NULL, cpu);
+
+        if (drv->bctimer) {
+                drv->bctimer = 0;
+                on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
+                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1);
+        }
 }
 
 #ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 4d338740f2cb..a8117e614009 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -350,11 +350,11 @@ static void intel_didl_outputs(struct drm_device *dev)
         if (!handle || acpi_bus_get_device(handle, &acpi_dev))
                 return;
 
-        if (acpi_is_video_device(acpi_dev))
+        if (acpi_is_video_device(handle))
                 acpi_video_bus = acpi_dev;
         else {
                 list_for_each_entry(acpi_cdev, &acpi_dev->children, node) {
-                        if (acpi_is_video_device(acpi_cdev)) {
+                        if (acpi_is_video_device(acpi_cdev->handle)) {
                                 acpi_video_bus = acpi_cdev;
                                 break;
                         }
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 1a38dd7dfe4e..0e8fab1913df 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -71,7 +71,6 @@
 static struct cpuidle_driver intel_idle_driver = {
         .name = "intel_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
 };
 /* intel_idle.max_cstate=0 disables driver */
 static int max_cstate = CPUIDLE_STATE_MAX - 1;
@@ -339,7 +338,6 @@ static int intel_idle(struct cpuidle_device *dev,
         if (!(lapic_timer_reliable_states & (1 << (cstate))))
                 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
 
-        stop_critical_timings();
         if (!need_resched()) {
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);
@@ -348,8 +346,6 @@ static int intel_idle(struct cpuidle_device *dev,
                         __mwait(eax, ecx);
         }
 
-        start_critical_timings();
-
         if (!(lapic_timer_reliable_states & (1 << (cstate))))
                 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
 
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 14d4dced1def..d544e3aaf761 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4121,7 +4121,7 @@ static int sony_pic_enable(struct acpi_device *device,
                 resource->res3.data.irq.sharable = ACPI_SHARED;
 
                 resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;
-
+                resource->res4.length = sizeof(struct acpi_resource);
         }
         /* setup Type 2/3 resources */
         else {
@@ -4140,6 +4140,7 @@ static int sony_pic_enable(struct acpi_device *device,
                 resource->res2.data.irq.sharable = ACPI_SHARED;
 
                 resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
+                resource->res3.length = sizeof(struct acpi_resource);
         }
 
         /* Attempt to set the resource */
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 918d5f044865..cf88f9b62445 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -379,10 +379,6 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
                 *type = (tag >> 3) & 0x0f;
                 *size = tag & 0x07;
         }
-#if 0
-        printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type,
-               *size);
-#endif
         if (*type == 0xff && *size == 0xffff)   /* probably invalid data */
                 return -1;
         return 0;
@@ -813,13 +809,6 @@ static int __init isapnp_build_device_list(void)
                 if (!card)
                         continue;
 
-#if 0
-                dev_info(&card->dev,
-                       "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-                       header[0], header[1], header[2], header[3], header[4],
-                       header[5], header[6], header[7], header[8]);
-                dev_info(&card->dev, "checksum = %#x\n", checksum);
-#endif
                 INIT_LIST_HEAD(&card->devices);
                 card->serial =
                     (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index b8f4ea7b27fc..9847ab163829 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -634,6 +634,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
         }
         /* resource will pointer the end resource now */
         resource->type = ACPI_RESOURCE_TYPE_END_TAG;
+        resource->length = sizeof(struct acpi_resource);
 
         return 0;
 }
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 63ddb0173456..1c03ee822e50 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -185,10 +185,9 @@ static int pnp_devices_proc_show(struct seq_file *m, void *v)
 
                 if (pnp_bios_get_dev_node(&nodenum, PNPMODE_DYNAMIC, node))
                         break;
-                seq_printf(m, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n",
+                seq_printf(m, "%02x\t%08x\t%3phC\t%04x\n",
                              node->handle, node->eisa_id,
-                             node->type_code[0], node->type_code[1],
-                             node->type_code[2], node->flags);
+                             node->type_code, node->flags);
                 if (nodenum <= thisnodenum) {
                         printk(KERN_ERR
                                "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n",
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 9bf59d0e8aaa..cf051e05a8fe 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -44,17 +44,50 @@
 #ifndef __ACEXCEP_H__
 #define __ACEXCEP_H__
 
+/* This module contains all possible exception codes for acpi_status */
+
 /*
- * Exceptions returned by external ACPI interfaces
+ * Exception code classes
  */
-#define AE_CODE_ENVIRONMENTAL           0x0000
-#define AE_CODE_PROGRAMMER              0x1000
-#define AE_CODE_ACPI_TABLES             0x2000
-#define AE_CODE_AML                     0x3000
-#define AE_CODE_CONTROL                 0x4000
+#define AE_CODE_ENVIRONMENTAL           0x0000  /* General ACPICA environment */
+#define AE_CODE_PROGRAMMER              0x1000  /* External ACPICA interface caller */
+#define AE_CODE_ACPI_TABLES             0x2000  /* ACPI tables */
+#define AE_CODE_AML                     0x3000  /* From executing AML code */
+#define AE_CODE_CONTROL                 0x4000  /* Internal control codes */
+
 #define AE_CODE_MAX                     0x4000
 #define AE_CODE_MASK                    0xF000
 
+/*
+ * Macros to insert the exception code classes
+ */
+#define EXCEP_ENV(code)                 ((acpi_status) (code | AE_CODE_ENVIRONMENTAL))
+#define EXCEP_PGM(code)                 ((acpi_status) (code | AE_CODE_PROGRAMMER))
+#define EXCEP_TBL(code)                 ((acpi_status) (code | AE_CODE_ACPI_TABLES))
+#define EXCEP_AML(code)                 ((acpi_status) (code | AE_CODE_AML))
+#define EXCEP_CTL(code)                 ((acpi_status) (code | AE_CODE_CONTROL))
+
+/*
+ * Exception info table. The "Description" field is used only by the
+ * ACPICA help application (acpihelp).
+ */
+struct acpi_exception_info {
+        char *name;
+
+#ifdef ACPI_HELP_APP
+        char *description;
+#endif
+};
+
+#ifdef ACPI_HELP_APP
+#define EXCEP_TXT(name,description)     {name, description}
+#else
+#define EXCEP_TXT(name,description)     {name}
+#endif
+
+/*
+ * Success is always zero, failure is non-zero
+ */
 #define ACPI_SUCCESS(a)                 (!(a))
 #define ACPI_FAILURE(a)                 (a)
 
@@ -64,60 +97,60 @@
 /*
  * Environmental exceptions
  */
-#define AE_ERROR                        (acpi_status) (0x0001 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_ACPI_TABLES               (acpi_status) (0x0002 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_NAMESPACE                 (acpi_status) (0x0003 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_MEMORY                    (acpi_status) (0x0004 | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_FOUND                    (acpi_status) (0x0005 | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_EXIST                    (acpi_status) (0x0006 | AE_CODE_ENVIRONMENTAL)
-#define AE_ALREADY_EXISTS               (acpi_status) (0x0007 | AE_CODE_ENVIRONMENTAL)
-#define AE_TYPE                         (acpi_status) (0x0008 | AE_CODE_ENVIRONMENTAL)
-#define AE_NULL_OBJECT                  (acpi_status) (0x0009 | AE_CODE_ENVIRONMENTAL)
-#define AE_NULL_ENTRY                   (acpi_status) (0x000A | AE_CODE_ENVIRONMENTAL)
-#define AE_BUFFER_OVERFLOW              (acpi_status) (0x000B | AE_CODE_ENVIRONMENTAL)
-#define AE_STACK_OVERFLOW               (acpi_status) (0x000C | AE_CODE_ENVIRONMENTAL)
-#define AE_STACK_UNDERFLOW              (acpi_status) (0x000D | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_IMPLEMENTED              (acpi_status) (0x000E | AE_CODE_ENVIRONMENTAL)
-#define AE_SUPPORT                      (acpi_status) (0x000F | AE_CODE_ENVIRONMENTAL)
-#define AE_LIMIT                        (acpi_status) (0x0010 | AE_CODE_ENVIRONMENTAL)
-#define AE_TIME                         (acpi_status) (0x0011 | AE_CODE_ENVIRONMENTAL)
-#define AE_ACQUIRE_DEADLOCK             (acpi_status) (0x0012 | AE_CODE_ENVIRONMENTAL)
-#define AE_RELEASE_DEADLOCK             (acpi_status) (0x0013 | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_ACQUIRED                 (acpi_status) (0x0014 | AE_CODE_ENVIRONMENTAL)
-#define AE_ALREADY_ACQUIRED             (acpi_status) (0x0015 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_HARDWARE_RESPONSE         (acpi_status) (0x0016 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_GLOBAL_LOCK               (acpi_status) (0x0017 | AE_CODE_ENVIRONMENTAL)
-#define AE_ABORT_METHOD                 (acpi_status) (0x0018 | AE_CODE_ENVIRONMENTAL)
-#define AE_SAME_HANDLER                 (acpi_status) (0x0019 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_HANDLER                   (acpi_status) (0x001A | AE_CODE_ENVIRONMENTAL)
-#define AE_OWNER_ID_LIMIT               (acpi_status) (0x001B | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_CONFIGURED               (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL)
+#define AE_ERROR                        EXCEP_ENV (0x0001)
+#define AE_NO_ACPI_TABLES               EXCEP_ENV (0x0002)
+#define AE_NO_NAMESPACE                 EXCEP_ENV (0x0003)
+#define AE_NO_MEMORY                    EXCEP_ENV (0x0004)
+#define AE_NOT_FOUND                    EXCEP_ENV (0x0005)
+#define AE_NOT_EXIST                    EXCEP_ENV (0x0006)
+#define AE_ALREADY_EXISTS               EXCEP_ENV (0x0007)
+#define AE_TYPE                         EXCEP_ENV (0x0008)
+#define AE_NULL_OBJECT                  EXCEP_ENV (0x0009)
+#define AE_NULL_ENTRY                   EXCEP_ENV (0x000A)
+#define AE_BUFFER_OVERFLOW              EXCEP_ENV (0x000B)
+#define AE_STACK_OVERFLOW               EXCEP_ENV (0x000C)
+#define AE_STACK_UNDERFLOW              EXCEP_ENV (0x000D)
+#define AE_NOT_IMPLEMENTED              EXCEP_ENV (0x000E)
+#define AE_SUPPORT                      EXCEP_ENV (0x000F)
+#define AE_LIMIT                        EXCEP_ENV (0x0010)
+#define AE_TIME                         EXCEP_ENV (0x0011)
+#define AE_ACQUIRE_DEADLOCK             EXCEP_ENV (0x0012)
+#define AE_RELEASE_DEADLOCK             EXCEP_ENV (0x0013)
+#define AE_NOT_ACQUIRED                 EXCEP_ENV (0x0014)
+#define AE_ALREADY_ACQUIRED             EXCEP_ENV (0x0015)
+#define AE_NO_HARDWARE_RESPONSE         EXCEP_ENV (0x0016)
+#define AE_NO_GLOBAL_LOCK               EXCEP_ENV (0x0017)
+#define AE_ABORT_METHOD                 EXCEP_ENV (0x0018)
+#define AE_SAME_HANDLER                 EXCEP_ENV (0x0019)
+#define AE_NO_HANDLER                   EXCEP_ENV (0x001A)
+#define AE_OWNER_ID_LIMIT               EXCEP_ENV (0x001B)
+#define AE_NOT_CONFIGURED               EXCEP_ENV (0x001C)
 
 #define AE_CODE_ENV_MAX                 0x001C
 
 /*
  * Programmer exceptions
  */
-#define AE_BAD_PARAMETER                (acpi_status) (0x0001 | AE_CODE_PROGRAMMER)
-#define AE_BAD_CHARACTER                (acpi_status) (0x0002 | AE_CODE_PROGRAMMER)
-#define AE_BAD_PATHNAME                 (acpi_status) (0x0003 | AE_CODE_PROGRAMMER)
-#define AE_BAD_DATA                     (acpi_status) (0x0004 | AE_CODE_PROGRAMMER)
-#define AE_BAD_HEX_CONSTANT             (acpi_status) (0x0005 | AE_CODE_PROGRAMMER)
-#define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0006 | AE_CODE_PROGRAMMER)
-#define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
-#define AE_MISSING_ARGUMENTS            (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
-#define AE_BAD_ADDRESS                  (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)
+#define AE_BAD_PARAMETER                EXCEP_PGM (0x0001)
+#define AE_BAD_CHARACTER                EXCEP_PGM (0x0002)
+#define AE_BAD_PATHNAME                 EXCEP_PGM (0x0003)
+#define AE_BAD_DATA                     EXCEP_PGM (0x0004)
+#define AE_BAD_HEX_CONSTANT             EXCEP_PGM (0x0005)
+#define AE_BAD_OCTAL_CONSTANT           EXCEP_PGM (0x0006)
+#define AE_BAD_DECIMAL_CONSTANT         EXCEP_PGM (0x0007)
+#define AE_MISSING_ARGUMENTS            EXCEP_PGM (0x0008)
+#define AE_BAD_ADDRESS                  EXCEP_PGM (0x0009)
 
 #define AE_CODE_PGM_MAX                 0x0009
 
 /*
  * Acpi table exceptions
  */
-#define AE_BAD_SIGNATURE                (acpi_status) (0x0001 | AE_CODE_ACPI_TABLES)
-#define AE_BAD_HEADER                   (acpi_status) (0x0002 | AE_CODE_ACPI_TABLES)
-#define AE_BAD_CHECKSUM                 (acpi_status) (0x0003 | AE_CODE_ACPI_TABLES)
-#define AE_BAD_VALUE                    (acpi_status) (0x0004 | AE_CODE_ACPI_TABLES)
-#define AE_INVALID_TABLE_LENGTH         (acpi_status) (0x0005 | AE_CODE_ACPI_TABLES)
+#define AE_BAD_SIGNATURE                EXCEP_TBL (0x0001)
+#define AE_BAD_HEADER                   EXCEP_TBL (0x0002)
+#define AE_BAD_CHECKSUM                 EXCEP_TBL (0x0003)
+#define AE_BAD_VALUE                    EXCEP_TBL (0x0004)
+#define AE_INVALID_TABLE_LENGTH         EXCEP_TBL (0x0005)
 
 #define AE_CODE_TBL_MAX                 0x0005
 
@@ -125,58 +158,58 @@
  * AML exceptions. These are caused by problems with
  * the actual AML byte stream
  */
-#define AE_AML_BAD_OPCODE               (acpi_status) (0x0001 | AE_CODE_AML)
-#define AE_AML_NO_OPERAND               (acpi_status) (0x0002 | AE_CODE_AML)
-#define AE_AML_OPERAND_TYPE             (acpi_status) (0x0003 | AE_CODE_AML)
-#define AE_AML_OPERAND_VALUE            (acpi_status) (0x0004 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_LOCAL      (acpi_status) (0x0005 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_ARG        (acpi_status) (0x0006 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_ELEMENT    (acpi_status) (0x0007 | AE_CODE_AML)
-#define AE_AML_NUMERIC_OVERFLOW         (acpi_status) (0x0008 | AE_CODE_AML)
-#define AE_AML_REGION_LIMIT             (acpi_status) (0x0009 | AE_CODE_AML)
-#define AE_AML_BUFFER_LIMIT             (acpi_status) (0x000A | AE_CODE_AML)
-#define AE_AML_PACKAGE_LIMIT            (acpi_status) (0x000B | AE_CODE_AML)
-#define AE_AML_DIVIDE_BY_ZERO           (acpi_status) (0x000C | AE_CODE_AML)
-#define AE_AML_BAD_NAME                 (acpi_status) (0x000D | AE_CODE_AML)
-#define AE_AML_NAME_NOT_FOUND           (acpi_status) (0x000E | AE_CODE_AML)
-#define AE_AML_INTERNAL                 (acpi_status) (0x000F | AE_CODE_AML)
-#define AE_AML_INVALID_SPACE_ID         (acpi_status) (0x0010 | AE_CODE_AML)
-#define AE_AML_STRING_LIMIT             (acpi_status) (0x0011 | AE_CODE_AML)
-#define AE_AML_NO_RETURN_VALUE          (acpi_status) (0x0012 | AE_CODE_AML)
-#define AE_AML_METHOD_LIMIT             (acpi_status) (0x0013 | AE_CODE_AML)
-#define AE_AML_NOT_OWNER                (acpi_status) (0x0014 | AE_CODE_AML)
-#define AE_AML_MUTEX_ORDER              (acpi_status) (0x0015 | AE_CODE_AML)
-#define AE_AML_MUTEX_NOT_ACQUIRED       (acpi_status) (0x0016 | AE_CODE_AML)
-#define AE_AML_INVALID_RESOURCE_TYPE    (acpi_status) (0x0017 | AE_CODE_AML)
-#define AE_AML_INVALID_INDEX            (acpi_status) (0x0018 | AE_CODE_AML)
-#define AE_AML_REGISTER_LIMIT           (acpi_status) (0x0019 | AE_CODE_AML)
-#define AE_AML_NO_WHILE                 (acpi_status) (0x001A | AE_CODE_AML)
-#define AE_AML_ALIGNMENT                (acpi_status) (0x001B | AE_CODE_AML)
-#define AE_AML_NO_RESOURCE_END_TAG      (acpi_status) (0x001C | AE_CODE_AML)
-#define AE_AML_BAD_RESOURCE_VALUE       (acpi_status) (0x001D | AE_CODE_AML)
-#define AE_AML_CIRCULAR_REFERENCE       (acpi_status) (0x001E | AE_CODE_AML)
-#define AE_AML_BAD_RESOURCE_LENGTH      (acpi_status) (0x001F | AE_CODE_AML)
-#define AE_AML_ILLEGAL_ADDRESS          (acpi_status) (0x0020 | AE_CODE_AML)
-#define AE_AML_INFINITE_LOOP            (acpi_status) (0x0021 | AE_CODE_AML)
+#define AE_AML_BAD_OPCODE               EXCEP_AML (0x0001)
+#define AE_AML_NO_OPERAND               EXCEP_AML (0x0002)
+#define AE_AML_OPERAND_TYPE             EXCEP_AML (0x0003)
+#define AE_AML_OPERAND_VALUE            EXCEP_AML (0x0004)
+#define AE_AML_UNINITIALIZED_LOCAL      EXCEP_AML (0x0005)
+#define AE_AML_UNINITIALIZED_ARG        EXCEP_AML (0x0006)
+#define AE_AML_UNINITIALIZED_ELEMENT    EXCEP_AML (0x0007)
+#define AE_AML_NUMERIC_OVERFLOW         EXCEP_AML (0x0008)
+#define AE_AML_REGION_LIMIT             EXCEP_AML (0x0009)
+#define AE_AML_BUFFER_LIMIT             EXCEP_AML (0x000A)
+#define AE_AML_PACKAGE_LIMIT            EXCEP_AML (0x000B)
+#define AE_AML_DIVIDE_BY_ZERO           EXCEP_AML (0x000C)
+#define AE_AML_BAD_NAME                 EXCEP_AML (0x000D)
+#define AE_AML_NAME_NOT_FOUND           EXCEP_AML (0x000E)
+#define AE_AML_INTERNAL                 EXCEP_AML (0x000F)
+#define AE_AML_INVALID_SPACE_ID         EXCEP_AML (0x0010)
+#define AE_AML_STRING_LIMIT             EXCEP_AML (0x0011)
+#define AE_AML_NO_RETURN_VALUE          EXCEP_AML (0x0012)
+#define AE_AML_METHOD_LIMIT             EXCEP_AML (0x0013)
+#define AE_AML_NOT_OWNER                EXCEP_AML (0x0014)
+#define AE_AML_MUTEX_ORDER              EXCEP_AML (0x0015)
+#define AE_AML_MUTEX_NOT_ACQUIRED       EXCEP_AML (0x0016)
+#define AE_AML_INVALID_RESOURCE_TYPE    EXCEP_AML (0x0017)
+#define AE_AML_INVALID_INDEX            EXCEP_AML (0x0018)
+#define AE_AML_REGISTER_LIMIT           EXCEP_AML (0x0019)
+#define AE_AML_NO_WHILE                 EXCEP_AML (0x001A)
+#define AE_AML_ALIGNMENT                EXCEP_AML (0x001B)
+#define AE_AML_NO_RESOURCE_END_TAG      EXCEP_AML (0x001C)
+#define AE_AML_BAD_RESOURCE_VALUE       EXCEP_AML (0x001D)
+#define AE_AML_CIRCULAR_REFERENCE       EXCEP_AML (0x001E)
+#define AE_AML_BAD_RESOURCE_LENGTH      EXCEP_AML (0x001F)
+#define AE_AML_ILLEGAL_ADDRESS          EXCEP_AML (0x0020)
+#define AE_AML_INFINITE_LOOP            EXCEP_AML (0x0021)
 
 #define AE_CODE_AML_MAX                 0x0021
 
 /*
  * Internal exceptions used for control
  */
-#define AE_CTRL_RETURN_VALUE            (acpi_status) (0x0001 | AE_CODE_CONTROL)
-#define AE_CTRL_PENDING                 (acpi_status) (0x0002 | AE_CODE_CONTROL)
-#define AE_CTRL_TERMINATE               (acpi_status) (0x0003 | AE_CODE_CONTROL)
-#define AE_CTRL_TRUE                    (acpi_status) (0x0004 | AE_CODE_CONTROL)
-#define AE_CTRL_FALSE                   (acpi_status) (0x0005 | AE_CODE_CONTROL)
-#define AE_CTRL_DEPTH                   (acpi_status) (0x0006 | AE_CODE_CONTROL)
-#define AE_CTRL_END                     (acpi_status) (0x0007 | AE_CODE_CONTROL)
-#define AE_CTRL_TRANSFER                (acpi_status) (0x0008 | AE_CODE_CONTROL)
-#define AE_CTRL_BREAK                   (acpi_status) (0x0009 | AE_CODE_CONTROL)
-#define AE_CTRL_CONTINUE                (acpi_status) (0x000A | AE_CODE_CONTROL)
-#define AE_CTRL_SKIP                    (acpi_status) (0x000B | AE_CODE_CONTROL)
-#define AE_CTRL_PARSE_CONTINUE          (acpi_status) (0x000C | AE_CODE_CONTROL)
-#define AE_CTRL_PARSE_PENDING           (acpi_status) (0x000D | AE_CODE_CONTROL)
+#define AE_CTRL_RETURN_VALUE            EXCEP_CTL (0x0001)
+#define AE_CTRL_PENDING                 EXCEP_CTL (0x0002)
+#define AE_CTRL_TERMINATE               EXCEP_CTL (0x0003)
+#define AE_CTRL_TRUE                    EXCEP_CTL (0x0004)
+#define AE_CTRL_FALSE                   EXCEP_CTL (0x0005)
+#define AE_CTRL_DEPTH                   EXCEP_CTL (0x0006)
+#define AE_CTRL_END                     EXCEP_CTL (0x0007)
+#define AE_CTRL_TRANSFER                EXCEP_CTL (0x0008)
+#define AE_CTRL_BREAK                   EXCEP_CTL (0x0009)
+#define AE_CTRL_CONTINUE                EXCEP_CTL (0x000A)
+#define AE_CTRL_SKIP                    EXCEP_CTL (0x000B)
+#define AE_CTRL_PARSE_CONTINUE          EXCEP_CTL (0x000C)
+#define AE_CTRL_PARSE_PENDING           EXCEP_CTL (0x000D)
 
 #define AE_CODE_CTRL_MAX                0x000D
 
@@ -188,112 +221,156 @@
  * String versions of the exception codes above
  * These strings must match the corresponding defines exactly
  */
-char const *acpi_gbl_exception_names_env[] = {
-        "AE_OK",
-        "AE_ERROR",
-        "AE_NO_ACPI_TABLES",
-        "AE_NO_NAMESPACE",
-        "AE_NO_MEMORY",
-        "AE_NOT_FOUND",
-        "AE_NOT_EXIST",
-        "AE_ALREADY_EXISTS",
-        "AE_TYPE",
-        "AE_NULL_OBJECT",
-        "AE_NULL_ENTRY",
-        "AE_BUFFER_OVERFLOW",
-        "AE_STACK_OVERFLOW",
-        "AE_STACK_UNDERFLOW",
-        "AE_NOT_IMPLEMENTED",
-        "AE_SUPPORT",
-        "AE_LIMIT",
-        "AE_TIME",
-        "AE_ACQUIRE_DEADLOCK",
-        "AE_RELEASE_DEADLOCK",
-        "AE_NOT_ACQUIRED",
-        "AE_ALREADY_ACQUIRED",
-        "AE_NO_HARDWARE_RESPONSE",
-        "AE_NO_GLOBAL_LOCK",
-        "AE_ABORT_METHOD",
-        "AE_SAME_HANDLER",
-        "AE_NO_HANDLER",
-        "AE_OWNER_ID_LIMIT",
-        "AE_NOT_CONFIGURED"
+static const struct acpi_exception_info acpi_gbl_exception_names_env[] = {
+        EXCEP_TXT("AE_OK", "No error"),
+        EXCEP_TXT("AE_ERROR", "Unspecified error"),
+        EXCEP_TXT("AE_NO_ACPI_TABLES", "ACPI tables could not be found"),
+        EXCEP_TXT("AE_NO_NAMESPACE", "A namespace has not been loaded"),
+        EXCEP_TXT("AE_NO_MEMORY", "Insufficient dynamic memory"),
+        EXCEP_TXT("AE_NOT_FOUND", "The name was not found in the namespace"),
+        EXCEP_TXT("AE_NOT_EXIST", "A required entity does not exist"),
+        EXCEP_TXT("AE_ALREADY_EXISTS", "An entity already exists"),
+        EXCEP_TXT("AE_TYPE", "The object type is incorrect"),
+        EXCEP_TXT("AE_NULL_OBJECT", "A required object was missing"),
+        EXCEP_TXT("AE_NULL_ENTRY", "The requested object does not exist"),
+        EXCEP_TXT("AE_BUFFER_OVERFLOW", "The buffer provided is too small"),
+        EXCEP_TXT("AE_STACK_OVERFLOW", "An internal stack overflowed"),
+        EXCEP_TXT("AE_STACK_UNDERFLOW", "An internal stack underflowed"),
+        EXCEP_TXT("AE_NOT_IMPLEMENTED", "The feature is not implemented"),
+        EXCEP_TXT("AE_SUPPORT", "The feature is not supported"),
+        EXCEP_TXT("AE_LIMIT", "A predefined limit was exceeded"),
+        EXCEP_TXT("AE_TIME", "A time limit or timeout expired"),
+        EXCEP_TXT("AE_ACQUIRE_DEADLOCK",
+                  "Internal error, attempt was made to acquire a mutex in improper order"),
+        EXCEP_TXT("AE_RELEASE_DEADLOCK",
+                  "Internal error, attempt was made to release a mutex in improper order"),
+        EXCEP_TXT("AE_NOT_ACQUIRED",
+                  "An attempt to release a mutex or Global Lock without a previous acquire"),
+        EXCEP_TXT("AE_ALREADY_ACQUIRED",
+                  "Internal error, attempt was made to acquire a mutex twice"),
+        EXCEP_TXT("AE_NO_HARDWARE_RESPONSE",
+                  "Hardware did not respond after an I/O operation"),
+        EXCEP_TXT("AE_NO_GLOBAL_LOCK", "There is no FACS Global Lock"),
+        EXCEP_TXT("AE_ABORT_METHOD", "A control method was aborted"),
+        EXCEP_TXT("AE_SAME_HANDLER",
+                  "Attempt was made to install the same handler that is already installed"),
+        EXCEP_TXT("AE_NO_HANDLER",
+                  "A handler for the operation is not installed"),
+        EXCEP_TXT("AE_OWNER_ID_LIMIT",
+                  "There are no more Owner IDs available for ACPI tables or control methods"),
+        EXCEP_TXT("AE_NOT_CONFIGURED",
+                  "The interface is not part of the current subsystem configuration")
 };
 
-char const *acpi_gbl_exception_names_pgm[] = {
-        NULL,
-        "AE_BAD_PARAMETER",
-        "AE_BAD_CHARACTER",
-        "AE_BAD_PATHNAME",
-        "AE_BAD_DATA",
-        "AE_BAD_HEX_CONSTANT",
-        "AE_BAD_OCTAL_CONSTANT",
-        "AE_BAD_DECIMAL_CONSTANT",
-        "AE_MISSING_ARGUMENTS",
-        "AE_BAD_ADDRESS"
+static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = {
+        EXCEP_TXT(NULL, NULL),
+        EXCEP_TXT("AE_BAD_PARAMETER", "A parameter is out of range or invalid"),
+        EXCEP_TXT("AE_BAD_CHARACTER",
+                  "An invalid character was found in a name"),
+        EXCEP_TXT("AE_BAD_PATHNAME",
+                  "An invalid character was found in a pathname"),
+        EXCEP_TXT("AE_BAD_DATA",
+                  "A package or buffer contained incorrect data"),
+        EXCEP_TXT("AE_BAD_HEX_CONSTANT", "Invalid character in a Hex constant"),
+        EXCEP_TXT("AE_BAD_OCTAL_CONSTANT",
+                  "Invalid character in an Octal constant"),
+        EXCEP_TXT("AE_BAD_DECIMAL_CONSTANT",
+                  "Invalid character in a Decimal constant"),
+        EXCEP_TXT("AE_MISSING_ARGUMENTS",
+                  "Too few arguments were passed to a control method"),
+        EXCEP_TXT("AE_BAD_ADDRESS", "An illegal null I/O address")
 };
 
-char const *acpi_gbl_exception_names_tbl[] = {
-        NULL,
-        "AE_BAD_SIGNATURE",
-        "AE_BAD_HEADER",
-        "AE_BAD_CHECKSUM",
-        "AE_BAD_VALUE",
-        "AE_INVALID_TABLE_LENGTH"
+static const struct acpi_exception_info acpi_gbl_exception_names_tbl[] = {
+        EXCEP_TXT(NULL, NULL),
+        EXCEP_TXT("AE_BAD_SIGNATURE", "An ACPI table has an invalid signature"),
+        EXCEP_TXT("AE_BAD_HEADER", "Invalid field in an ACPI table header"),
+        EXCEP_TXT("AE_BAD_CHECKSUM", "An ACPI table checksum is not correct"),
+        EXCEP_TXT("AE_BAD_VALUE", "An invalid value was found in a table"),
+        EXCEP_TXT("AE_INVALID_TABLE_LENGTH",
+                  "The FADT or FACS has improper length")
 };
 
-char const *acpi_gbl_exception_names_aml[] = {
-        NULL,
-        "AE_AML_BAD_OPCODE",
-        "AE_AML_NO_OPERAND",
-        "AE_AML_OPERAND_TYPE",
-        "AE_AML_OPERAND_VALUE",
-        "AE_AML_UNINITIALIZED_LOCAL",
-        "AE_AML_UNINITIALIZED_ARG",
-        "AE_AML_UNINITIALIZED_ELEMENT",
-        "AE_AML_NUMERIC_OVERFLOW",
-        "AE_AML_REGION_LIMIT",
-        "AE_AML_BUFFER_LIMIT",
-        "AE_AML_PACKAGE_LIMIT",
-        "AE_AML_DIVIDE_BY_ZERO",
-        "AE_AML_BAD_NAME",
-        "AE_AML_NAME_NOT_FOUND",
-        "AE_AML_INTERNAL",
-        "AE_AML_INVALID_SPACE_ID",
-        "AE_AML_STRING_LIMIT",
-        "AE_AML_NO_RETURN_VALUE",
-        "AE_AML_METHOD_LIMIT",
-        "AE_AML_NOT_OWNER",
-        "AE_AML_MUTEX_ORDER",
-        "AE_AML_MUTEX_NOT_ACQUIRED",
-        "AE_AML_INVALID_RESOURCE_TYPE",
-        "AE_AML_INVALID_INDEX",
-        "AE_AML_REGISTER_LIMIT",
-        "AE_AML_NO_WHILE",
-        "AE_AML_ALIGNMENT",
-        "AE_AML_NO_RESOURCE_END_TAG",
-        "AE_AML_BAD_RESOURCE_VALUE",
-        "AE_AML_CIRCULAR_REFERENCE",
-        "AE_AML_BAD_RESOURCE_LENGTH",
-        "AE_AML_ILLEGAL_ADDRESS",
-        "AE_AML_INFINITE_LOOP"
+static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {
+        EXCEP_TXT(NULL, NULL),
+        EXCEP_TXT("AE_AML_BAD_OPCODE", "Invalid AML opcode encountered"),
+        EXCEP_TXT("AE_AML_NO_OPERAND", "A required operand is missing"),
+        EXCEP_TXT("AE_AML_OPERAND_TYPE",
+                  "An operand of an incorrect type was encountered"),
+        EXCEP_TXT("AE_AML_OPERAND_VALUE",
+                  "The operand had an inappropriate or invalid value"),
+        EXCEP_TXT("AE_AML_UNINITIALIZED_LOCAL",
+                  "Method tried to use an uninitialized local variable"),
+        EXCEP_TXT("AE_AML_UNINITIALIZED_ARG",
+                  "Method tried to use an uninitialized argument"),
+        EXCEP_TXT("AE_AML_UNINITIALIZED_ELEMENT",
+                  "Method tried to use an empty package element"),
+        EXCEP_TXT("AE_AML_NUMERIC_OVERFLOW",
+                  "Overflow during BCD conversion or other"),
+        EXCEP_TXT("AE_AML_REGION_LIMIT",
+                  "Tried to access beyond the end of an Operation Region"),
+        EXCEP_TXT("AE_AML_BUFFER_LIMIT",
+                  "Tried to access beyond the end of a buffer"),
+        EXCEP_TXT("AE_AML_PACKAGE_LIMIT",
+                  "Tried to access beyond the end of a package"),
+        EXCEP_TXT("AE_AML_DIVIDE_BY_ZERO",
+                  "During execution of AML Divide operator"),
+        EXCEP_TXT("AE_AML_BAD_NAME",
+                  "An ACPI name contains invalid character(s)"),
+        EXCEP_TXT("AE_AML_NAME_NOT_FOUND",
+                  "Could not resolve a named reference"),
+        EXCEP_TXT("AE_AML_INTERNAL", "An internal error within the interprete"),
+        EXCEP_TXT("AE_AML_INVALID_SPACE_ID",
+                  "An Operation Region SpaceID is invalid"),
+        EXCEP_TXT("AE_AML_STRING_LIMIT",
+                  "String is longer than 200 characters"),
+        EXCEP_TXT("AE_AML_NO_RETURN_VALUE",
+                  "A method did not return a required value"),
+        EXCEP_TXT("AE_AML_METHOD_LIMIT",
+                  "A control method reached the maximum reentrancy limit of 255"),
+        EXCEP_TXT("AE_AML_NOT_OWNER",
+                  "A thread tried to release a mutex that it does not own"),
+        EXCEP_TXT("AE_AML_MUTEX_ORDER", "Mutex SyncLevel release mismatch"),
+        EXCEP_TXT("AE_AML_MUTEX_NOT_ACQUIRED",
+                  "Attempt to release a mutex that was not previously acquired"),
+        EXCEP_TXT("AE_AML_INVALID_RESOURCE_TYPE",
+                  "Invalid resource type in resource list"),
+        EXCEP_TXT("AE_AML_INVALID_INDEX",
+                  "Invalid Argx or Localx (x too large)"),
+        EXCEP_TXT("AE_AML_REGISTER_LIMIT",
+                  "Bank value or Index value beyond range of register"),
+        EXCEP_TXT("AE_AML_NO_WHILE", "Break or Continue without a While"),
+        EXCEP_TXT("AE_AML_ALIGNMENT",
+                  "Non-aligned memory transfer on platform that does not support this"),
+        EXCEP_TXT("AE_AML_NO_RESOURCE_END_TAG",
+                  "No End Tag in a resource list"),
+        EXCEP_TXT("AE_AML_BAD_RESOURCE_VALUE",
+                  "Invalid value of a resource element"),
+        EXCEP_TXT("AE_AML_CIRCULAR_REFERENCE",
+                  "Two references refer to each other"),
+        EXCEP_TXT("AE_AML_BAD_RESOURCE_LENGTH",
+                  "The length of a Resource Descriptor in the AML is incorrect"),
+        EXCEP_TXT("AE_AML_ILLEGAL_ADDRESS",
+                  "A memory, I/O, or PCI configuration address is invalid"),
+        EXCEP_TXT("AE_AML_INFINITE_LOOP",
+                  "An apparent infinite AML While loop, method was aborted")
 };
 
-char const *acpi_gbl_exception_names_ctrl[] = {
-        NULL,
-        "AE_CTRL_RETURN_VALUE",
-        "AE_CTRL_PENDING",
-        "AE_CTRL_TERMINATE",
-        "AE_CTRL_TRUE",
-        "AE_CTRL_FALSE",
-        "AE_CTRL_DEPTH",
-        "AE_CTRL_END",
-        "AE_CTRL_TRANSFER",
-        "AE_CTRL_BREAK",
-        "AE_CTRL_CONTINUE",
-        "AE_CTRL_SKIP",
-        "AE_CTRL_PARSE_CONTINUE",
-        "AE_CTRL_PARSE_PENDING"
+static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {
+        EXCEP_TXT(NULL, NULL),
+        EXCEP_TXT("AE_CTRL_RETURN_VALUE", "A Method returned a value"),
+        EXCEP_TXT("AE_CTRL_PENDING", "Method is calling another method"),
+        EXCEP_TXT("AE_CTRL_TERMINATE", "Terminate the executing method"),
+        EXCEP_TXT("AE_CTRL_TRUE", "An If or While predicate result"),
+        EXCEP_TXT("AE_CTRL_FALSE", "An If or While predicate result"),
+        EXCEP_TXT("AE_CTRL_DEPTH", "Maximum search depth has been reached"),
+        EXCEP_TXT("AE_CTRL_END", "An If or While predicate is false"),
+        EXCEP_TXT("AE_CTRL_TRANSFER", "Transfer control to called method"),
+        EXCEP_TXT("AE_CTRL_BREAK", "A Break has been executed"),
+        EXCEP_TXT("AE_CTRL_CONTINUE", "A Continue has been executed"),
+        EXCEP_TXT("AE_CTRL_SKIP", "Not currently used"),
+        EXCEP_TXT("AE_CTRL_PARSE_CONTINUE", "Used to skip over bad opcodes"),
+        EXCEP_TXT("AE_CTRL_PARSE_PENDING", "Used to implement AML While loops")
 };
 
 #endif                          /* EXCEPTION_TABLE */
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 9885276178e0..4f52ea795c7a 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -324,9 +324,9 @@
 
 /* Helper macro */
 
-#define ACPI_TRACE_ENTRY(name, function, cast, param) \
+#define ACPI_TRACE_ENTRY(name, function, type, param) \
         ACPI_FUNCTION_NAME (name) \
-        function (ACPI_DEBUG_PARAMETERS, cast (param))
+        function (ACPI_DEBUG_PARAMETERS, (type) (param))
 
 /* The actual entry trace macros */
 
@@ -335,13 +335,13 @@
         acpi_ut_trace (ACPI_DEBUG_PARAMETERS)
 
 #define ACPI_FUNCTION_TRACE_PTR(name, pointer) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, (void *), pointer)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, void *, pointer)
 
 #define ACPI_FUNCTION_TRACE_U32(name, value) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, (u32), value)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)
 
 #define ACPI_FUNCTION_TRACE_STR(name, string) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, (char *), string)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, char *, string)
 
 #define ACPI_FUNCTION_ENTRY() \
         acpi_ut_track_stack_ptr()
@@ -355,16 +355,37 @@
  *
  * One of the FUNCTION_TRACE macros above must be used in conjunction
  * with these macros so that "_AcpiFunctionName" is defined.
+ *
+ * There are two versions of most of the return macros. The default version is
+ * safer, since it avoids side-effects by guaranteeing that the argument will
+ * not be evaluated twice.
+ *
+ * A less-safe version of the macros is provided for optional use if the
+ * compiler uses excessive CPU stack (for example, this may happen in the
+ * debug case if code optimzation is disabled.)
  */
 
 /* Exit trace helper macro */
 
-#define ACPI_TRACE_EXIT(function, cast, param) \
+#ifndef ACPI_SIMPLE_RETURN_MACROS
+
+#define ACPI_TRACE_EXIT(function, type, param) \
+        ACPI_DO_WHILE0 ({ \
+                register type _param = (type) (param); \
+                function (ACPI_DEBUG_PARAMETERS, _param); \
+                return (_param); \
+        })
+
+#else                           /* Use original less-safe macros */
+
+#define ACPI_TRACE_EXIT(function, type, param) \
         ACPI_DO_WHILE0 ({ \
-                function (ACPI_DEBUG_PARAMETERS, cast (param)); \
-                return ((param)); \
+                function (ACPI_DEBUG_PARAMETERS, (type) (param)); \
+                return (param); \
         })
 
+#endif                          /* ACPI_SIMPLE_RETURN_MACROS */
+
 /* The actual exit macros */
 
 #define return_VOID \
@@ -374,13 +395,19 @@
         })
 
 #define return_ACPI_STATUS(status) \
-        ACPI_TRACE_EXIT (acpi_ut_status_exit, (acpi_status), status)
+        ACPI_TRACE_EXIT (acpi_ut_status_exit, acpi_status, status)
 
 #define return_PTR(pointer) \
-        ACPI_TRACE_EXIT (acpi_ut_ptr_exit, (u8 *), pointer)
+        ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)
 
 #define return_VALUE(value) \
-        ACPI_TRACE_EXIT (acpi_ut_value_exit, (u64), value)
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)
+
+#define return_UINT32(value) \
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u32, value)
+
+#define return_UINT8(value) \
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u8, value)
 
 /* Conditional execution */
 
@@ -428,8 +455,10 @@
 
 #define return_VOID                     return
 #define return_ACPI_STATUS(s)           return(s)
-#define return_VALUE(s)                 return(s)
 #define return_PTR(s)                   return(s)
+#define return_VALUE(s)                 return(s)
+#define return_UINT8(s)                 return(s)
+#define return_UINT32(s)                return(s)
 
 #endif                          /* ACPI_DEBUG_OUTPUT */
 
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 22ba56e834e2..98db31d9f9b4 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -88,11 +88,30 @@ struct acpi_device;
  * -----------------
  */
 
+enum acpi_hotplug_mode {
+        AHM_GENERIC = 0,
+        AHM_CONTAINER,
+        AHM_COUNT
+};
+
+struct acpi_hotplug_profile {
+        struct kobject kobj;
+        bool enabled:1;
+        enum acpi_hotplug_mode mode;
+};
+
+static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(
+                                                struct kobject *kobj)
+{
+        return container_of(kobj, struct acpi_hotplug_profile, kobj);
+}
+
 struct acpi_scan_handler {
         const struct acpi_device_id *ids;
         struct list_head list_node;
         int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);
         void (*detach)(struct acpi_device *dev);
+        struct acpi_hotplug_profile hotplug;
 };
 
 /*
@@ -142,7 +161,6 @@ struct acpi_device_status {
 
 struct acpi_device_flags {
         u32 dynamic_status:1;
-        u32 bus_address:1;
         u32 removable:1;
         u32 ejectable:1;
         u32 suprise_removal_ok:1;
@@ -150,7 +168,7 @@ struct acpi_device_flags {
         u32 performance_manageable:1;
         u32 eject_pending:1;
         u32 match_driver:1;
-        u32 reserved:23;
+        u32 reserved:24;
 };
 
 /* File System */
@@ -173,10 +191,17 @@ struct acpi_hardware_id {
         char *id;
 };
 
+struct acpi_pnp_type {
+        u32 hardware_id:1;
+        u32 bus_address:1;
+        u32 reserved:30;
+};
+
 struct acpi_device_pnp {
-        acpi_bus_id bus_id;     /* Object name */
+        acpi_bus_id bus_id;             /* Object name */
+        struct acpi_pnp_type type;      /* ID type */
         acpi_bus_address bus_address;   /* _ADR */
-        char *unique_id;        /* _UID */
+        char *unique_id;                /* _UID */
         struct list_head ids;           /* _HID and _CIDs */
         acpi_device_name device_name;   /* Driver-determined */
         acpi_device_class device_class; /*        "          */
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 627749af0ba7..e6168a24b9f0 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -95,7 +95,6 @@ int acpi_pci_link_free_irq(acpi_handle handle);
 struct pci_bus;
 
 struct pci_dev *acpi_get_pci_dev(acpi_handle);
-int acpi_pci_bind_root(struct acpi_device *device);
 
 /* Arch-defined function to add a bus to the system */
 
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 03322dddd88e..454881e6450a 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20130117
+#define ACPI_CA_VERSION                 0x20130328
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 77dc7a4099a3..ffaac0e7e0c6 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -72,11 +72,13 @@
 #define ACPI_SIG_IVRS           "IVRS"  /* I/O Virtualization Reporting Structure */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
+#define ACPI_SIG_MTMR           "MTMR"  /* MID Timer table */
 #define ACPI_SIG_SLIC           "SLIC"  /* Software Licensing Description Table */
 #define ACPI_SIG_SPCR           "SPCR"  /* Serial Port Console Redirection table */
 #define ACPI_SIG_SPMI           "SPMI"  /* Server Platform Management Interface table */
 #define ACPI_SIG_TCPA           "TCPA"  /* Trusted Computing Platform Alliance table */
 #define ACPI_SIG_UEFI           "UEFI"  /* Uefi Boot Optimization Table */
+#define ACPI_SIG_VRTC           "VRTC"  /* Virtual Real Time Clock Table */
 #define ACPI_SIG_WAET           "WAET"  /* Windows ACPI Emulated devices Table */
 #define ACPI_SIG_WDAT           "WDAT"  /* Watchdog Action Table */
 #define ACPI_SIG_WDDT           "WDDT"  /* Watchdog Timer Description Table */
@@ -852,6 +854,29 @@ struct acpi_table_mchi {
 
 /*******************************************************************************
  *
+ * MTMR - MID Timer Table
+ *        Version 1
+ *
+ * Conforms to "Simple Firmware Interface Specification",
+ * Draft 0.8.2, Oct 19, 2010
+ * NOTE: The ACPI MTMR is equivalent to the SFI MTMR table.
+ *
+ ******************************************************************************/
+
+struct acpi_table_mtmr {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* MTMR entry */
+
+struct acpi_mtmr_entry {
+        struct acpi_generic_address physical_address;
+        u32 frequency;
+        u32 irq;
+};
+
+/*******************************************************************************
+ *
  * SLIC - Software Licensing Description Table
  *        Version 1
  *
@@ -1025,6 +1050,28 @@ struct acpi_table_uefi {
 
 /*******************************************************************************
  *
+ * VRTC - Virtual Real Time Clock Table
+ *        Version 1
+ *
+ * Conforms to "Simple Firmware Interface Specification",
+ * Draft 0.8.2, Oct 19, 2010
+ * NOTE: The ACPI VRTC is equivalent to The SFI MRTC table.
+ *
+ ******************************************************************************/
+
+struct acpi_table_vrtc {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* VRTC entry */
+
+struct acpi_vrtc_entry {
+        struct acpi_generic_address physical_address;
+        u32 irq;
+};
+
+/*******************************************************************************
+ *
  * WAET - Windows ACPI Emulated devices Table
  *        Version 1
  *
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 332b17e3bec8..e2c0931a3d67 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -174,7 +174,7 @@ struct acpi_fpdt_header {
 
 enum acpi_fpdt_type {
         ACPI_FPDT_TYPE_BOOT = 0,
-        ACPI_FPDT_TYPE_S3PERF = 1,
+        ACPI_FPDT_TYPE_S3PERF = 1
 };
 
 /*
@@ -223,7 +223,7 @@ struct acpi_s3pt_header {
 
 enum acpi_s3pt_type {
         ACPI_S3PT_TYPE_RESUME = 0,
-        ACPI_S3PT_TYPE_SUSPEND = 1,
+        ACPI_S3PT_TYPE_SUSPEND = 1
 };
 
 struct acpi_s3pt_resume {
@@ -505,26 +505,59 @@ struct acpi_rasf_shared_memory {
         u32 signature;
         u16 command;
         u16 status;
-        u64 requested_address;
-        u64 requested_length;
-        u64 actual_address;
-        u64 actual_length;
+        u16 version;
+        u8 capabilities[16];
+        u8 set_capabilities[16];
+        u16 num_parameter_blocks;
+        u32 set_capabilities_status;
+};
+
+/* RASF Parameter Block Structure Header */
+
+struct acpi_rasf_parameter_block {
+        u16 type;
+        u16 version;
+        u16 length;
+};
+
+/* RASF Parameter Block Structure for PATROL_SCRUB */
+
+struct acpi_rasf_patrol_scrub_parameter {
+        struct acpi_rasf_parameter_block header;
+        u16 patrol_scrub_command;
+        u64 requested_address_range[2];
+        u64 actual_address_range[2];
         u16 flags;
-        u8 speed;
+        u8 requested_speed;
 };
 
 /* Masks for Flags and Speed fields above */
 
 #define ACPI_RASF_SCRUBBER_RUNNING      1
 #define ACPI_RASF_SPEED                 (7<<1)
+#define ACPI_RASF_SPEED_SLOW            (0<<1)
+#define ACPI_RASF_SPEED_MEDIUM          (4<<1)
+#define ACPI_RASF_SPEED_FAST            (7<<1)
 
 /* Channel Commands */
 
 enum acpi_rasf_commands {
-        ACPI_RASF_GET_RAS_CAPABILITIES = 1,
-        ACPI_RASF_GET_PATROL_PARAMETERS = 2,
-        ACPI_RASF_START_PATROL_SCRUBBER = 3,
-        ACPI_RASF_STOP_PATROL_SCRUBBER = 4
+        ACPI_RASF_EXECUTE_RASF_COMMAND = 1
+};
+
+/* Platform RAS Capabilities */
+
+enum acpi_rasf_capabiliities {
+        ACPI_HW_PATROL_SCRUB_SUPPORTED = 0,
+        ACPI_SW_PATROL_SCRUB_EXPOSED = 1
+};
+
+/* Patrol Scrub Commands */
+
+enum acpi_rasf_patrol_scrub_commands {
+        ACPI_RASF_GET_PATROL_PARAMETERS = 1,
+        ACPI_RASF_START_PATROL_SCRUBBER = 2,
+        ACPI_RASF_STOP_PATROL_SCRUBBER = 3
 };
 
 /* Channel Command flags */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 845e75f1ffd8..a64adcc29ae5 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -650,13 +650,14 @@ typedef u32 acpi_event_type;
  * The encoding of acpi_event_status is illustrated below.
  * Note that a set bit (1) indicates the property is TRUE
  * (e.g. if bit 0 is set then the event is enabled).
- * +-------------+-+-+-+
- * |   Bits 31:3 |2|1|0|
- * +-------------+-+-+-+
- *          |     | | |
- *          |     | | +- Enabled?
- *          |     | +--- Enabled for wake?
- *          |     +----- Set?
+ * +-------------+-+-+-+-+
+ * |   Bits 31:4 |3|2|1|0|
+ * +-------------+-+-+-+-+
+ *          |     | | | |
+ *          |     | | | +- Enabled?
+ *          |     | | +--- Enabled for wake?
+ *          |     | +----- Set?
+ *          |     +------- Has a handler?
  *          +----------- <Reserved>
  */
 typedef u32 acpi_event_status;
@@ -1128,7 +1129,6 @@ struct acpi_memory_list {
         u16 object_size;
         u16 max_depth;
         u16 current_depth;
-        u16 link_offset;
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 03053aca5b32..17b5b5967641 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -195,7 +195,7 @@ extern bool wmi_has_guid(const char *guid);
 #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
 
 extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);
-extern long acpi_is_video_device(struct acpi_device *device);
+extern long acpi_is_video_device(acpi_handle handle);
 extern void acpi_video_dmi_promote_vendor(void);
 extern void acpi_video_dmi_demote_vendor(void);
 extern int acpi_video_backlight_support(void);
@@ -208,7 +208,7 @@ static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle)
         return 0;
 }
 
-static inline long acpi_is_video_device(struct acpi_device *device)
+static inline long acpi_is_video_device(acpi_handle handle)
 {
         return 0;
 }
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 464e229e7d84..963d71431388 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -8,6 +8,20 @@
 #ifndef _LINUX_CLOCKCHIPS_H
 #define _LINUX_CLOCKCHIPS_H
 
+/* Clock event notification values */
+enum clock_event_nofitiers {
+        CLOCK_EVT_NOTIFY_ADD,
+        CLOCK_EVT_NOTIFY_BROADCAST_ON,
+        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
+        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
+        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
+        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
+        CLOCK_EVT_NOTIFY_SUSPEND,
+        CLOCK_EVT_NOTIFY_RESUME,
+        CLOCK_EVT_NOTIFY_CPU_DYING,
+        CLOCK_EVT_NOTIFY_CPU_DEAD,
+};
+
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
 
 #include <linux/clocksource.h>
@@ -26,20 +40,6 @@ enum clock_event_mode {
         CLOCK_EVT_MODE_RESUME,
 };
 
-/* Clock event notification values */
-enum clock_event_nofitiers {
-        CLOCK_EVT_NOTIFY_ADD,
-        CLOCK_EVT_NOTIFY_BROADCAST_ON,
-        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
-        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
-        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
-        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
-        CLOCK_EVT_NOTIFY_SUSPEND,
-        CLOCK_EVT_NOTIFY_RESUME,
-        CLOCK_EVT_NOTIFY_CPU_DYING,
-        CLOCK_EVT_NOTIFY_CPU_DEAD,
-};
-
 /*
  * Clock event features
  */
@@ -184,7 +184,7 @@ static inline int tick_check_broadcast_expired(void) { return 0; }
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
 #else
-# define clockevents_notify(reason, arg) do { } while (0)
+static inline void clockevents_notify(unsigned long reason, void *arg) {}
 #endif
 
 #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
@@ -192,7 +192,7 @@ extern void clockevents_notify(unsigned long reason, void *arg);
 static inline void clockevents_suspend(void) {}
 static inline void clockevents_resume(void) {}
 
-#define clockevents_notify(reason, arg) do { } while (0)
+static inline void clockevents_notify(unsigned long reason, void *arg) {}
 static inline int tick_check_broadcast_expired(void) { return 0; }
 
 #endif
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index a22944ca0526..037d36ae63e5 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -106,6 +106,7 @@ struct cpufreq_policy {
                                          * governors are used */
         unsigned int            policy; /* see above */
         struct cpufreq_governor *governor; /* see below */
+        void                    *governor_data;
 
         struct work_struct      update; /* if update_policy() needs to be
                                          * called, but you're in IRQ context */
@@ -178,9 +179,11 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mu
  *                          CPUFREQ GOVERNORS                        *
  *********************************************************************/
 
-#define CPUFREQ_GOV_START  1
-#define CPUFREQ_GOV_STOP   2
-#define CPUFREQ_GOV_LIMITS 3
+#define CPUFREQ_GOV_START       1
+#define CPUFREQ_GOV_STOP        2
+#define CPUFREQ_GOV_LIMITS      3
+#define CPUFREQ_GOV_POLICY_INIT 4
+#define CPUFREQ_GOV_POLICY_EXIT 5
 
 struct cpufreq_governor {
         char    name[CPUFREQ_NAME_LEN];
@@ -229,6 +232,13 @@ struct cpufreq_driver {
         struct module           *owner;
         char                    name[CPUFREQ_NAME_LEN];
         u8                      flags;
+        /*
+         * This should be set by platforms having multiple clock-domains, i.e.
+         * supporting multiple policies. With this sysfs directories of governor
+         * would be created in cpu/cpu<num>/cpufreq/ directory and so they can
+         * use the same governor with different tunables for different clusters.
+         */
+        bool                    have_governor_per_policy;
 
         /* needed by all drivers */
         int     (*init)         (struct cpufreq_policy *policy);
@@ -268,8 +278,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data);
 int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
 
 
-void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state);
-
+void cpufreq_notify_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, unsigned int state);
 
 static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, unsigned int min, unsigned int max)
 {
@@ -329,6 +339,7 @@ const char *cpufreq_get_current_driver(void);
  *********************************************************************/
 int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
 int cpufreq_update_policy(unsigned int cpu);
+bool have_governor_per_policy(void);
 
 #ifdef CONFIG_CPU_FREQ
 /* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 480c14dc1ddd..3c86faa59798 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -57,6 +57,7 @@ struct cpuidle_state {
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
 #define CPUIDLE_FLAG_COUPLED    (0x02) /* state applies to multiple cpus */
+#define CPUIDLE_FLAG_TIMER_STOP (0x04)  /* timer is stopped on this state */
 
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
 
@@ -104,8 +105,8 @@ struct cpuidle_driver {
         struct module           *owner;
         int                     refcnt;
 
-        /* set to 1 to use the core cpuidle time keeping (for all states). */
-        unsigned int            en_core_tk_irqen:1;
+        /* used by the cpuidle framework to setup the broadcast timer */
+        unsigned int            bctimer:1;
         /* states array must be ordered in decreasing power consumption */
         struct cpuidle_state    states[CPUIDLE_STATE_MAX];
         int                     state_count;
@@ -122,17 +123,15 @@ extern void cpuidle_driver_unref(void);
 extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);
 extern int cpuidle_register_device(struct cpuidle_device *dev);
 extern void cpuidle_unregister_device(struct cpuidle_device *dev);
-
+extern int cpuidle_register(struct cpuidle_driver *drv,
+                            const struct cpumask *const coupled_cpus);
+extern void cpuidle_unregister(struct cpuidle_driver *drv);
 extern void cpuidle_pause_and_lock(void);
 extern void cpuidle_resume_and_unlock(void);
 extern void cpuidle_pause(void);
 extern void cpuidle_resume(void);
 extern int cpuidle_enable_device(struct cpuidle_device *dev);
 extern void cpuidle_disable_device(struct cpuidle_device *dev);
-extern int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index));
 extern int cpuidle_play_dead(void);
 
 extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
@@ -151,7 +150,10 @@ static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { }
 static inline int cpuidle_register_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_unregister_device(struct cpuidle_device *dev) { }
-
+static inline int cpuidle_register(struct cpuidle_driver *drv,
+                                   const struct cpumask *const coupled_cpus)
+{return -ENODEV; }
+static inline void cpuidle_unregister(struct cpuidle_driver *drv) { }
 static inline void cpuidle_pause_and_lock(void) { }
 static inline void cpuidle_resume_and_unlock(void) { }
 static inline void cpuidle_pause(void) { }
@@ -159,11 +161,6 @@ static inline void cpuidle_resume(void) { }
 static inline int cpuidle_enable_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
-static inline int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index))
-{ return -ENODEV; }
 static inline int cpuidle_play_dead(void) {return -ENODEV; }
 #endif
 
diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h
new file mode 100644
index 000000000000..528e73ce46d2
--- /dev/null
+++ b/include/linux/platform_data/clk-lpss.h
@@ -0,0 +1,18 @@
+/*
+ * Intel Low Power Subsystem clocks.
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __CLK_LPSS_H
+#define __CLK_LPSS_H
+
+extern int lpt_clk_init(void);
+
+#endif /* __CLK_LPSS_H */
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index d4feda084a3a..bef86d121eb2 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -76,8 +76,20 @@ EXPORT_SYMBOL_GPL(suspend_set_ops);
 
 bool valid_state(suspend_state_t state)
 {
-        if (state == PM_SUSPEND_FREEZE)
-                return true;
+        if (state == PM_SUSPEND_FREEZE) {
+#ifdef CONFIG_PM_DEBUG
+                if (pm_test_level != TEST_NONE &&
+                    pm_test_level != TEST_FREEZER &&
+                    pm_test_level != TEST_DEVICES &&
+                    pm_test_level != TEST_PLATFORM) {
+                        printk(KERN_WARNING "Unsupported pm_test mode for "
+                                        "freeze state, please choose "
+                                        "none/freezer/devices/platform.\n");
+                        return false;
+                }
+#endif
+                        return true;
+        }
         /*
          * PM_SUSPEND_STANDBY and PM_SUSPEND_MEMORY states need lowlevel
          * support and need to be valid to the lowlevel
@@ -184,6 +196,9 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
                         goto Platform_wake;
         }
 
+        if (suspend_test(TEST_PLATFORM))
+                goto Platform_wake;
+
         /*
          * PM_SUSPEND_FREEZE equals
          * frozen processes + suspended devices + idle processors.
@@ -195,9 +210,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
                 goto Platform_wake;
         }
 
-        if (suspend_test(TEST_PLATFORM))
-                goto Platform_wake;
-
         error = disable_nonboot_cpus();
         if (error || suspend_test(TEST_CPUS))
                 goto Enable_cpus;