Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / kernel / power / console.c

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 7ff375e..6e039ca 100644 (file)
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,50 +9,20 @@
 #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
+extern int console_suspended;
 
 int pm_prepare_console(void)
 {
-       orig_loglevel = console_loglevel;
-       console_loglevel = new_loglevel;
-
-#ifdef SUSPEND_CONSOLE
        acquire_console_sem();
-
-       orig_fgconsole = fg_console;
-
-       if (vc_allocate(SUSPEND_CONSOLE)) {
-         /* we can't have a free VC for now. Too bad,
-          * we don't want to mess the screen for now. */
-               release_console_sem();
-               return 1;
-       }
-
-       set_console(SUSPEND_CONSOLE);
-       release_console_sem();
-
-       if (vt_waitactive(SUSPEND_CONSOLE)) {
-               pr_debug("Suspend: Can't switch VCs.");
-               return 1;
-       }
-       orig_kmsg = kmsg_redirect;
-       kmsg_redirect = SUSPEND_CONSOLE;
-#endif
+       console_suspended = 1;
+       system_state = SYSTEM_BOOTING;
        return 0;
 }
 
 void pm_restore_console(void)
 {
-       console_loglevel = orig_loglevel;
-#ifdef SUSPEND_CONSOLE
-       acquire_console_sem();
-       set_console(orig_fgconsole);
+       console_suspended = 0;
+       system_state = SYSTEM_RUNNING;
        release_console_sem();
-       kmsg_redirect = orig_kmsg;
-#endif
        return;
 }