From: "Rafael J. Wysocki" Fix swsusp to use image_size as documented on systems with lots of highmem. Signed-off-by: Rafael J. Wysocki Cc: Pavel Machek Signed-off-by: Andrew Morton --- kernel/power/swsusp.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/power/swsusp.c~swsusp-improve-handling-of-highmem-fix kernel/power/swsusp.c --- a/kernel/power/swsusp.c~swsusp-improve-handling-of-highmem-fix +++ a/kernel/power/swsusp.c @@ -195,6 +195,7 @@ int swsusp_shrink_memory(void) highmem_size = count_highmem_pages(); size = count_data_pages() + PAGES_FOR_IO; tmp = size; + size += highmem_size; for_each_zone (zone) if (populated_zone(zone)) { if (is_highmem(zone)) { @@ -209,7 +210,6 @@ int swsusp_shrink_memory(void) if (highmem_size < 0) highmem_size = 0; - size += highmem_size; tmp += highmem_size; if (tmp > 0) { tmp = __shrink_memory(tmp); _