summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-11-18 14:41:02 +0100
committerIngo Molnar <mingo@kernel.org>2019-11-18 14:41:02 +0100
commitb21feab0b865c36b24d7a60b55a10c7033b03159 (patch)
tree17085747485ffad55b90839b43646d453b8e5079 /kernel/time
parenta9723389cc759c891d481de271ac73eeaa123bcb (diff)
parentaf42d3466bdc8f39806b26f593604fdc54140bcb (diff)
downloadlinux-b21feab0b865c36b24d7a60b55a10c7033b03159.tar.bz2
Merge tag 'v5.4-rc8' into sched/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 65eb796610dc..069ca78fb0bf 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -771,7 +771,7 @@ int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts,
/* fill PPS status fields */
pps_fill_timex(txc);
- txc->time.tv_sec = (time_t)ts->tv_sec;
+ txc->time.tv_sec = ts->tv_sec;
txc->time.tv_usec = ts->tv_nsec;
if (!(time_status & STA_NANO))
txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;