Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull time/Y2038 updates from Thomas Gleixner:

 - Consolidate SySV IPC UAPI headers

 - Convert SySV IPC to the new COMPAT_32BIT_TIME mechanism

 - Cleanup the core interfaces and standardize on the ktime_get_* naming
   convention.

 - Convert the X86 platform ops to timespec64

 - Remove the ugly temporary timespec64 hack

* 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  x86: Convert x86_platform_ops to timespec64
  timekeeping: Add more coarse clocktai/boottime interfaces
  timekeeping: Add ktime_get_coarse_with_offset
  timekeeping: Standardize on ktime_get_*() naming
  timekeeping: Clean up ktime_get_real_ts64
  timekeeping: Remove timespec64 hack
  y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop
  y2038: ipc: Enable COMPAT_32BIT_TIME
  y2038: ipc: Use __kernel_timespec
  y2038: ipc: Report long times to user space
  y2038: ipc: Use ktime_get_real_seconds consistently
  y2038: xtensa: Extend sysvipc data structures
  y2038: powerpc: Extend sysvipc data structures
  y2038: sparc: Extend sysvipc data structures
  y2038: parisc: Extend sysvipc data structures
  y2038: mips: Extend sysvipc data structures
  y2038: arm64: Extend sysvipc compat data structures
  y2038: s390: Remove unneeded ipc uapi header files
  y2038: ia64: Remove unneeded ipc uapi header files
  y2038: alpha: Remove unneeded ipc uapi header files
  ...

1 files changed, 16 insertions, 17 deletions

diff --git a/arch/parisc/include/uapi/asm/msgbuf.h b/arch/parisc/include/uapi/asm/msgbuf.h
index b48b810e626b..6a2e9ab2ef8d 100644
--- a/arch/parisc/include/uapi/asm/msgbuf.h
+++ b/arch/parisc/include/uapi/asm/msgbuf.h
@@ -10,31 +10,30 @@
  * between kernel and user space.
  *
  * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
  * - 2 miscellaneous 32-bit values
  */
 
 struct msqid64_ds {
         struct ipc64_perm msg_perm;
-#if __BITS_PER_LONG != 64
-        unsigned int   __pad1;
-#endif
+#if __BITS_PER_LONG == 64
         __kernel_time_t msg_stime;      /* last msgsnd time */
-#if __BITS_PER_LONG != 64
-        unsigned int   __pad2;
-#endif
         __kernel_time_t msg_rtime;      /* last msgrcv time */
-#if __BITS_PER_LONG != 64
-        unsigned int   __pad3;
-#endif
         __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long msg_cbytes;       /* current number of bytes on queue */
-        unsigned long msg_qnum;         /* number of messages in queue */
-        unsigned long msg_qbytes;       /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long __unused1;
-        unsigned long __unused2;
+#else
+        unsigned long   msg_stime_high;
+        unsigned long   msg_stime;      /* last msgsnd time */
+        unsigned long   msg_rtime_high;
+        unsigned long   msg_rtime;      /* last msgrcv time */
+        unsigned long   msg_ctime_high;
+        unsigned long   msg_ctime;      /* last change time */
+#endif
+        unsigned long   msg_cbytes;     /* current number of bytes on queue */
+        unsigned long   msg_qnum;       /* number of messages in queue */
+        unsigned long   msg_qbytes;     /* max number of bytes on queue */
+        __kernel_pid_t  msg_lspid;      /* pid of last msgsnd */
+        __kernel_pid_t  msg_lrpid;      /* last receive pid */
+        unsigned long   __unused1;
+        unsigned long   __unused2;
 };
 
 #endif /* _PARISC_MSGBUF_H */