* [PATCH] sh: include linux/time_types.h for sockios
@ 2020-05-19 13:13 Arnd Bergmann
2020-05-20 1:10 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2020-05-19 13:13 UTC (permalink / raw)
To: Yoshinori Sato, Rich Felker, David S. Miller
Cc: Andrew Morton, Arnd Bergmann, John Paul Adrian Glaubitz,
linux-sh, linux-kernel
Using the socket ioctls on arch/sh (and only there) causes build
time problems when __kernel_old_timeval/__kernel_old_timespec are
not already visible to the compiler.
Add an explict include line for the header that defines these
structures.
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/uapi/asm/sockios.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/sh/include/uapi/asm/sockios.h b/arch/sh/include/uapi/asm/sockios.h
index 3da561453260..ef01ced9e169 100644
--- a/arch/sh/include/uapi/asm/sockios.h
+++ b/arch/sh/include/uapi/asm/sockios.h
@@ -2,6 +2,8 @@
#ifndef __ASM_SH_SOCKIOS_H
#define __ASM_SH_SOCKIOS_H
+#include <linux/time_types.h>
+
/* Socket-level I/O control calls. */
#define FIOGETOWN _IOR('f', 123, int)
#define FIOSETOWN _IOW('f', 124, int)
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] sh: include linux/time_types.h for sockios
2020-05-19 13:13 [PATCH] sh: include linux/time_types.h for sockios Arnd Bergmann
@ 2020-05-20 1:10 ` Andrew Morton
2020-05-20 8:32 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2020-05-20 1:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Yoshinori Sato, Rich Felker, David S. Miller,
John Paul Adrian Glaubitz, linux-sh, linux-kernel
On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> Using the socket ioctls on arch/sh (and only there) causes build
> time problems when __kernel_old_timeval/__kernel_old_timespec are
> not already visible to the compiler.
>
> Add an explict include line for the header that defines these
> structures.
I can grab this.
> Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
> Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
cc:stable?
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/sh/include/uapi/asm/sockios.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/sh/include/uapi/asm/sockios.h b/arch/sh/include/uapi/asm/sockios.h
> index 3da561453260..ef01ced9e169 100644
> --- a/arch/sh/include/uapi/asm/sockios.h
> +++ b/arch/sh/include/uapi/asm/sockios.h
> @@ -2,6 +2,8 @@
> #ifndef __ASM_SH_SOCKIOS_H
> #define __ASM_SH_SOCKIOS_H
>
> +#include <linux/time_types.h>
> +
> /* Socket-level I/O control calls. */
> #define FIOGETOWN _IOR('f', 123, int)
> #define FIOSETOWN _IOW('f', 124, int)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] sh: include linux/time_types.h for sockios
2020-05-20 1:10 ` Andrew Morton
@ 2020-05-20 8:32 ` Arnd Bergmann
2020-05-20 11:47 ` Geert Uytterhoeven
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2020-05-20 8:32 UTC (permalink / raw)
To: Andrew Morton
Cc: Yoshinori Sato, Rich Felker, David S. Miller,
John Paul Adrian Glaubitz, Linux-sh list, linux-kernel
On Wed, May 20, 2020 at 3:10 AM Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> > Using the socket ioctls on arch/sh (and only there) causes build
> > time problems when __kernel_old_timeval/__kernel_old_timespec are
> > not already visible to the compiler.
> >
> > Add an explict include line for the header that defines these
> > structures.
>
> I can grab this.
Thanks!
> > Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
> > Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
>
> cc:stable?
Yes, I missed that.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] sh: include linux/time_types.h for sockios
2020-05-20 8:32 ` Arnd Bergmann
@ 2020-05-20 11:47 ` Geert Uytterhoeven
2020-05-20 14:46 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2020-05-20 11:47 UTC (permalink / raw)
To: Arnd Bergmann, Andrew Morton
Cc: Yoshinori Sato, Rich Felker, David S. Miller,
John Paul Adrian Glaubitz, Linux-sh list, linux-kernel
Hi Arnd, Andrew,
On Wed, May 20, 2020 at 10:32 AM Arnd Bergmann <arnd@arndb.de> wrote:
> On Wed, May 20, 2020 at 3:10 AM Andrew Morton <akpm@linux-foundation.org> wrote:
> > On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> > > Using the socket ioctls on arch/sh (and only there) causes build
> > > time problems when __kernel_old_timeval/__kernel_old_timespec are
> > > not already visible to the compiler.
> > >
> > > Add an explict include line for the header that defines these
> > > structures.
> >
> > I can grab this.
>
> Thanks!
>
> > > Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
> > > Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
> >
> > cc:stable?
>
> Yes, I missed that.
Doesn't matter, the stable bots will pick it up anyway, based on the Fixes tag.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] sh: include linux/time_types.h for sockios
2020-05-20 11:47 ` Geert Uytterhoeven
@ 2020-05-20 14:46 ` Arnd Bergmann
2020-05-20 14:51 ` Geert Uytterhoeven
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2020-05-20 14:46 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Andrew Morton, Yoshinori Sato, Rich Felker, David S. Miller,
John Paul Adrian Glaubitz, Linux-sh list, linux-kernel
On Wed, May 20, 2020 at 1:47 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Wed, May 20, 2020 at 10:32 AM Arnd Bergmann <arnd@arndb.de> wrote:
> > On Wed, May 20, 2020 at 3:10 AM Andrew Morton <akpm@linux-foundation.org> wrote:
> > > On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> > > > Using the socket ioctls on arch/sh (and only there) causes build
> > > > time problems when __kernel_old_timeval/__kernel_old_timespec are
> > > > not already visible to the compiler.
> > > >
> > > > Add an explict include line for the header that defines these
> > > > structures.
> > >
> > > I can grab this.
> >
> > Thanks!
> >
> > > > Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > > Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > > Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
> > > > Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
> > >
> > > cc:stable?
> >
> > Yes, I missed that.
>
> Doesn't matter, the stable bots will pick it up anyway, based on the Fixes tag.
I normally prefer to be explicit, as some bug fixes may address
something that has been caused by an earlier commit, but should not
be backported for some reason.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] sh: include linux/time_types.h for sockios
2020-05-20 14:46 ` Arnd Bergmann
@ 2020-05-20 14:51 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2020-05-20 14:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Morton, Yoshinori Sato, Rich Felker, David S. Miller,
John Paul Adrian Glaubitz, Linux-sh list, linux-kernel
Hi Arnd,
On Wed, May 20, 2020 at 4:46 PM Arnd Bergmann <arnd@arndb.de> wrote:
> On Wed, May 20, 2020 at 1:47 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > On Wed, May 20, 2020 at 10:32 AM Arnd Bergmann <arnd@arndb.de> wrote:
> > > On Wed, May 20, 2020 at 3:10 AM Andrew Morton <akpm@linux-foundation.org> wrote:
> > > > On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> > > > > Using the socket ioctls on arch/sh (and only there) causes build
> > > > > time problems when __kernel_old_timeval/__kernel_old_timespec are
> > > > > not already visible to the compiler.
> > > > >
> > > > > Add an explict include line for the header that defines these
> > > > > structures.
> > > >
> > > > I can grab this.
> > >
> > > Thanks!
> > >
> > > > > Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > > > Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> > > > > Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers")
> > > > > Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps")
> > > >
> > > > cc:stable?
> > >
> > > Yes, I missed that.
> >
> > Doesn't matter, the stable bots will pick it up anyway, based on the Fixes tag.
>
> I normally prefer to be explicit, as some bug fixes may address
> something that has been caused by an earlier commit, but should not
> be backported for some reason.
Which means that with the current "intelligent' backporting, you need a
Not-for-stable tag instead...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-20 14:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 13:13 [PATCH] sh: include linux/time_types.h for sockios Arnd Bergmann
2020-05-20 1:10 ` Andrew Morton
2020-05-20 8:32 ` Arnd Bergmann
2020-05-20 11:47 ` Geert Uytterhoeven
2020-05-20 14:46 ` Arnd Bergmann
2020-05-20 14:51 ` Geert Uytterhoeven
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 NNTP newsgroup(s).