diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 14:46:13 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 14:46:13 -0400 |
| commit | e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50 (patch) | |
| tree | 35d66a4fc97aa642c14483966f050b5663ff02ca /include/linux/suspend.h | |
| parent | 905563ff47db35dcb3f69e69d434207270ad1966 (diff) | |
| parent | 27f3d18630cd7fbb03b62bd78a74303cb8c88069 (diff) | |
Merge branch 'pm-genirq' into acpi-pm
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) {} |
