sh: include linux/time_types.h for sockios
diff mbox series

Message ID 20200519131327.1836482-1-arnd@arndb.de
State New
Headers show
Series
  • sh: include linux/time_types.h for sockios
Related show

Commit Message

Arnd Bergmann May 19, 2020, 1:13 p.m. UTC
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(+)

Comments

Andrew Morton May 20, 2020, 1:10 a.m. UTC | #1
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)
Arnd Bergmann May 20, 2020, 8:32 a.m. UTC | #2
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
Geert Uytterhoeven May 20, 2020, 11:47 a.m. UTC | #3
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
Arnd Bergmann May 20, 2020, 2:46 p.m. UTC | #4
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
Geert Uytterhoeven May 20, 2020, 2:51 p.m. UTC | #5
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

Patch
diff mbox series

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)