diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-05-06 17:50:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:59 -0400 |
commit | 56f99bcb52d64d70078b41cc176dd8b6f5763108 (patch) | |
tree | 4383e31e46975ae1c1f6c7833bed0766f762f6d5 /kernel/power/swsusp.c | |
parent | 9b95e43763cfdfebc1318d27e55712e7b6bfe098 (diff) |
swsusp: free more memory
Move the definition of PAGES_FOR_IO to kernel/power/power.h and introduce
SPARE_PAGES representing the number of pages that should be freed by the
swsusp's memory shrinker in addition to PAGES_FOR_IO so that device drivers
can allocate some memory (up to 1 MB total) in their .suspend() routines
without causing the suspend to fail.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/swsusp.c')
-rw-r--r-- | kernel/power/swsusp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index 1109023d8358..5da304c8f1f6 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
@@ -233,7 +233,7 @@ int swsusp_shrink_memory(void) | |||
233 | long size, highmem_size; | 233 | long size, highmem_size; |
234 | 234 | ||
235 | highmem_size = count_highmem_pages(); | 235 | highmem_size = count_highmem_pages(); |
236 | size = count_data_pages() + PAGES_FOR_IO; | 236 | size = count_data_pages() + PAGES_FOR_IO + SPARE_PAGES; |
237 | tmp = size; | 237 | tmp = size; |
238 | size += highmem_size; | 238 | size += highmem_size; |
239 | for_each_zone (zone) | 239 | for_each_zone (zone) |