diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 12:41:11 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 12:41:11 (GMT) |
| commit | 639bb92a1ff1aab2c455acd183f973c022275798 (patch) | |
| tree | 51355fc8ce70f9cbb39f521d2aaa6f31da2944e0 /include | |
| parent | cf8116c491e98b47a535348a50c94cc01770d9a3 (diff) | |
| parent | 24f2e0273f80ec262a772059e140a0adef35296d (diff) | |
| download | linux-639bb92a1ff1aab2c455acd183f973c022275798.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
x86, kaslr: boot-time selectable with hibernation
PM / hibernate: introduce "nohibernate" boot parameter
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/suspend.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index f76994b..519064e 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -327,6 +327,7 @@ extern unsigned long get_safe_page(gfp_t gfp_mask); extern void hibernation_set_ops(const struct platform_hibernation_ops *ops); extern int hibernate(void); extern bool system_entering_hibernation(void); +extern bool hibernation_available(void); asmlinkage int swsusp_save(void); extern struct pbe *restore_pblist; #else /* CONFIG_HIBERNATION */ @@ -339,6 +340,7 @@ static inline void swsusp_unset_page_free(struct page *p) {} static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {} static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } +static inline bool hibernation_available(void) { return false; } #endif /* CONFIG_HIBERNATION */ /* Hibernation and suspend events */ |