diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 14:00:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 14:00:20 -0400 |
| commit | b2c3dda6f8f06d825b9b6099f57b906c774141c0 (patch) | |
| tree | 72e6e6d21f7f26f1788a6f9e9920225c4430fed0 /arch/Kconfig | |
| parent | c77ee64f8a04166236666dfd540ff684d2daa1c0 (diff) | |
| parent | fdc6bae940ee9eb869e493990540098b8c0fd6ab (diff) | |
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/Kconfig')
| -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 | |||
| 781 | bool | 781 | bool |
| 782 | 782 | ||
| 783 | config 64BIT_TIME | 783 | config 64BIT_TIME |
| 784 | def_bool ARCH_HAS_64BIT_TIME | 784 | def_bool y |
| 785 | help | 785 | help |
| 786 | This should be selected by all architectures that need to support | 786 | This should be selected by all architectures that need to support |
| 787 | new system calls with a 64-bit time_t. This is relevant on all 32-bit | 787 | new system calls with a 64-bit time_t. This is relevant on all 32-bit |