lkml.org 
[lkml]   [2024]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] sparc: move struct termio to asm/termios.h
On Wed, Apr 3, 2024 at 3:15 PM Mike Gilbert <floppym@gentoo.org> wrote:
>
> On Wed, Mar 6, 2024 at 12:11 PM Mike Gilbert <floppym@gentoo.org> 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 */
> > --
> > 2.44.0
> >
>
> Ping. Could we get this merged please?

Ping again. Any response from a SPARC maintainer would be appreciated.

\
 
 \ /
  Last update: 2024-05-27 16:47    [W:0.064 / U:0.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site