diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-09 11:19:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-09 11:19:02 +0200 |
| commit | e0ac3f98254da5304f0a0ffe6f033eb7764644b1 (patch) | |
| tree | a592524a0481c63cbb184c5f1d5e0587730fdd4a /drivers/tty/vt/vt.c | |
| parent | 8bc39bca5e3e8da0d62f7f4d67fdbeecab02b350 (diff) | |
| parent | f8564c93e0907651e21d586920e629227bb0d024 (diff) | |
| download | op-kernel-dev-e0ac3f98254da5304f0a0ffe6f033eb7764644b1.zip op-kernel-dev-e0ac3f98254da5304f0a0ffe6f033eb7764644b1.tar.gz | |
Merge branch 'vt_copy_cleanup' into tty-next
The vt copy_from/to_user cleanups were in a separate branch for others
to work off of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/vt.c')
| -rw-r--r-- | drivers/tty/vt/vt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 9c99452..bacc48b 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -2709,13 +2709,13 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) * related to the kernel should not use this. */ data = vt_get_shift_state(); - ret = __put_user(data, p); + ret = put_user(data, p); break; case TIOCL_GETMOUSEREPORTING: console_lock(); /* May be overkill */ data = mouse_reporting(); console_unlock(); - ret = __put_user(data, p); + ret = put_user(data, p); break; case TIOCL_SETVESABLANK: console_lock(); @@ -2724,7 +2724,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) break; case TIOCL_GETKMSGREDIRECT: data = vt_get_kmsg_redirect(); - ret = __put_user(data, p); + ret = put_user(data, p); break; case TIOCL_SETKMSGREDIRECT: if (!capable(CAP_SYS_ADMIN)) { |
