Merge branch 'master' into upstream

1 files changed, 2 insertions, 3 deletions

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 17f669c83012..8ef677ea0cea 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -193,14 +193,13 @@ int swsusp_shrink_memory(void)
         printk("Shrinking memory...  ");
         do {
                 size = 2 * count_highmem_pages();
-                size += size / 50 + count_data_pages();
-                size += (size + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
-                        PAGES_FOR_IO;
+                size += size / 50 + count_data_pages() + PAGES_FOR_IO;
                 tmp = size;
                 for_each_zone (zone)
                         if (!is_highmem(zone) && populated_zone(zone)) {
                                 tmp -= zone->free_pages;
                                 tmp += zone->lowmem_reserve[ZONE_NORMAL];
+                                tmp += snapshot_additional_pages(zone);
                         }
                 if (tmp > 0) {
                         tmp = __shrink_memory(tmp);