diff options
| -rw-r--r-- | arch/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/time/ntp.c | 2 |
2 files changed, 2 insertions, 2 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 |
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index ac5555e25733..8de4f789dc1b 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
| @@ -691,7 +691,7 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, | |||
| 691 | time_constant = max(time_constant, 0l); | 691 | time_constant = max(time_constant, 0l); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | if (txc->modes & ADJ_TAI && txc->constant > 0) | 694 | if (txc->modes & ADJ_TAI && txc->constant >= 0) |
| 695 | *time_tai = txc->constant; | 695 | *time_tai = txc->constant; |
| 696 | 696 | ||
| 697 | if (txc->modes & ADJ_OFFSET) | 697 | if (txc->modes & ADJ_OFFSET) |
