Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <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>

authored by

Mike Gilbert and committed by
Andreas Larsson
c32d18e7 4cece764

+9 -10
-10
arch/sparc/include/uapi/asm/termbits.h
··· 10 10 typedef unsigned long tcflag_t; 11 11 #endif 12 12 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 - 23 13 #define NCCS 17 24 14 struct termios { 25 15 tcflag_t c_iflag; /* input mode flags */
+9
arch/sparc/include/uapi/asm/termios.h
··· 40 40 unsigned short ws_ypixel; 41 41 }; 42 42 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 + }; 43 52 44 53 #endif /* _UAPI_SPARC_TERMIOS_H */