[PATCH] vt: add TIOCL_GETKMSGREDIRECT

Add TIOCL_GETKMSGREDIRECT needed by the userland suspend tool to get the
current value of kmsg_redirect from the kernel so that it can save it and
restore it after resume.

Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Pavel Machek <[email protected]>
Cc: Michael Kerrisk <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index ca4844c527dae7d6fbbed8c13f6ea46c8f564f47..acc5d47844eb49a53578f688949f04e039c04962 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2328,6 +2328,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                case TIOCL_SETVESABLANK:
                        set_vesa_blanking(p);
                        break;
+               case TIOCL_GETKMSGREDIRECT:
+                       data = kmsg_redirect;
+                       ret = __put_user(data, p);
+                       break;
                case TIOCL_SETKMSGREDIRECT:
                        if (!capable(CAP_SYS_ADMIN)) {
                                ret = -EPERM;

diff --git a/include/linux/tiocl.h b/include/linux/tiocl.h
index 2c9e847f6ed1d61291273440a3707730bd50f35b..4756862c4ed4c2a9919d1d1f2be2d70879ee07b7 100644 (file)
--- a/include/linux/tiocl.h
+++ b/include/linux/tiocl.h
@@ -34,5 +34,6 @@ struct tiocl_selection {
 #define TIOCL_SCROLLCONSOLE    13      /* scroll console */
 #define TIOCL_BLANKSCREEN      14      /* keep screen blank even if a key is pressed */
 #define TIOCL_BLANKEDSCREEN    15      /* return which vt was blanked */
+#define TIOCL_GETKMSGREDIRECT  17      /* get the vt the kernel messages are restricted to */
 
 #endif /* _LINUX_TIOCL_H */