Skip to content

Commit c32d18e

Browse files
floppymandreas-gaisler
authored andcommitted
sparc: move struct termio to asm/termios.h
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 <[email protected]> Cc: [email protected] Reviewed-by: Andreas Larsson <[email protected]> Tested-by: Andreas Larsson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Andreas Larsson <[email protected]>
1 parent 4cece76 commit c32d18e

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
@@ -10,16 +10,6 @@ typedef unsigned int tcflag_t;
1010
typedef unsigned long tcflag_t;
1111
#endif
1212

13-
#define NCC 8
14-
struct termio {
15-
unsigned short c_iflag; /* input mode flags */
16-
unsigned short c_oflag; /* output mode flags */
17-
unsigned short c_cflag; /* control mode flags */
18-
unsigned short c_lflag; /* local mode flags */
19-
unsigned char c_line; /* line discipline */
20-
unsigned char c_cc[NCC]; /* control characters */
21-
};
22-
2313
#define NCCS 17
2414
struct termios {
2515
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)