diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-01 07:47:49 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-01 07:47:49 -0400 |
commit | 068765ba7987e73d4381edfe47b70aa121c7155c (patch) | |
tree | 021926eb2535caa0ee30d8bf031b74493aa51b84 /include/linux/suspend.h | |
parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) |
PM / sleep: Mechanism for aborting system suspends unconditionally
It sometimes may be necessary to abort a system suspend in
progress or wake up the system from suspend-to-idle even if the
pm_wakeup_event()/pm_stay_awake() mechanism is not enabled.
For this purpose, introduce a new global variable pm_abort_suspend
and make pm_wakeup_pending() check its value. Also add routines
for manipulating that variable.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/suspend.h')
-rw-r--r-- | include/linux/suspend.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 519064e0c943..06a9910827c2 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -371,6 +371,8 @@ extern int unregister_pm_notifier(struct notifier_block *nb); | |||
371 | extern bool events_check_enabled; | 371 | extern bool events_check_enabled; |
372 | 372 | ||
373 | extern bool pm_wakeup_pending(void); | 373 | extern bool pm_wakeup_pending(void); |
374 | extern void pm_system_wakeup(void); | ||
375 | extern void pm_wakeup_clear(void); | ||
374 | extern bool pm_get_wakeup_count(unsigned int *count, bool block); | 376 | extern bool pm_get_wakeup_count(unsigned int *count, bool block); |
375 | extern bool pm_save_wakeup_count(unsigned int count); | 377 | extern bool pm_save_wakeup_count(unsigned int count); |
376 | extern void pm_wakep_autosleep_enabled(bool set); | 378 | extern void pm_wakep_autosleep_enabled(bool set); |
@@ -418,6 +420,8 @@ static inline int unregister_pm_notifier(struct notifier_block *nb) | |||
418 | #define pm_notifier(fn, pri) do { (void)(fn); } while (0) | 420 | #define pm_notifier(fn, pri) do { (void)(fn); } while (0) |
419 | 421 | ||
420 | static inline bool pm_wakeup_pending(void) { return false; } | 422 | static inline bool pm_wakeup_pending(void) { return false; } |
423 | static inline void pm_system_wakeup(void) {} | ||
424 | static inline void pm_wakeup_clear(void) {} | ||
421 | 425 | ||
422 | static inline void lock_system_sleep(void) {} | 426 | static inline void lock_system_sleep(void) {} |
423 | static inline void unlock_system_sleep(void) {} | 427 | static inline void unlock_system_sleep(void) {} |