Re: [PATCH] sh: include linux/time_types.h for sockios

From: Andrew Morton
Date: Tue May 19 2020 - 21:10:37 EST


On Tue, 19 May 2020 15:13:13 +0200 Arnd Bergmann <arnd@xxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx>
> Tested-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxx>
> ---
> 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)