Commit af378468 authored Nov 21, 2019 by Arnd Bergmann

y2038: ipc: fix x32 ABI breakage



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: caf5e32d ("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>

parent 1c11ca7a

arch/x86/include/uapi/asm/sembuf.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message