PM/Suspend: Do not shrink memory before suspend

Remove the shrinking of memory from the suspend-to-RAM code, where
it is not really necessary.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Nigel Cunningham <nigel@tuxonice.net>
Acked-by: Wu Fengguang <fengguang.wu@intel.com>

1 files changed, 1 insertions, 19 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 46386b9f8dd1..2a19f347bd8a 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -188,9 +188,6 @@ static void suspend_test_finish(const char *label)
 
 #endif
 
-/* This is just an arbitrary number */
-#define FREE_PAGE_NUMBER (100)
-
 static struct platform_suspend_ops *suspend_ops;
 
 /**
@@ -226,7 +223,6 @@ int suspend_valid_only_mem(suspend_state_t state)
 static int suspend_prepare(void)
 {
         int error;
-        unsigned int free_pages;
 
         if (!suspend_ops || !suspend_ops->enter)
                 return -EPERM;
@@ -241,24 +237,10 @@ static int suspend_prepare(void)
         if (error)
                 goto Finish;
 
-        if (suspend_freeze_processes()) {
-                error = -EAGAIN;
-                goto Thaw;
-        }
-
-        free_pages = global_page_state(NR_FREE_PAGES);
-        if (free_pages < FREE_PAGE_NUMBER) {
-                pr_debug("PM: free some memory\n");
-                shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
-                if (nr_free_pages() < FREE_PAGE_NUMBER) {
-                        error = -ENOMEM;
-                        printk(KERN_ERR "PM: No enough memory\n");
-                }
-        }
+        error = suspend_freeze_processes();
         if (!error)
                 return 0;
 
- Thaw:
         suspend_thaw_processes();
         usermodehelper_enable();
  Finish: