From 717600c648ed391a5d17bb91d9082b1916242962 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 31 Mar 2006 02:30:58 -0800 Subject: [PATCH] --- yaml --- r: 24900 b: refs/heads/master c: 0ca07731e495584bd84dca15a0f065470d594ec4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/vt.c | 4 ++++ trunk/include/linux/tiocl.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c3a3e04adda9..1da590dc2a52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d32af0fe11b1618572389723e93cf33a4cc11c81 +refs/heads/master: 0ca07731e495584bd84dca15a0f065470d594ec4 diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index ca4844c527da..acc5d47844eb 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/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/trunk/include/linux/tiocl.h b/trunk/include/linux/tiocl.h index 2c9e847f6ed1..4756862c4ed4 100644 --- a/trunk/include/linux/tiocl.h +++ b/trunk/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 */