[PATCH] swsusp: let userland tools switch console on suspend

Remove the console-switching code from the suspend part of the swsusp userland
interface and let the userland tools switch the console.

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/user.c b/kernel/power/user.c
index a97406b86ef3357e3c70191390e00471537e7123..bbd4842104aa012786ff875aa37f58dc90d4a05b 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -139,12 +139,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                if (data->frozen)
                        break;
                down(&pm_sem);
-               pm_prepare_console();
                disable_nonboot_cpus();
                if (freeze_processes()) {
                        thaw_processes();
                        enable_nonboot_cpus();
-                       pm_restore_console();
                        error = -EBUSY;
                }
                up(&pm_sem);
@@ -158,7 +156,6 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                down(&pm_sem);
                thaw_processes();
                enable_nonboot_cpus();
-               pm_restore_console();
                up(&pm_sem);
                data->frozen = 0;
                break;