struct compat_shmid64_ds: Don't split time attributes with two ulongs, use single longs. struct compat_ipc64_perm: In arm64 'mode' is an unsigned int instead of a short. No need for padding in that case.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com --- arch/arm64/include/asm/compat.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 962f954fd194..e4073c91ea73 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -127,8 +127,12 @@ struct compat_ipc64_perm { __compat_gid32_t gid; __compat_uid32_t cuid; __compat_gid32_t cgid; +#ifdef CONFIG_COMPAT64 + unsigned int mode; +#else unsigned short mode; unsigned short __pad1; +#endif unsigned short seq; unsigned short __pad2; compat_ulong_t unused1; @@ -166,12 +170,18 @@ struct compat_msqid64_ds { struct compat_shmid64_ds { struct compat_ipc64_perm shm_perm; compat_size_t shm_segsz; +#ifdef CONFIG_COMPAT64 + compat_long_t shm_atime; + compat_long_t shm_dtime; + compat_long_t shm_ctime; +#else compat_ulong_t shm_atime; compat_ulong_t shm_atime_high; compat_ulong_t shm_dtime; compat_ulong_t shm_dtime_high; compat_ulong_t shm_ctime; compat_ulong_t shm_ctime_high; +#endif compat_pid_t shm_cpid; compat_pid_t shm_lpid; compat_ulong_t shm_nattch;