diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-12-11 23:07:23 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-12-18 20:07:33 +0300 |
| commit | 251ec1c159e4874fbede0c3c586e317e177c0c9b (patch) | |
| tree | 2ede8d79d52784d89046f6de080b2dbec8d535b0 /include/uapi/linux/timex.h | |
| parent | 4f9fbd893fe83a1193adceca41c8f7aa6c7382a1 (diff) | |
| download | linux-251ec1c159e4874fbede0c3c586e317e177c0c9b.tar.xz | |
y2038: sparc: remove use of struct timex
'struct timex' is one of the last users of 'struct timeval' and is
only referenced in one place in the kernel any more, to convert the
user space timex into the kernel-internal version on sparc64, with a
different tv_usec member type.
As a preparation for hiding the time_t definition and everything
using that in the kernel, change the implementation once more
to only convert the timeval member, and then enclose the
struct definition in an #ifdef.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/uapi/linux/timex.h')
| -rw-r--r-- | include/uapi/linux/timex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h index 9f517f9010bb..bd627c368d09 100644 --- a/include/uapi/linux/timex.h +++ b/include/uapi/linux/timex.h @@ -57,6 +57,7 @@ #define NTP_API 4 /* NTP API version */ +#ifndef __KERNEL__ /* * syscall interface - used (mainly by NTP daemon) * to discipline kernel clock oscillator @@ -91,6 +92,7 @@ struct timex { int :32; int :32; int :32; int :32; int :32; int :32; int :32; }; +#endif struct __kernel_timex_timeval { __kernel_time64_t tv_sec; |