2 files changed, 11 insertions, 14 deletions

diff --git a/kernel/power/power.h b/kernel/power/power.h
index e521e61e0d95..9b0459903613 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -53,12 +53,10 @@ extern unsigned int nr_copy_pages;
 extern struct pbe *pagedir_nosave;
 
 /*
- * This compilation switch determines the way in which memory will be freed
- * during suspend.  If defined, only as much memory will be freed as needed
- * to complete the suspend, which will make it go faster.  Otherwise, the
- * largest possible amount of memory will be freed.
+ * Preferred image size in MB (set it to zero to get the smallest
+ * image possible)
  */
-#define FAST_FREE       1
+#define IMAGE_SIZE      500
 
 extern asmlinkage int swsusp_arch_suspend(void);
 extern asmlinkage int swsusp_arch_resume(void);
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index f77f9397a364..6d5ceaf4c364 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -626,7 +626,7 @@ int swsusp_write(struct pbe *pblist, unsigned int nr_pages)
 
 int swsusp_shrink_memory(void)
 {
-        long tmp;
+        long size, tmp;
         struct zone *zone;
         unsigned long pages = 0;
         unsigned int i = 0;
@@ -634,11 +634,11 @@ int swsusp_shrink_memory(void)
 
         printk("Shrinking memory...  ");
         do {
-#ifdef FAST_FREE
-                tmp = 2 * count_highmem_pages();
-                tmp += tmp / 50 + count_data_pages();
-                tmp += (tmp + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
+                size = 2 * count_highmem_pages();
+                size += size / 50 + count_data_pages();
+                size += (size + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
                         PAGES_FOR_IO;
+                tmp = size;
                 for_each_zone (zone)
                         if (!is_highmem(zone))
                                 tmp -= zone->free_pages;
@@ -647,11 +647,10 @@ int swsusp_shrink_memory(void)
                         if (!tmp)
                                 return -ENOMEM;
                         pages += tmp;
+                } else if (size > (IMAGE_SIZE * 1024 * 1024) / PAGE_SIZE) {
+                        tmp = shrink_all_memory(SHRINK_BITE);
+                        pages += tmp;
                 }
-#else
-                tmp = shrink_all_memory(SHRINK_BITE);
-                pages += tmp;
-#endif
                 printk("\b%c", p[i++%4]);
         } while (tmp > 0);
         printk("\bdone (%lu pages freed)\n", pages);