diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 20:00:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 20:00:20 +0200 |
commit | b2c3dda6f8f06d825b9b6099f57b906c774141c0 (patch) | |
tree | 72e6e6d21f7f26f1788a6f9e9920225c4430fed0 /arch | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | ntp: Allow TAI-UTC offset to be set to zero (diff) | |
download | linux-b2c3dda6f8f06d825b9b6099f57b906c774141c0.tar.xz linux-b2c3dda6f8f06d825b9b6099f57b906c774141c0.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull time fixes from Ingo Molnar:
"A TIA adjtimex interface extension, and a POSIX compliance ABI fix for
timespec64 users"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ntp: Allow TAI-UTC offset to be set to zero
y2038: Make CONFIG_64BIT_TIME unconditional
Diffstat (limited to 'arch')
-rw-r--r-- | arch/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index f11f0698b148..c47b328eada0 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -781,7 +781,7 @@ config COMPAT_OLD_SIGACTION bool config 64BIT_TIME - def_bool ARCH_HAS_64BIT_TIME + def_bool y help This should be selected by all architectures that need to support new system calls with a 64-bit time_t. This is relevant on all 32-bit |