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>

2 files changed, 0 insertions, 6 deletions

diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 6b56a2208be7..b03f8717c312 100644
--- 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 a1c6b73016a5..9f517f9010bb 100644
--- 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)