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

4 files changed, 32 insertions, 24 deletions

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index e49c36d38d7e..bb145e4b935e 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
 {
 }
 static inline int register_hotplug_dock_device(acpi_handle handle,
-                                               struct acpi_dock_ops *ops,
+                                               const struct acpi_dock_ops *ops,
                                                void *context)
 {
         return -ENODEV;
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index b67231bef632..ed73f6705c86 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -470,7 +470,6 @@ typedef u64 acpi_integer;
  */
 #define ACPI_FULL_INITIALIZATION        0x00
 #define ACPI_NO_ADDRESS_SPACE_INIT      0x01
-#define ACPI_NO_HARDWARE_INIT           0x02
 #define ACPI_NO_EVENT_INIT              0x04
 #define ACPI_NO_HANDLER_INIT            0x08
 #define ACPI_NO_ACPI_ENABLE             0x10
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 67055f180330..610f6fb1bbc2 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -329,6 +329,7 @@ extern void acpi_processor_throttling_init(void);
 int acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device);
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
+int acpi_processor_hotplug(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device);
 int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 583baf22cad2..7408af843b8a 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -23,57 +23,62 @@
 struct module;
 
 struct cpuidle_device;
+struct cpuidle_driver;
 
 
 /****************************
  * CPUIDLE DEVICE INTERFACE *
  ****************************/
 
+struct cpuidle_state_usage {
+        void            *driver_data;
+
+        unsigned long long      usage;
+        unsigned long long      time; /* in US */
+};
+
 struct cpuidle_state {
         char            name[CPUIDLE_NAME_LEN];
         char            desc[CPUIDLE_DESC_LEN];
-        void            *driver_data;
 
         unsigned int    flags;
         unsigned int    exit_latency; /* in US */
         unsigned int    power_usage; /* in mW */
         unsigned int    target_residency; /* in US */
 
-        unsigned long long      usage;
-        unsigned long long      time; /* in US */
-
         int (*enter)    (struct cpuidle_device *dev,
-                         struct cpuidle_state *state);
+                        struct cpuidle_driver *drv,
+                        int index);
 };
 
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
-#define CPUIDLE_FLAG_IGNORE     (0x100) /* ignore during this idle period */
 
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
 
 /**
  * cpuidle_get_statedata - retrieves private driver state data
- * @state: the state
+ * @st_usage: the state usage statistics
  */
-static inline void * cpuidle_get_statedata(struct cpuidle_state *state)
+static inline void *cpuidle_get_statedata(struct cpuidle_state_usage *st_usage)
 {
-        return state->driver_data;
+        return st_usage->driver_data;
 }
 
 /**
  * cpuidle_set_statedata - stores private driver state data
- * @state: the state
+ * @st_usage: the state usage statistics
  * @data: the private data
  */
 static inline void
-cpuidle_set_statedata(struct cpuidle_state *state, void *data)
+cpuidle_set_statedata(struct cpuidle_state_usage *st_usage, void *data)
 {
-        state->driver_data = data;
+        st_usage->driver_data = data;
 }
 
 struct cpuidle_state_kobj {
         struct cpuidle_state *state;
+        struct cpuidle_state_usage *state_usage;
         struct completion kobj_unregister;
         struct kobject kobj;
 };
@@ -81,22 +86,17 @@ struct cpuidle_state_kobj {
 struct cpuidle_device {
         unsigned int            registered:1;
         unsigned int            enabled:1;
-        unsigned int            power_specified:1;
         unsigned int            cpu;
 
         int                     last_residency;
         int                     state_count;
-        struct cpuidle_state    states[CPUIDLE_STATE_MAX];
+        struct cpuidle_state_usage      states_usage[CPUIDLE_STATE_MAX];
         struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX];
-        struct cpuidle_state    *last_state;
 
         struct list_head        device_list;
         struct kobject          kobj;
         struct completion       kobj_unregister;
         void                    *governor_data;
-        struct cpuidle_state    *safe_state;
-
-        int (*prepare)          (struct cpuidle_device *dev);
 };
 
 DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
@@ -120,6 +120,11 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev)
 struct cpuidle_driver {
         char                    name[CPUIDLE_NAME_LEN];
         struct module           *owner;
+
+        unsigned int            power_specified:1;
+        struct cpuidle_state    states[CPUIDLE_STATE_MAX];
+        int                     state_count;
+        int                     safe_state_index;
 };
 
 #ifdef CONFIG_CPU_IDLE
@@ -166,11 +171,14 @@ struct cpuidle_governor {
         struct list_head        governor_list;
         unsigned int            rating;
 
-        int  (*enable)          (struct cpuidle_device *dev);
-        void (*disable)         (struct cpuidle_device *dev);
+        int  (*enable)          (struct cpuidle_driver *drv,
+                                        struct cpuidle_device *dev);
+        void (*disable)         (struct cpuidle_driver *drv,
+                                        struct cpuidle_device *dev);
 
-        int  (*select)          (struct cpuidle_device *dev);
-        void (*reflect)         (struct cpuidle_device *dev);
+        int  (*select)          (struct cpuidle_driver *drv,
+                                        struct cpuidle_device *dev);
+        void (*reflect)         (struct cpuidle_device *dev, int index);
 
         struct module           *owner;
 };