Skip to content

Commit 000ecf5

Browse files
floppymroxanan1996
authored andcommitted
sparc: move struct termio to asm/termios.h
BugLink: https://bugs.launchpad.net/bugs/2072617 commit c32d18e 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> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent e7f5134 commit 000ecf5

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

arch/sparc/include/uapi/asm/termbits.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@ typedef unsigned int tcflag_t;
1313
typedef unsigned long tcflag_t;
1414
#endif
1515

16-
#define NCC 8
17-
struct termio {
18-
unsigned short c_iflag; /* input mode flags */
19-
unsigned short c_oflag; /* output mode flags */
20-
unsigned short c_cflag; /* control mode flags */
21-
unsigned short c_lflag; /* local mode flags */
22-
unsigned char c_line; /* line discipline */
23-
unsigned char c_cc[NCC]; /* control characters */
24-
};
25-
2616
#define NCCS 17
2717
struct termios {
2818
tcflag_t c_iflag; /* input mode flags */

arch/sparc/include/uapi/asm/termios.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,14 @@ struct winsize {
4040
unsigned short ws_ypixel;
4141
};
4242

43+
#define NCC 8
44+
struct termio {
45+
unsigned short c_iflag; /* input mode flags */
46+
unsigned short c_oflag; /* output mode flags */
47+
unsigned short c_cflag; /* control mode flags */
48+
unsigned short c_lflag; /* local mode flags */
49+
unsigned char c_line; /* line discipline */
50+
unsigned char c_cc[NCC]; /* control characters */
51+
};
4352

4453
#endif /* _UAPI_SPARC_TERMIOS_H */

0 commit comments

Comments
 (0)