Skip to content

Commit af37846

Browse files
committed
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: caf5e32 ("y2038: ipc: remove __kernel_time_t reference from headers") Reported-by: Ben Hutchings <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 1c11ca7 commit af37846

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ struct semid64_ds {
2121
unsigned long sem_ctime; /* last change time */
2222
unsigned long sem_ctime_high;
2323
#else
24-
long sem_otime; /* last semop time */
24+
__kernel_long_t sem_otime; /* last semop time */
2525
__kernel_ulong_t __unused1;
26-
long sem_ctime; /* last change time */
26+
__kernel_long_t sem_ctime; /* last change time */
2727
__kernel_ulong_t __unused2;
2828
#endif
2929
__kernel_ulong_t sem_nsems; /* no. of semaphores in array */

0 commit comments

Comments
 (0)