luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] revert "swsusp add check for suspension of X controlled devices"

Browse Source 
From: Andrew Morton <akpm@osdl.org>

Revert commit ff4da2e262.

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>
This commit is contained in:
Andrew Morton 2006-05-30 21:26:03 -07:00 committed by Linus Torvalds
parent d61a3ead26
commit 760f1fce03
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/power/suspend.c
View File

@ -8,7 +8,6 @@
* *
*/ */
#include <linux/vt_kern.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/pm.h> #include <linux/pm.h>
@ -66,6 +65,7 @@ int suspend_device(struct device * dev, pm_message_t state)
return error; return error;
} }
/** /**
* device_suspend - Save state and stop all devices in system. * device_suspend - Save state and stop all devices in system.
* @state: Power state to put each device in. * @state: Power state to put each device in.
@ -85,9 +85,6 @@ int device_suspend(pm_message_t state)
{ {
int error = 0; int error = 0;
if (!is_console_suspend_safe())
return -EINVAL;
down(&dpm_sem); down(&dpm_sem);
down(&dpm_list_sem); down(&dpm_list_sem);
while (!list_empty(&dpm_active) && error == 0) { while (!list_empty(&dpm_active) && error == 0) {

8
drivers/char/vt.c
View File

@ -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 * Visible symbols for modules
*/ */

5
include/linux/vt_kern.h
View File

@ -73,11 +73,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
int vt_waitactive(int vt); int vt_waitactive(int vt);
void change_console(struct vc_data *new_vc); void change_console(struct vc_data *new_vc);
void reset_vc(struct vc_data *vc); void reset_vc(struct vc_data *vc);
#ifdef CONFIG_VT
int is_console_suspend_safe(void);
#else
static inline int is_console_suspend_safe(void) { return 1; }
#endif
/* /*
* vc_screen.c shares this temporary buffer with the console write code so that * vc_screen.c shares this temporary buffer with the console write code so that