[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <13d29637-4208-42b4-b377-1ffe0c1c4ec6@gaisler.com>
Date: Mon, 22 Apr 2024 14:05:52 +0200
From: Andreas Larsson <andreas@...sler.com>
To: Mike Gilbert <floppym@...too.org>, "David S. Miller"
<davem@...emloft.net>, sparclinux@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] sparc: move struct termio to asm/termios.h
On 2024-03-06 18:11, Mike Gilbert wrote:
> 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@...too.org>
> Cc: stable@...r.kernel.org
> ---
> arch/sparc/include/uapi/asm/termbits.h | 10 ----------
> arch/sparc/include/uapi/asm/termios.h | 9 +++++++++
> 2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h
> index 4321322701fc..0da2b1adc0f5 100644
> --- 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 */
> diff --git a/arch/sparc/include/uapi/asm/termios.h b/arch/sparc/include/uapi/asm/termios.h
> index ee86f4093d83..cceb32260881 100644
> --- 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 */
Reviewed-by: Andreas Larsson <andreas@...sler.com>
Tested-by: Andreas Larsson <andreas@...sler.com>
Picking this up to my for-next.
Sorry for the wait. I did not have time to vet it enough for the last
cycle.
Thanks,
Andreas
Powered by blists - more mailing lists