diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/main.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 46386b9f8dd1..2a19f347bd8a 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -188,9 +188,6 @@ static void suspend_test_finish(const char *label) | |||
188 | 188 | ||
189 | #endif | 189 | #endif |
190 | 190 | ||
191 | /* This is just an arbitrary number */ | ||
192 | #define FREE_PAGE_NUMBER (100) | ||
193 | |||
194 | static struct platform_suspend_ops *suspend_ops; | 191 | static struct platform_suspend_ops *suspend_ops; |
195 | 192 | ||
196 | /** | 193 | /** |
@@ -226,7 +223,6 @@ int suspend_valid_only_mem(suspend_state_t state) | |||
226 | static int suspend_prepare(void) | 223 | static int suspend_prepare(void) |
227 | { | 224 | { |
228 | int error; | 225 | int error; |
229 | unsigned int free_pages; | ||
230 | 226 | ||
231 | if (!suspend_ops || !suspend_ops->enter) | 227 | if (!suspend_ops || !suspend_ops->enter) |
232 | return -EPERM; | 228 | return -EPERM; |
@@ -241,24 +237,10 @@ static int suspend_prepare(void) | |||
241 | if (error) | 237 | if (error) |
242 | goto Finish; | 238 | goto Finish; |
243 | 239 | ||
244 | if (suspend_freeze_processes()) { | 240 | error = suspend_freeze_processes(); |
245 | error = -EAGAIN; | ||
246 | goto Thaw; | ||
247 | } | ||
248 | |||
249 | free_pages = global_page_state(NR_FREE_PAGES); | ||
250 | if (free_pages < FREE_PAGE_NUMBER) { | ||
251 | pr_debug("PM: free some memory\n"); | ||
252 | shrink_all_memory(FREE_PAGE_NUMBER - free_pages); | ||
253 | if (nr_free_pages() < FREE_PAGE_NUMBER) { | ||
254 | error = -ENOMEM; | ||
255 | printk(KERN_ERR "PM: No enough memory\n"); | ||
256 | } | ||
257 | } | ||
258 | if (!error) | 241 | if (!error) |
259 | return 0; | 242 | return 0; |
260 | 243 | ||
261 | Thaw: | ||
262 | suspend_thaw_processes(); | 244 | suspend_thaw_processes(); |
263 | usermodehelper_enable(); | 245 | usermodehelper_enable(); |
264 | Finish: | 246 | Finish: |