mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
sparc: move struct termio to asm/termios.h
commit c32d18e794
upstream.
Every other arch declares struct termio in asm/termios.h, so make sparc
match them.
Resolves a build failure in the PPP software package, which includes
both bits/ioctl-types.h via sys/ioctl.h (glibc) and asm/termbits.h.
Closes: https://bugs.gentoo.org/918992
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Cc: stable@vger.kernel.org
Reviewed-by: Andreas Larsson <andreas@gaisler.com>
Tested-by: Andreas Larsson <andreas@gaisler.com>
Link: https://lore.kernel.org/r/20240306171149.3843481-1-floppym@gentoo.org
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2295a7ef5c
commit
08018302f2
2 changed files with 9 additions and 10 deletions
|
@ -13,16 +13,6 @@ typedef unsigned int tcflag_t;
|
||||||
typedef unsigned long tcflag_t;
|
typedef unsigned long tcflag_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NCC 8
|
|
||||||
struct termio {
|
|
||||||
unsigned short c_iflag; /* input mode flags */
|
|
||||||
unsigned short c_oflag; /* output mode flags */
|
|
||||||
unsigned short c_cflag; /* control mode flags */
|
|
||||||
unsigned short c_lflag; /* local mode flags */
|
|
||||||
unsigned char c_line; /* line discipline */
|
|
||||||
unsigned char c_cc[NCC]; /* control characters */
|
|
||||||
};
|
|
||||||
|
|
||||||
#define NCCS 17
|
#define NCCS 17
|
||||||
struct termios {
|
struct termios {
|
||||||
tcflag_t c_iflag; /* input mode flags */
|
tcflag_t c_iflag; /* input mode flags */
|
||||||
|
|
|
@ -40,5 +40,14 @@ struct winsize {
|
||||||
unsigned short ws_ypixel;
|
unsigned short ws_ypixel;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define NCC 8
|
||||||
|
struct termio {
|
||||||
|
unsigned short c_iflag; /* input mode flags */
|
||||||
|
unsigned short c_oflag; /* output mode flags */
|
||||||
|
unsigned short c_cflag; /* control mode flags */
|
||||||
|
unsigned short c_lflag; /* local mode flags */
|
||||||
|
unsigned char c_line; /* line discipline */
|
||||||
|
unsigned char c_cc[NCC]; /* control characters */
|
||||||
|
};
|
||||||
|
|
||||||
#endif /* _UAPI_SPARC_TERMIOS_H */
|
#endif /* _UAPI_SPARC_TERMIOS_H */
|
||||||
|
|
Loading…
Reference in a new issue