y2038: mips: Extend sysvipc data structures

[sfrench/cifs-2.6.git] / arch / mips / include / asm / compat.h

diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
index 3e548ee99a2f4ade32a38f13ef3ca87b78be2b94..78675f19440fd677cb416fac5bd3067867f0b740 100644 (file)
--- a/arch/mips/include/asm/compat.h
+++ b/arch/mips/include/asm/compat.h
@@ -37,9 +37,11 @@ typedef struct {
 typedef s32            compat_timer_t;
 typedef s32            compat_key_t;
 
+typedef s16            compat_short_t;
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
 typedef s64            compat_s64;
+typedef u16            compat_ushort_t;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
 typedef u64            compat_u64;
@@ -157,35 +159,35 @@ struct compat_ipc64_perm {
 
 struct compat_semid64_ds {
        struct compat_ipc64_perm sem_perm;
-       compat_time_t   sem_otime;
-       compat_time_t   sem_ctime;
+       compat_ulong_t  sem_otime;
+       compat_ulong_t  sem_ctime;
        compat_ulong_t  sem_nsems;
-       compat_ulong_t  __unused1;
-       compat_ulong_t  __unused2;
+       compat_ulong_t  sem_otime_high;
+       compat_ulong_t  sem_ctime_high;
 };
 
 struct compat_msqid64_ds {
        struct compat_ipc64_perm msg_perm;
 #ifndef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused1;
+       compat_ulong_t  msg_stime_high;
 #endif
-       compat_time_t   msg_stime;
+       compat_ulong_t  msg_stime;
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused1;
+       compat_ulong_t  msg_stime_high;
 #endif
 #ifndef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused2;
+       compat_ulong_t  msg_rtime_high;
 #endif
-       compat_time_t   msg_rtime;
+       compat_ulong_t  msg_rtime;
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused2;
+       compat_ulong_t  msg_rtime_high;
 #endif
 #ifndef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused3;
+       compat_ulong_t  msg_ctime_high;
 #endif
-       compat_time_t   msg_ctime;
+       compat_ulong_t  msg_ctime;
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
-       compat_ulong_t  __unused3;
+       compat_ulong_t  msg_ctime_high;
 #endif
        compat_ulong_t  msg_cbytes;
        compat_ulong_t  msg_qnum;
@@ -199,14 +201,16 @@ struct compat_msqid64_ds {
 struct compat_shmid64_ds {
        struct compat_ipc64_perm shm_perm;
        compat_size_t   shm_segsz;
-       compat_time_t   shm_atime;
-       compat_time_t   shm_dtime;
-       compat_time_t   shm_ctime;
+       compat_ulong_t  shm_atime;
+       compat_ulong_t  shm_dtime;
+       compat_ulong_t  shm_ctime;
        compat_pid_t    shm_cpid;
        compat_pid_t    shm_lpid;
        compat_ulong_t  shm_nattch;
-       compat_ulong_t  __unused1;
-       compat_ulong_t  __unused2;
+       compat_ushort_t shm_atime_high;
+       compat_ushort_t shm_dtime_high;
+       compat_ushort_t shm_ctime_high;
+       compat_ushort_t __unused2;
 };
 
 /* MIPS has unusual order of fields in stack_t */