y2038: xtensa: Extend sysvipc data structures

[linux-2.6-block.git] / arch / xtensa / include / uapi / asm / sembuf.h

diff --git a/arch/xtensa/include/uapi/asm/sembuf.h b/arch/xtensa/include/uapi/asm/sembuf.h
index f61b6331a10c055d61da8e112af9ba9be225eab0..09f348d643f11b9d986a2dd4a8730edb394f89c2 100644 (file)
--- a/arch/xtensa/include/uapi/asm/sembuf.h
+++ b/arch/xtensa/include/uapi/asm/sembuf.h
@@ -14,7 +14,6 @@
  * between kernel and user space.
  *
  * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
  * - 2 miscellaneous 32-bit values
  *
  */
@@ -27,15 +26,15 @@
 struct semid64_ds {
        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
 #ifdef __XTENSA_EL__
-       __kernel_time_t sem_otime;              /* last semop time */
-       unsigned long   __unused1;
-       __kernel_time_t sem_ctime;              /* last change time */
-       unsigned long   __unused2;
+       unsigned long   sem_otime;              /* last semop time */
+       unsigned long   sem_otime_high;
+       unsigned long   sem_ctime;              /* last change time */
+       unsigned long   sem_ctime_high;
 #else
-       unsigned long   __unused1;
-       __kernel_time_t sem_otime;              /* last semop time */
-       unsigned long   __unused2;
-       __kernel_time_t sem_ctime;              /* last change time */
+       unsigned long   sem_otime_high;
+       unsigned long   sem_otime;              /* last semop time */
+       unsigned long   sem_ctime_high;
+       unsigned long   sem_ctime;              /* last change time */
 #endif
        unsigned long   sem_nsems;              /* no. of semaphores in array */
        unsigned long   __unused3;