Commit 94c188d3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

[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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ff4da2e2

kernel/power/user.c

+0 −3
Original line number Diff line number Diff line
@@ -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;