y2038: remove struct definition redirects

We now use 64-bit time_t on all architectures, so the __kernel_timex,
__kernel_timeval and __kernel_timespec redirects can be removed
after having served their purpose.

This makes it all much less confusing, as the __kernel_* types
now always refer to the same layout based on 64-bit time_t across
all 32-bit and 64-bit architectures.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/include/linux/time64.h b/include/linux/time64.h
index 05634afba0db62f0d4bebf743fed5daf7ce2ffe1..f38d382ffec1363ca9dbf4e78d9ee6db968c443e 100644 (file)
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
@@ -7,14 +7,6 @@
 typedef __s64 time64_t;
 typedef __u64 timeu64_t;
 
-/* CONFIG_64BIT_TIME enables new 64 bit time_t syscalls in the compat path
- * and 32-bit emulation.
- */
-#ifndef CONFIG_64BIT_TIME
-#define __kernel_timespec timespec
-#define __kernel_itimerspec itimerspec
-#endif
-
 #include <uapi/linux/time.h>
 
 struct timespec64 {

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 4aff9f0d1367c1942572cd89d8b5f770202dcbab..ce0859763670550750e3d5b7989fb18d36cb1776 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -53,13 +53,6 @@
 #ifndef _LINUX_TIMEX_H
 #define _LINUX_TIMEX_H
 
-/* CONFIG_64BIT_TIME enables new 64 bit time_t syscalls in the compat path
- * and 32-bit emulation.
- */
-#ifndef CONFIG_64BIT_TIME
-#define __kernel_timex timex
-#endif
-
 #include <uapi/linux/timex.h>
 
 #define ADJ_ADJTIME            0x8000  /* switch between adjtime/adjtimex modes */

diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 6b56a2208be7b51032533db95bf26faf3032ee55..b03f8717c3125d2c5be126ad397bd35cacef2b61 100644 (file)
--- a/include/uapi/linux/time.h
+++ b/include/uapi/linux/time.h
@@ -42,19 +42,15 @@ struct itimerval {
        struct timeval it_value;        /* current value */
 };
 
-#ifndef __kernel_timespec
 struct __kernel_timespec {
        __kernel_time64_t       tv_sec;                 /* seconds */
        long long               tv_nsec;                /* nanoseconds */
 };
-#endif
 
-#ifndef __kernel_itimerspec
 struct __kernel_itimerspec {
        struct __kernel_timespec it_interval;    /* timer period */
        struct __kernel_timespec it_value;       /* timer expiration */
 };
-#endif
 
 /*
  * legacy timeval structure, only embedded in structures that

diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h
index a1c6b73016a5a8ab0dbd80c42393991f1016130f..9f517f9010bb6c74c1d06fe72049c1c6200e14b4 100644 (file)
--- a/include/uapi/linux/timex.h
+++ b/include/uapi/linux/timex.h
@@ -97,7 +97,6 @@ struct __kernel_timex_timeval {
        long long               tv_usec;
 };
 
-#ifndef __kernel_timex
 struct __kernel_timex {
        unsigned int modes;     /* mode selector */
        int :32;            /* pad */
@@ -131,7 +130,6 @@ struct __kernel_timex {
        int  :32; int  :32; int  :32; int  :32;
        int  :32; int  :32; int  :32;
 };
-#endif
 
 /*
  * Mode codes (timex.mode)