[PATCH] swsusp: do not change log level during suspend/resume

Prevent the kernel from setting the log level to 10 unconditionally during
suspend/resume which was needed in the past for debugging, but generally is
undesirable.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 7ff375e7c95f3cf24ab52adf62a688849684e05f..579d239d129fd5dd03458f8889577400b3b56aa1 100644 (file)
--- 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/power.h b/kernel/power/power.h
index 61beb5e0e927501d0f9f68f577a98ca4a9a7a05c..d8f0d1a76bae9fbf18a8c1d20326d9dc20dd232d 100644 (file)
--- 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;