Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  cpuidle: Single/Global registration of idle states
  cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
  cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
  cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
  ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
  ACPI: Export FADT pm_profile integer value to userspace
  thermal: Prevent polling from happening during system suspend
  ACPI: Drop ACPI_NO_HARDWARE_INIT
  ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
  PNPACPI: Simplify disabled resource registration
  ACPI: Fix possible recursive locking in hwregs.c
  ACPI: use kstrdup()
  mrst pmu: update comment
  tools/power turbostat: less verbose debugging

1 files changed, 24 insertions, 18 deletions

diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c
index 864e569f684e..7088180b018b 100644
--- a/arch/arm/mach-kirkwood/cpuidle.c
+++ b/arch/arm/mach-kirkwood/cpuidle.c
@@ -33,17 +33,18 @@ static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
 
 /* Actual code that puts the SoC in different idle states */
 static int kirkwood_enter_idle(struct cpuidle_device *dev,
-                               struct cpuidle_state *state)
+                                struct cpuidle_driver *drv,
+                               int index)
 {
         struct timeval before, after;
         int idle_time;
 
         local_irq_disable();
         do_gettimeofday(&before);
-        if (state == &dev->states[0])
+        if (index == 0)
                 /* Wait for interrupt state */
                 cpu_do_idle();
-        else if (state == &dev->states[1]) {
+        else if (index == 1) {
                 /*
                  * Following write will put DDR in self refresh.
                  * Note that we have 256 cycles before DDR puts it
@@ -58,35 +59,40 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
         local_irq_enable();
         idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
                         (after.tv_usec - before.tv_usec);
-        return idle_time;
+
+        /* Update last residency */
+        dev->last_residency = idle_time;
+
+        return index;
 }
 
 /* Initialize CPU idle by registering the idle states */
 static int kirkwood_init_cpuidle(void)
 {
         struct cpuidle_device *device;
-
-        cpuidle_register_driver(&kirkwood_idle_driver);
+        struct cpuidle_driver *driver = &kirkwood_idle_driver;
 
         device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
         device->state_count = KIRKWOOD_MAX_STATES;
+        driver->state_count = KIRKWOOD_MAX_STATES;
 
         /* Wait for interrupt state */
-        device->states[0].enter = kirkwood_enter_idle;
-        device->states[0].exit_latency = 1;
-        device->states[0].target_residency = 10000;
-        device->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[0].name, "WFI");
-        strcpy(device->states[0].desc, "Wait for interrupt");
+        driver->states[0].enter = kirkwood_enter_idle;
+        driver->states[0].exit_latency = 1;
+        driver->states[0].target_residency = 10000;
+        driver->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[0].name, "WFI");
+        strcpy(driver->states[0].desc, "Wait for interrupt");
 
         /* Wait for interrupt and DDR self refresh state */
-        device->states[1].enter = kirkwood_enter_idle;
-        device->states[1].exit_latency = 10;
-        device->states[1].target_residency = 10000;
-        device->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[1].name, "DDR SR");
-        strcpy(device->states[1].desc, "WFI and DDR Self Refresh");
+        driver->states[1].enter = kirkwood_enter_idle;
+        driver->states[1].exit_latency = 10;
+        driver->states[1].target_residency = 10000;
+        driver->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[1].name, "DDR SR");
+        strcpy(driver->states[1].desc, "WFI and DDR Self Refresh");
 
+        cpuidle_register_driver(&kirkwood_idle_driver);
         if (cpuidle_register_device(device)) {
                 printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n");
                 return -EIO;