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>
This commit is contained in:
parent
00bf25d693
commit
c70a772fda
|
@ -7,14 +7,6 @@
|
||||||
typedef __s64 time64_t;
|
typedef __s64 time64_t;
|
||||||
typedef __u64 timeu64_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>
|
#include <uapi/linux/time.h>
|
||||||
|
|
||||||
struct timespec64 {
|
struct timespec64 {
|
||||||
|
|
|
@ -53,13 +53,6 @@
|
||||||
#ifndef _LINUX_TIMEX_H
|
#ifndef _LINUX_TIMEX_H
|
||||||
#define _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>
|
#include <uapi/linux/timex.h>
|
||||||
|
|
||||||
#define ADJ_ADJTIME 0x8000 /* switch between adjtime/adjtimex modes */
|
#define ADJ_ADJTIME 0x8000 /* switch between adjtime/adjtimex modes */
|
||||||
|
|
|
@ -42,19 +42,15 @@ struct itimerval {
|
||||||
struct timeval it_value; /* current value */
|
struct timeval it_value; /* current value */
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef __kernel_timespec
|
|
||||||
struct __kernel_timespec {
|
struct __kernel_timespec {
|
||||||
__kernel_time64_t tv_sec; /* seconds */
|
__kernel_time64_t tv_sec; /* seconds */
|
||||||
long long tv_nsec; /* nanoseconds */
|
long long tv_nsec; /* nanoseconds */
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __kernel_itimerspec
|
|
||||||
struct __kernel_itimerspec {
|
struct __kernel_itimerspec {
|
||||||
struct __kernel_timespec it_interval; /* timer period */
|
struct __kernel_timespec it_interval; /* timer period */
|
||||||
struct __kernel_timespec it_value; /* timer expiration */
|
struct __kernel_timespec it_value; /* timer expiration */
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* legacy timeval structure, only embedded in structures that
|
* legacy timeval structure, only embedded in structures that
|
||||||
|
|
|
@ -97,7 +97,6 @@ struct __kernel_timex_timeval {
|
||||||
long long tv_usec;
|
long long tv_usec;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef __kernel_timex
|
|
||||||
struct __kernel_timex {
|
struct __kernel_timex {
|
||||||
unsigned int modes; /* mode selector */
|
unsigned int modes; /* mode selector */
|
||||||
int :32; /* pad */
|
int :32; /* pad */
|
||||||
|
@ -131,7 +130,6 @@ struct __kernel_timex {
|
||||||
int :32; int :32; int :32; int :32;
|
int :32; int :32; int :32; int :32;
|
||||||
int :32; int :32; int :32;
|
int :32; int :32; int :32;
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mode codes (timex.mode)
|
* Mode codes (timex.mode)
|
||||||
|
|
Loading…
Reference in New Issue