diff options
Diffstat (limited to 'include/linux/suspend.h')
-rw-r--r-- | include/linux/suspend.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 618f93c32b7f..d16c1b85d512 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -55,7 +55,7 @@ struct hibernation_ops { | |||
55 | }; | 55 | }; |
56 | 56 | ||
57 | #ifdef CONFIG_PM | 57 | #ifdef CONFIG_PM |
58 | #ifdef CONFIG_SOFTWARE_SUSPEND | 58 | #ifdef CONFIG_HIBERNATION |
59 | /* kernel/power/snapshot.c */ | 59 | /* kernel/power/snapshot.c */ |
60 | extern void __register_nosave_region(unsigned long b, unsigned long e, int km); | 60 | extern void __register_nosave_region(unsigned long b, unsigned long e, int km); |
61 | static inline void register_nosave_region(unsigned long b, unsigned long e) | 61 | static inline void register_nosave_region(unsigned long b, unsigned long e) |
@@ -73,14 +73,14 @@ extern unsigned long get_safe_page(gfp_t gfp_mask); | |||
73 | 73 | ||
74 | extern void hibernation_set_ops(struct hibernation_ops *ops); | 74 | extern void hibernation_set_ops(struct hibernation_ops *ops); |
75 | extern int hibernate(void); | 75 | extern int hibernate(void); |
76 | #else /* CONFIG_SOFTWARE_SUSPEND */ | 76 | #else /* CONFIG_HIBERNATION */ |
77 | static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } | 77 | static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } |
78 | static inline void swsusp_set_page_free(struct page *p) {} | 78 | static inline void swsusp_set_page_free(struct page *p) {} |
79 | static inline void swsusp_unset_page_free(struct page *p) {} | 79 | static inline void swsusp_unset_page_free(struct page *p) {} |
80 | 80 | ||
81 | static inline void hibernation_set_ops(struct hibernation_ops *ops) {} | 81 | static inline void hibernation_set_ops(struct hibernation_ops *ops) {} |
82 | static inline int hibernate(void) { return -ENOSYS; } | 82 | static inline int hibernate(void) { return -ENOSYS; } |
83 | #endif /* CONFIG_SOFTWARE_SUSPEND */ | 83 | #endif /* CONFIG_HIBERNATION */ |
84 | 84 | ||
85 | void save_processor_state(void); | 85 | void save_processor_state(void); |
86 | void restore_processor_state(void); | 86 | void restore_processor_state(void); |
@@ -121,7 +121,7 @@ static inline int unregister_pm_notifier(struct notifier_block *nb) | |||
121 | #define pm_notifier(fn, pri) do { (void)(fn); } while (0) | 121 | #define pm_notifier(fn, pri) do { (void)(fn); } while (0) |
122 | #endif /* CONFIG_PM */ | 122 | #endif /* CONFIG_PM */ |
123 | 123 | ||
124 | #if !defined CONFIG_SOFTWARE_SUSPEND || !defined(CONFIG_PM) | 124 | #if !defined CONFIG_HIBERNATION || !defined(CONFIG_PM) |
125 | static inline void register_nosave_region(unsigned long b, unsigned long e) | 125 | static inline void register_nosave_region(unsigned long b, unsigned long e) |
126 | { | 126 | { |
127 | } | 127 | } |