summaryrefslogtreecommitdiffstats
path: root/drivers/char/vt.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-05-30 21:26:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-31 16:27:11 -0700
commit760f1fce030ccc620ec430a8aff8fc604e7891ed (patch)
treed2e14b5c6d101e4b368300d2a7e6c6fd438133a8 /drivers/char/vt.c
parentd61a3ead268084cc271d7b2aa2950fc822a37cf5 (diff)
downloadop-kernel-dev-760f1fce030ccc620ec430a8aff8fc604e7891ed.zip
op-kernel-dev-760f1fce030ccc620ec430a8aff8fc604e7891ed.tar.gz
[PATCH] revert "swsusp add check for suspension of X controlled devices"
From: Andrew Morton <akpm@osdl.org> Revert commit ff4da2e262d2509fe1bacff70dd00934be569c66. It broke APM suspend, probably because APM doesn't switch back to a VT when suspending. Tracked down by Matt Mackall <mpm@selenic.com> Rafael sayeth: "It only fixed the theoretical issue that a quick-handed user could switch to X after processes have been frozen and before the devices are suspended. With the current userland suspend tools it shouldn't be necessary." Cc: Pavel Machek <pavel@ucw.cz> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r--drivers/char/vt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index acc5d47..6c94879 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -3238,14 +3238,6 @@ void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org)
}
}
-int is_console_suspend_safe(void)
-{
- /* It is unsafe to suspend devices while X has control of the
- * hardware. Make sure we are running on a kernel-controlled console.
- */
- return vc_cons[fg_console].d->vc_mode == KD_TEXT;
-}
-
/*
* Visible symbols for modules
*/
OpenPOWER on IntegriCloud