Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 980a1cd6 authored by Mike Gilbert's avatar Mike Gilbert Committed by Greg Kroah-Hartman
Browse files

sparc: move struct termio to asm/termios.h 

commit c32d18e7942d7589b62e301eb426b32623366565 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: default avatarMike Gilbert <floppym@gentoo.org>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarAndreas Larsson <andreas@gaisler.com>
Tested-by: default avatarAndreas Larsson <andreas@gaisler.com>
Link: https://lore.kernel.org/r/20240306171149.3843481-1-floppym@gentoo.org


Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 051c0bde

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

+0 −10
Original line number Diff line number Diff line
@@ -13,16 +13,6 @@ typedef unsigned int tcflag_t; 
typedef unsigned long   tcflag_t;

#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

struct termios {

	tcflag_t c_iflag;		/* input mode flags */

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

+9 −0
Original line number Diff line number Diff line
@@ -40,5 +40,14 @@ struct winsize { 
	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 */