From ad66ae93d083ede90431bacf034f29ebd0815d73 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 11 Mar 2014 17:01:34 -0400 Subject: fix sysvipc structures on powerpc these have been wrong for a long time and were never detected or corrected. powerpc needs some gratuitous extra padding/reserved slots in ipc_perm, big-endian ordering for the padding of time_t slots that was intended by the kernel folks to allow a transition to 64-bit time_t, and some minor gratuitous reordering of struct members. --- arch/powerpc/bits/sem.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'arch/powerpc/bits/sem.h') diff --git a/arch/powerpc/bits/sem.h b/arch/powerpc/bits/sem.h index c629b81e..bc2d6d1f 100644 --- a/arch/powerpc/bits/sem.h +++ b/arch/powerpc/bits/sem.h @@ -1,16 +1,10 @@ struct semid_ds { struct ipc_perm sem_perm; + int __unused1; time_t sem_otime; - time_t __unused1; + int __unused2; time_t sem_ctime; - time_t __unused2; -#if __BYTE_ORDER == __LITTLE_ENDIAN - unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; -#else - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; - unsigned short sem_nsems; -#endif - time_t __unused3; - time_t __unused4; + unsigned short __sem_nsems_pad, sem_nsems; + long __unused3; + long __unused4; }; -- cgit v1.2.1