Received-SPF: pass (google.com: domain of linux-kernel+bounces-130491-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240306171149.3843481-1-floppym@gentoo.org>
In-Reply-To: <20240306171149.3843481-1-floppym@gentoo.org>
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 3 Apr 2024 15:15:52 -0400
Message-ID: <CAJ0EP42dLgjk5ucgzDoknBzkByL=O5v43gCmMR2BvgBxsaAkCg@mail.gmail.com>
Subject: Re: [PATCH] sparc: move struct termio to asm/termios.h
To: "David S. Miller" <davem@davemloft.net>, Andreas Larsson <andreas@gaisler.com>, sparclinux@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Mar 6, 2024 at 12:11=E2=80=AFPM Mike Gilbert <floppym@gentoo.org> w=
rote:
>
> 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
> ---
>  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/u=
api/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 */
> --
> 2.44.0
>

Ping. Could we get this merged please?