summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorLinus Torvalds2019-05-16 20:00:20 +0200
committerLinus Torvalds2019-05-16 20:00:20 +0200
commitb2c3dda6f8f06d825b9b6099f57b906c774141c0 (patch)
tree72e6e6d21f7f26f1788a6f9e9920225c4430fed0 /kernel/time
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentntp: Allow TAI-UTC offset to be set to zero (diff)
downloadkernel-qcow2-linux-b2c3dda6f8f06d825b9b6099f57b906c774141c0.tar.gz
kernel-qcow2-linux-b2c3dda6f8f06d825b9b6099f57b906c774141c0.tar.xz
kernel-qcow2-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 'kernel/time')
-rw-r--r--kernel/time/ntp.c2
1 files changed, 1 insertions, 1 deletions
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,
time_constant = max(time_constant, 0l);
}
- if (txc->modes & ADJ_TAI && txc->constant > 0)
+ if (txc->modes & ADJ_TAI && txc->constant >= 0)
*time_tai = txc->constant;
if (txc->modes & ADJ_OFFSET)