diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-03-23 03:00:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 07:38:08 -0800 |
| commit | 94c188d32996beac00426740974310e32f162c14 (patch) | |
| tree | 3397f055957e233554cdd17c645ecc8f7ea7c074 | |
| parent | ff4da2e262d2509fe1bacff70dd00934be569c66 (diff) | |
[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>
| -rw-r--r-- | kernel/power/user.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index a97406b86ef3..bbd4842104aa 100644 --- 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; |