swsusp: do not change log level during suspend/resume
Subsystems (2)
PATCH 1/1 swsusp: do not change log level during suspend/resume
Hi,
This patch prevents 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.
Please apply.
Greetings,
Rafael
Signed-off-by Rafael J. Wysocki <[email protected]>
Acked-by Pavel Machek <[email protected]>
kernel/power/console.c | 12 +----------- kernel/power/power.h | 5 +++++ 2 files changed, 6 insertions(+), 11 deletions(-)
kernel/power/console.c +1 -11
@@ -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
kernel/power/power.h +5 -0
@@ -43,8 +43,13 @@ static struct subsys_attribute _name##_aextern 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;