adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] swsusp: add check for suspension of X-controlled devices

Browse source 
It is unsafe to suspend devices if the hardware is controlled by X.  Add an
extra check to prevent this from happening.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Rafael J. Wysocki 2006-03-23 03:00:07 -08:00 committed by Linus Torvalds
parent e4e4d66556
commit ff4da2e262
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
* *
*/ */
#include <linux/vt_kern.h>
#include <linux/device.h> #include <linux/device.h>
#include "../base.h" #include "../base.h"
#include "power.h" #include "power.h"
@ -62,7 +63,6 @@ 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.
@ -82,6 +82,9 @@ 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

@ -3234,6 +3234,14 @@ 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,6 +73,11 @@ 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