diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-05-19 11:02:10 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 11:02:10 -0300 |
| commit | b7007e1d615b8d4b71c28ebf790c5164fc4491d5 (patch) | |
| tree | 48c35f63dc1101d0d528b5d79c81849b99ca7c6d /kernel/time/timekeeping.c | |
| parent | 38955ef654554c94f4d91bafb9ef5c5f41a4c0f6 (diff) | |
| parent | 0e61b511dd8474280ba674590daa55f30433b7d4 (diff) | |
Merge pull request #565 from philschenker/update-to-5.4.193__update-to-2.3.7__5.4-2.3.x-imx
Update Patchlevel on Branch 5.4-2.3.x-imx from 5.4.161->5.4.193
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4fc2af4367a7..36ed8bad3909 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1236,8 +1236,7 @@ int do_settimeofday64(const struct timespec64 *ts) timekeeping_forward_now(tk); xt = tk_xtime(tk); - ts_delta.tv_sec = ts->tv_sec - xt.tv_sec; - ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec; + ts_delta = timespec64_sub(*ts, xt); if (timespec64_compare(&tk->wall_to_monotonic, &ts_delta) > 0) { ret = -EINVAL; |