Commit c75fd0ee authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

[PATCH] swsusp: fix memory shrinker

Fix a bug in the swsusp's memory shrinker that causes some systems using
highmem to refuse to suspend to disk if image_size is set above 1/2 of
available RAM.

Special thanks to Jiri Slaby for reporting the problem and assistance in
debugging it.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 418106d6
...@@ -229,13 +229,13 @@ int swsusp_shrink_memory(void) ...@@ -229,13 +229,13 @@ int swsusp_shrink_memory(void)
size += highmem_size; size += highmem_size;
for_each_zone (zone) for_each_zone (zone)
if (populated_zone(zone)) { if (populated_zone(zone)) {
tmp += snapshot_additional_pages(zone);
if (is_highmem(zone)) { if (is_highmem(zone)) {
highmem_size -= highmem_size -=
zone_page_state(zone, NR_FREE_PAGES); zone_page_state(zone, NR_FREE_PAGES);
} else { } else {
tmp -= zone_page_state(zone, NR_FREE_PAGES); tmp -= zone_page_state(zone, NR_FREE_PAGES);
tmp += zone->lowmem_reserve[ZONE_NORMAL]; tmp += zone->lowmem_reserve[ZONE_NORMAL];
tmp += snapshot_additional_pages(zone);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment