From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Jun 2024 08:39:57 +0000 (+0200)
Subject: 6.9-stable patches
X-Git-Tag: v4.19.316~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8073348d3b92fbc322cd190d156f5f92e86032c;p=thirdparty%2Fkernel%2Fstable-queue.git

6.9-stable patches

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

diff --git a/queue-6.9/series b/queue-6.9/series
index 3bb062ebb0b..68c083ae7b9 100644
--- a/queue-6.9/series
+++ b/queue-6.9/series
@@ -114,3 +114,4 @@ revert-xsk-support-redirect-to-any-socket-bound-to-the-same-umem.patch
 revert-xsk-document-ability-to-redirect-to-any-socket-bound-to-the-same-umem.patch
 revert-perf-record-reduce-memory-for-recording-perf_record_lost_samples-event.patch
 e1000e-move-force-smbus-near-the-end-of-enable_ulp-function.patch
+sparc-move-struct-termio-to-asm-termios.h.patch
diff --git a/queue-6.9/sparc-move-struct-termio-to-asm-termios.h.patch b/queue-6.9/sparc-move-struct-termio-to-asm-termios.h.patch
new file mode 100644
index 00000000000..7ad6f503860
--- /dev/null
+++ b/queue-6.9/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
+@@ -10,16 +10,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 */