1 files changed, 3 insertions, 27 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 76a5131b0e80..9e51cdf7b78d 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -24,6 +24,7 @@
 
 extern suspend_disk_method_t pm_disk_mode;
 
+extern int swsusp_shrink_memory(void);
 extern int swsusp_suspend(void);
 extern int swsusp_write(struct pbe *pblist, unsigned int nr_pages);
 extern int swsusp_check(void);
@@ -73,31 +74,6 @@ static void power_down(suspend_disk_method_t mode)
 static int in_suspend __nosavedata = 0;
 
 
-/**
- *      free_some_memory -  Try to free as much memory as possible
- *
- *      ... but do not OOM-kill anyone
- *
- *      Notice: all userland should be stopped at this point, or
- *      livelock is possible.
- */
-
-static void free_some_memory(void)
-{
-        unsigned int i = 0;
-        unsigned int tmp;
-        unsigned long pages = 0;
-        char *p = "-\\|/";
-
-        printk("Freeing memory...  ");
-        while ((tmp = shrink_all_memory(10000))) {
-                pages += tmp;
-                printk("\b%c", p[i++ % 4]);
-        }
-        printk("\bdone (%li pages freed)\n", pages);
-}
-
-
 static inline void platform_finish(void)
 {
         if (pm_disk_mode == PM_DISK_PLATFORM) {
@@ -127,8 +103,8 @@ static int prepare_processes(void)
         }
 
         /* Free memory before shutting down devices. */
-        free_some_memory();
-        return 0;
+        if (!(error = swsusp_shrink_memory()))
+                return 0;
 thaw:
         thaw_processes();
         enable_nonboot_cpus();