.. | .. |
---|
32 | 32 | return arch_hibernation_header_save(info, MAX_ARCH_HEADER_SIZE); |
---|
33 | 33 | } |
---|
34 | 34 | |
---|
35 | | -static inline char *check_image_kernel(struct swsusp_info *info) |
---|
| 35 | +static inline const char *check_image_kernel(struct swsusp_info *info) |
---|
36 | 36 | { |
---|
37 | 37 | return arch_hibernation_header_restore(info) ? |
---|
38 | 38 | "architecture specific data" : NULL; |
---|
.. | .. |
---|
75 | 75 | static inline void hibernate_image_size_init(void) {} |
---|
76 | 76 | #endif /* !CONFIG_HIBERNATION */ |
---|
77 | 77 | |
---|
78 | | -extern int pfn_is_nosave(unsigned long); |
---|
79 | | - |
---|
80 | 78 | #define power_attr(_name) \ |
---|
81 | 79 | static struct kobj_attribute _name##_attr = { \ |
---|
82 | 80 | .attr = { \ |
---|
.. | .. |
---|
108 | 106 | extern void free_basic_memory_bitmaps(void); |
---|
109 | 107 | extern int hibernate_preallocate_memory(void); |
---|
110 | 108 | |
---|
111 | | -extern void clear_free_pages(void); |
---|
| 109 | +extern void clear_or_poison_free_pages(void); |
---|
112 | 110 | |
---|
113 | 111 | /** |
---|
114 | 112 | * Auxiliary structure used for reading the snapshot image data and |
---|
.. | .. |
---|
156 | 154 | extern void snapshot_write_finalize(struct snapshot_handle *handle); |
---|
157 | 155 | extern int snapshot_image_loaded(struct snapshot_handle *handle); |
---|
158 | 156 | |
---|
159 | | -/* If unset, the snapshot device cannot be open. */ |
---|
160 | | -extern atomic_t snapshot_device_available; |
---|
| 157 | +extern bool hibernate_acquire(void); |
---|
| 158 | +extern void hibernate_release(void); |
---|
161 | 159 | |
---|
162 | 160 | extern sector_t alloc_swapdev_block(int swap); |
---|
163 | 161 | extern void free_all_swap_pages(int swap); |
---|
.. | .. |
---|
181 | 179 | extern int swsusp_unmark(void); |
---|
182 | 180 | #endif |
---|
183 | 181 | |
---|
184 | | -struct timeval; |
---|
| 182 | +struct __kernel_old_timeval; |
---|
185 | 183 | /* kernel/power/swsusp.c */ |
---|
186 | 184 | extern void swsusp_show_speed(ktime_t, ktime_t, unsigned int, char *); |
---|
187 | 185 | |
---|
.. | .. |
---|
212 | 210 | |
---|
213 | 211 | #ifdef CONFIG_PM_SLEEP |
---|
214 | 212 | /* kernel/power/main.c */ |
---|
215 | | -extern int __pm_notifier_call_chain(unsigned long val, int nr_to_call, |
---|
216 | | - int *nr_calls); |
---|
| 213 | +extern int pm_notifier_call_chain_robust(unsigned long val_up, unsigned long val_down); |
---|
217 | 214 | extern int pm_notifier_call_chain(unsigned long val); |
---|
218 | 215 | #endif |
---|
219 | 216 | |
---|