PM / sleep: System sleep state selection interface rework

[sfrench/cifs-2.6.git] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 56d1d0dedf76c60fb225163bebcaa47f21d62e6b..1dfa0da827d3c4e77cc6a2e49c25d170c8ce3fb8 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -189,11 +189,15 @@ extern void swsusp_show_speed(ktime_t, ktime_t, unsigned int, char *);
 
 #ifdef CONFIG_SUSPEND
 /* kernel/power/suspend.c */
-extern const char *pm_labels[];
+extern const char * const pm_labels[];
 extern const char *pm_states[];
+extern const char *mem_sleep_states[];
+extern suspend_state_t mem_sleep_current;
 
 extern int suspend_devices_and_enter(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
+#define mem_sleep_current      PM_SUSPEND_ON
+
 static inline int suspend_devices_and_enter(suspend_state_t state)
 {
        return -ENOSYS;