5.15-stable patches

added patches:
	sparc-move-struct-termio-to-asm-termios.h.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index 27cee9577c202b6e0b5709c14a9079af1ecc2af4..9f5e33029e4bdaafe24b376f2c758c69c19501a2 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -389,3 +389,4 @@ kdb-fix-console-handling-when-editing-and-tab-completing-commands.patch
 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
+sparc-move-struct-termio-to-asm-termios.h.patch

diff --git a/queue-5.15/sparc-move-struct-termio-to-asm-termios.h.patch b/queue-5.15/sparc-move-struct-termio-to-asm-termios.h.patch
new file mode 100644 (file)
index 0000000..8a202fb
--- /dev/null
+++ b/queue-5.15/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 <floppym@gentoo.org>
+Date: Wed, 6 Mar 2024 12:11:47 -0500
+Subject: sparc: move struct termio to asm/termios.h
+
+From: Mike Gilbert <floppym@gentoo.org>
+
+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 <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>
+---
+ 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 */