Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6.git] / kernel / power / console.c
index 89bcf49..218e5af 100644 (file)
@@ -6,7 +6,8 @@
 
 #include <linux/vt_kern.h>
 #include <linux/kbd_kern.h>
-#include <linux/console.h>
+#include <linux/vt.h>
+#include <linux/module.h>
 #include "power.h"
 
 #if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
@@ -16,43 +17,19 @@ static int orig_fgconsole, orig_kmsg;
 
 int pm_prepare_console(void)
 {
-       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();
+       orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
+       if (orig_fgconsole < 0)
                return 1;
-       }
 
-       if (set_console(SUSPEND_CONSOLE)) {
-               /*
-                * We're unable to switch to the SUSPEND_CONSOLE.
-                * Let the calling function know so it can decide
-                * what to do.
-                */
-               release_console_sem();
-               return 1;
-       }
-       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;
+       orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE);
        return 0;
 }
 
 void pm_restore_console(void)
 {
-       acquire_console_sem();
-       set_console(orig_fgconsole);
-       release_console_sem();
-       kmsg_redirect = orig_kmsg;
-       return;
+       if (orig_fgconsole >= 0) {
+               vt_move_to_console(orig_fgconsole, 0);
+               vt_kmsg_redirect(orig_kmsg);
+       }
 }
 #endif