summaryrefslogtreecommitdiff
path: root/kernel/power/power.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 14:44:30 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 14:44:30 +1000
commitb93534050b8b048c3f1f0cf1fa84aa733acc207d (patch)
tree829628ec0f1a3143a97a06b28dac280affb2d50d /kernel/power/power.h
parent69146ae8774832d62c0b633a9a42b1711c410f7a (diff)
parentdcc4aba7b6df76136f526e1b4d2c15e1fb611941 (diff)
Merge remote branch 'suspend/linux-next'
Diffstat (limited to 'kernel/power/power.h')
-rw-r--r--kernel/power/power.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 006270fe382d..9753ed1fd804 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -233,3 +233,17 @@ static inline void suspend_thaw_processes(void)
{
}
#endif
+
+#ifdef CONFIG_OPPORTUNISTIC_SUSPEND
+/* kernel/power/opportunistic_suspend.c */
+extern int opportunistic_suspend_state(suspend_state_t state);
+extern bool opportunistic_suspend_valid_state(suspend_state_t state);
+extern void __init opportunistic_suspend_init(void);
+#else
+static inline void opportunistic_suspend_init(void) {}
+#endif
+#ifdef CONFIG_SUSPEND_BLOCKER_STATS
+void about_to_enter_suspend(void);
+#else
+static inline void about_to_enter_suspend(void) {}
+#endif