diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2018-08-16 11:47:53 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-09 10:44:34 +0200 |
| commit | c9874d3ffeaf8ee215187692ed918b3031d996d1 (patch) | |
| tree | 4c926f66edbfea5070411022daf87648c1d2ec9d /arch/alpha | |
| parent | termios: uninline conversion helpers (diff) | |
| download | linux-dev-c9874d3ffeaf8ee215187692ed918b3031d996d1.tar.xz linux-dev-c9874d3ffeaf8ee215187692ed918b3031d996d1.zip | |
termios: start unifying non-UAPI parts of asm/termios.h
* new header (linut/termios_internal.h), pulled by the users of those
suckers
* defaults for INIT_C_CC and externs for conversion helpers moved over
there
* remove termios-base.h (empty now)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDmptU7dNGZ+/Hn@ZenIV
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/termios.h | 8 | ||||
| -rw-r--r-- | arch/alpha/kernel/termios.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/alpha/include/asm/termios.h b/arch/alpha/include/asm/termios.h index bafbb0090024..17b109859e05 100644 --- a/arch/alpha/include/asm/termios.h +++ b/arch/alpha/include/asm/termios.h @@ -2,6 +2,7 @@ #ifndef _ALPHA_TERMIOS_H #define _ALPHA_TERMIOS_H +#include <linux/uaccess.h> #include <uapi/asm/termios.h> /* eof=^D eol=\0 eol2=\0 erase=del @@ -12,11 +13,4 @@ */ #define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000" -int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *); -int kernel_termios_to_user_termio(struct termio __user *, struct ktermios *); -int user_termios_to_kernel_termios(struct ktermios *, struct termios2 __user *); -int kernel_termios_to_user_termios(struct termios2 __user *, struct ktermios *); -int user_termios_to_kernel_termios_1(struct ktermios *, struct termios __user *); -int kernel_termios_to_user_termios_1(struct termios __user *, struct ktermios *); - #endif /* _ALPHA_TERMIOS_H */ diff --git a/arch/alpha/kernel/termios.c b/arch/alpha/kernel/termios.c index 1534f39cb9fe..a4c29a22edf7 100644 --- a/arch/alpha/kernel/termios.c +++ b/arch/alpha/kernel/termios.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/uaccess.h> -#include <linux/termios.h> +#include <linux/termios_internal.h> int user_termio_to_kernel_termios(struct ktermios *termios, struct termio __user *termio) |