From 3dc71fffe6526823874d00c7f4784d1590b95531 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Jun 2024 10:38:47 +0200 Subject: [PATCH] 5.4-stable patches added patches: sparc-move-struct-termio-to-asm-termios.h.patch --- queue-5.4/series | 1 + ...-move-struct-termio-to-asm-termios.h.patch | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 queue-5.4/sparc-move-struct-termio-to-asm-termios.h.patch diff --git a/queue-5.4/series b/queue-5.4/series index 65a25afd6e0..941498a1d06 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -196,3 +196,4 @@ kdb-merge-identical-case-statements-in-kdb_read.patch kdb-use-format-specifiers-rather-than-memset-for-padding-in-kdb_read.patch net-fix-__dst_negative_advice-race.patch xsk-validate-user-input-for-xdp_-umem-completion-_fill_ring.patch +sparc-move-struct-termio-to-asm-termios.h.patch diff --git a/queue-5.4/sparc-move-struct-termio-to-asm-termios.h.patch b/queue-5.4/sparc-move-struct-termio-to-asm-termios.h.patch new file mode 100644 index 00000000000..8a202fb7643 --- /dev/null +++ b/queue-5.4/sparc-move-struct-termio-to-asm-termios.h.patch @@ -0,0 +1,64 @@ +From c32d18e7942d7589b62e301eb426b32623366565 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Wed, 6 Mar 2024 12:11:47 -0500 +Subject: sparc: move struct termio to asm/termios.h + +From: Mike Gilbert + +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: Mike Gilbert +Cc: stable@vger.kernel.org +Reviewed-by: Andreas Larsson +Tested-by: Andreas Larsson +Link: https://lore.kernel.org/r/20240306171149.3843481-1-floppym@gentoo.org +Signed-off-by: Andreas Larsson +Signed-off-by: Greg Kroah-Hartman +--- + arch/sparc/include/uapi/asm/termbits.h | 10 ---------- + arch/sparc/include/uapi/asm/termios.h | 9 +++++++++ + 2 files changed, 9 insertions(+), 10 deletions(-) + +--- a/arch/sparc/include/uapi/asm/termbits.h ++++ b/arch/sparc/include/uapi/asm/termbits.h +@@ -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 */ +--- a/arch/sparc/include/uapi/asm/termios.h ++++ b/arch/sparc/include/uapi/asm/termios.h +@@ -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 */ -- 2.47.3