From: Andreas Larsson <andreas@gaisler.com>
To: Mike Gilbert <floppym@gentoo.org>,
"David S. Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] sparc: move struct termio to asm/termios.h
Date: Mon, 22 Apr 2024 14:05:52 +0200 [thread overview]
Message-ID: <13d29637-4208-42b4-b377-1ffe0c1c4ec6@gaisler.com> (raw)
In-Reply-To: <20240306171149.3843481-1-floppym@gentoo.org>
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@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/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@gaisler.com>
Tested-by: Andreas Larsson <andreas@gaisler.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
prev parent reply other threads:[~2024-04-22 12:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 17:11 [PATCH] sparc: move struct termio to asm/termios.h Mike Gilbert
2024-03-21 19:45 ` John Paul Adrian Glaubitz
2024-04-03 19:15 ` Mike Gilbert
2024-04-19 16:28 ` Mike Gilbert
2024-04-22 12:05 ` Andreas Larsson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=13d29637-4208-42b4-b377-1ffe0c1c4ec6@gaisler.com \
--to=andreas@gaisler.com \
--cc=davem@davemloft.net \
--cc=floppym@gentoo.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).