2 files changed, 25 insertions, 4 deletions

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 6e253b5b0f3b..f6d7c508917c 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -34,6 +34,7 @@
 
 #define ACPI_CSTATE_SYSTEMIO    (0)
 #define ACPI_CSTATE_FFH         (1)
+#define ACPI_CSTATE_HALT        (2)
 
 /* Power Management */
 
@@ -64,7 +65,7 @@ struct acpi_processor_cx {
         u8 valid;
         u8 type;
         u32 address;
-        u8 space_id;
+        u8 entry_method;
         u8 index;
         u32 latency;
         u32 latency_ticks;
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index b0fd85ab9efb..c8eb8c71809e 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -46,9 +46,10 @@ struct cpuidle_state {
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
 #define CPUIDLE_FLAG_CHECK_BM   (0x02) /* BM activity will exit state */
-#define CPUIDLE_FLAG_SHALLOW    (0x10) /* low latency, minimal savings */
-#define CPUIDLE_FLAG_BALANCED   (0x20) /* medium latency, moderate savings */
-#define CPUIDLE_FLAG_DEEP       (0x40) /* high latency, large savings */
+#define CPUIDLE_FLAG_POLL       (0x10) /* no latency, no savings */
+#define CPUIDLE_FLAG_SHALLOW    (0x20) /* low latency, minimal savings */
+#define CPUIDLE_FLAG_BALANCED   (0x40) /* medium latency, moderate savings */
+#define CPUIDLE_FLAG_DEEP       (0x80) /* high latency, large savings */
 
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
 
@@ -72,6 +73,19 @@ cpuidle_set_statedata(struct cpuidle_state *state, void *data)
         state->driver_data = data;
 }
 
+#ifdef CONFIG_SMP
+#ifdef CONFIG_ARCH_HAS_CPU_IDLE_WAIT
+static inline void cpuidle_kick_cpus(void)
+{
+        cpu_idle_wait();
+}
+#else /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
+#error "Arch needs cpu_idle_wait() equivalent here"
+#endif /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
+#else /* !CONFIG_SMP */
+static inline void cpuidle_kick_cpus(void) {}
+#endif /* !CONFIG_SMP */
+
 struct cpuidle_state_kobj {
         struct cpuidle_state *state;
         struct completion kobj_unregister;
@@ -178,4 +192,10 @@ static inline void cpuidle_unregister_governor(struct cpuidle_governor *gov) { }
 
 #endif
 
+#ifdef CONFIG_ARCH_HAS_CPU_RELAX
+#define CPUIDLE_DRIVER_STATE_START      1
+#else
+#define CPUIDLE_DRIVER_STATE_START      0
+#endif
+
 #endif /* _LINUX_CPUIDLE_H */