y2038: ipc: fix x32 ABI breakage
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Nov 2019 14:25:04 +0000 (15:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Nov 2019 20:30:12 +0000 (21:30 +0100)
The correct type on x32 is 64-bit wide, same as for the other struct
members around it, so use  __kernel_long_t in place of the original
__kernel_time_t here, corresponding to the rest of the structure.

Fixes: caf5e32d4ea7 ("y2038: ipc: remove __kernel_time_t reference from headers")
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/x86/include/uapi/asm/sembuf.h

index 7c1b156695ba33ccd15b5ddf56aef42c7b49ea57..93030e97269a35b1e4bc58efb318d4e27d342ca6 100644 (file)
@@ -21,9 +21,9 @@ struct semid64_ds {
        unsigned long   sem_ctime;      /* last change time */
        unsigned long   sem_ctime_high;
 #else
-       long            sem_otime;      /* last semop time */
+       __kernel_long_t sem_otime;      /* last semop time */
        __kernel_ulong_t __unused1;
-       long            sem_ctime;      /* last change time */
+       __kernel_long_t sem_ctime;      /* last change time */
        __kernel_ulong_t __unused2;
 #endif
        __kernel_ulong_t sem_nsems;     /* no. of semaphores in array */