From 1afe5f3e5b504992914362d6c1c0a0af55f3b32b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 29 Jul 2019 18:03:41 -0400 Subject: extricate bits/sem.h from x32 time_t hack various padding fields in the generic bits/sem.h were defined in terms of time_t as a cheap hack standing in for "kernel long", to allow x32 to use the generic version of the file. this was a really bad idea, as it ended up getting copied into lots of arch-specific versions of the bits file, and is a blocker to changing time_t to 64-bit on 32-bit archs. this commit adds an x32-specific version of the header, and changes padding type back from time_t to long (currently the same type on all archs but x32) in the generic header and all the others the hack got copied into. --- arch/generic/bits/sem.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/generic') diff --git a/arch/generic/bits/sem.h b/arch/generic/bits/sem.h index c629b81e..d383d4ea 100644 --- a/arch/generic/bits/sem.h +++ b/arch/generic/bits/sem.h @@ -1,16 +1,16 @@ struct semid_ds { struct ipc_perm sem_perm; time_t sem_otime; - time_t __unused1; + long __unused1; time_t sem_ctime; - time_t __unused2; + long __unused2; #if __BYTE_ORDER == __LITTLE_ENDIAN unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; #else - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; unsigned short sem_nsems; #endif - time_t __unused3; - time_t __unused4; + long __unused3; + long __unused4; }; -- cgit v1.2.1