1 files changed, 3 insertions, 45 deletions

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index e1722d3155f1..023ff2a31d89 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 1024;
 
 int in_suspend __nosavedata = 0;
 
-#ifdef CONFIG_HIGHMEM
-unsigned int count_highmem_pages(void);
-int restore_highmem(void);
-#else
-static inline int restore_highmem(void) { return 0; }
-static inline unsigned int count_highmem_pages(void) { return 0; }
-#endif
-
 /**
  *      The following functions are used for tracing the allocated
  *      swap pages, so that they can be freed in case of an error.
@@ -196,7 +188,8 @@ void swsusp_show_speed(struct timeval *start, struct timeval *stop,
                 centisecs = 1;  /* avoid div-by-zero */
         k = nr_pages * (PAGE_SIZE / 1024);
         kps = (k * 100) / centisecs;
-        printk("%s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n", msg, k,
+        printk(KERN_INFO "PM: %s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n",
+                        msg, k,
                         centisecs / 100, centisecs % 100,
                         kps / 1000, (kps % 1000) / 10);
 }
@@ -227,7 +220,7 @@ int swsusp_shrink_memory(void)
         char *p = "-\\|/";
         struct timeval start, stop;
 
-        printk("Shrinking memory...  ");
+        printk(KERN_INFO "PM: Shrinking memory...  ");
         do_gettimeofday(&start);
         do {
                 long size, highmem_size;
@@ -269,38 +262,3 @@ int swsusp_shrink_memory(void)
 
         return 0;
 }
-
-int swsusp_resume(void)
-{
-        int error;
-
-        local_irq_disable();
-        /* NOTE:  device_power_down() is just a suspend() with irqs off;
-         * it has no special "power things down" semantics
-         */
-        if (device_power_down(PMSG_PRETHAW))
-                printk(KERN_ERR "Some devices failed to power down, very bad\n");
-        /* We'll ignore saved state, but this gets preempt count (etc) right */
-        save_processor_state();
-        error = restore_highmem();
-        if (!error) {
-                error = swsusp_arch_resume();
-                /* The code below is only ever reached in case of a failure.
-                 * Otherwise execution continues at place where
-                 * swsusp_arch_suspend() was called
-                 */
-                BUG_ON(!error);
-                /* This call to restore_highmem() undos the previous one */
-                restore_highmem();
-        }
-        /* The only reason why swsusp_arch_resume() can fail is memory being
-         * very tight, so we have to free it as soon as we can to avoid
-         * subsequent failures
-         */
-        swsusp_free();
-        restore_processor_state();
-        touch_softlockup_watchdog();
-        device_power_up();
-        local_irq_enable();
-        return error;
-}