]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sh: include linux/time_types.h for sockios
authorArnd Bergmann <arnd@arndb.de>
Sat, 23 May 2020 05:23:02 +0000 (22:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 May 2020 17:26:31 +0000 (10:26 -0700)
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.

Fixes: 3d28bac07f4f ("y2038: sh: remove timeval/timespec usage from headers")
Fixes: d5bedf892fe7 ("net: socket: implement 64-bit timestamps")
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20200519131327.1836482-1-arnd@arndb.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/sh/include/uapi/asm/sockios.h

index 3da561453260cbbc3f4e6da45fe267dfc0a053d2..ef01ced9e16963fd0f678014d49e4a10f5fe30bb 100644 (file)
@@ -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)