summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-03-23 03:00:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 07:38:08 -0800
commitff4da2e262d2509fe1bacff70dd00934be569c66 (patch)
tree1e171f1858be98f4a7c6ea3f92358b692dab44dc /include/linux
parente4e4d665560c75afb6060cb43bb6738777648ca1 (diff)
downloadop-kernel-dev-ff4da2e262d2509fe1bacff70dd00934be569c66.zip
op-kernel-dev-ff4da2e262d2509fe1bacff70dd00934be569c66.tar.gz
[PATCH] swsusp: add check for suspension of X-controlled devices
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/vt_kern.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index fab5aed..530ae3f 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -73,6 +73,11 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
int vt_waitactive(int vt);
void change_console(struct vc_data *new_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
OpenPOWER on IntegriCloud