5 files changed, 18 insertions, 30 deletions

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 7ff375e7c95f..579d239d129f 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,18 +9,11 @@
 #include <linux/console.h>
 #include "power.h"
 
-static int new_loglevel = 10;
-static int orig_loglevel;
 #ifdef SUSPEND_CONSOLE
 static int orig_fgconsole, orig_kmsg;
-#endif
 
 int pm_prepare_console(void)
 {
-        orig_loglevel = console_loglevel;
-        console_loglevel = new_loglevel;
-
-#ifdef SUSPEND_CONSOLE
         acquire_console_sem();
 
         orig_fgconsole = fg_console;
@@ -41,18 +34,15 @@ int pm_prepare_console(void)
         }
         orig_kmsg = kmsg_redirect;
         kmsg_redirect = SUSPEND_CONSOLE;
-#endif
         return 0;
 }
 
 void pm_restore_console(void)
 {
-        console_loglevel = orig_loglevel;
-#ifdef SUSPEND_CONSOLE
         acquire_console_sem();
         set_console(orig_fgconsole);
         release_console_sem();
         kmsg_redirect = orig_kmsg;
-#endif
         return;
 }
+#endif
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e24446f8d8cd..0b43847dc980 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -53,7 +53,7 @@ static void power_down(suspend_disk_method_t mode)
 
         switch(mode) {
         case PM_DISK_PLATFORM:
-                kernel_power_off_prepare();
+                kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
                 error = pm_ops->enter(PM_SUSPEND_DISK);
                 break;
         case PM_DISK_SHUTDOWN:
@@ -95,13 +95,6 @@ static int prepare_processes(void)
                 goto thaw;
         }
 
-        if (pm_disk_mode == PM_DISK_PLATFORM) {
-                if (pm_ops && pm_ops->prepare) {
-                        if ((error = pm_ops->prepare(PM_SUSPEND_DISK)))
-                                goto thaw;
-                }
-        }
-
         /* Free memory before shutting down devices. */
         if (!(error = swsusp_shrink_memory()))
                 return 0;
@@ -367,14 +360,14 @@ power_attr(resume);
 
 static ssize_t image_size_show(struct subsystem * subsys, char *buf)
 {
-        return sprintf(buf, "%u\n", image_size);
+        return sprintf(buf, "%lu\n", image_size);
 }
 
 static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n)
 {
-        unsigned int size;
+        unsigned long size;
 
-        if (sscanf(buf, "%u", &size) == 1) {
+        if (sscanf(buf, "%lu", &size) == 1) {
                 image_size = size;
                 return n;
         }
diff --git a/kernel/power/main.c b/kernel/power/main.c
index d253f3ae2fa5..9cb235cba4a9 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t state)
 static void suspend_finish(suspend_state_t state)
 {
         device_resume();
-        if (pm_ops && pm_ops->finish)
-                pm_ops->finish(state);
         thaw_processes();
         enable_nonboot_cpus();
+        if (pm_ops && pm_ops->finish)
+                pm_ops->finish(state);
         pm_restore_console();
 }
 
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 7e8492fd1423..d8f0d1a76bae 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -42,8 +42,13 @@ static struct subsys_attribute _name##_attr = {	\
 
 extern struct subsystem power_subsys;
 
+#ifdef SUSPEND_CONSOLE
 extern int pm_prepare_console(void);
 extern void pm_restore_console(void);
+#else
+static int pm_prepare_console(void) { return 0; }
+static void pm_restore_console(void) {}
+#endif
 
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
@@ -51,8 +56,8 @@ extern const void __nosave_begin, __nosave_end;
 extern unsigned int nr_copy_pages;
 extern struct pbe *pagedir_nosave;
 
-/* Preferred image size in MB (default 500) */
-extern unsigned int image_size;
+/* Preferred image size in bytes (default 500 MB) */
+extern unsigned long image_size;
 
 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 55a18d26abed..59c91c148e82 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -70,12 +70,12 @@
 #include "power.h"
 
 /*
- * Preferred image size in MB (tunable via /sys/power/image_size).
+ * Preferred image size in bytes (tunable via /sys/power/image_size).
  * When it is set to N, swsusp will do its best to ensure the image
- * size will not exceed N MB, but if that is impossible, it will
+ * size will not exceed N bytes, but if that is impossible, it will
  * try to create the smallest image possible.
  */
-unsigned int image_size = 500;
+unsigned long image_size = 500 * 1024 * 1024;
 
 #ifdef CONFIG_HIGHMEM
 unsigned int count_highmem_pages(void);
@@ -590,7 +590,7 @@ int swsusp_shrink_memory(void)
                         if (!tmp)
                                 return -ENOMEM;
                         pages += tmp;
-                } else if (size > (image_size * 1024 * 1024) / PAGE_SIZE) {
+                } else if (size > image_size / PAGE_SIZE) {
                         tmp = shrink_all_memory(SHRINK_BITE);
                         pages += tmp;
                 }