diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-06-21 22:32:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-16 08:21:42 +0200 |
| commit | 68829256e1f9ba375080e762f2c82b33a25f55e1 (patch) | |
| tree | 44782fc95044af0b26ef35d0d3f79c45ff98fecd /kernel/time | |
| parent | 1aa38eceb6c006a8bb96f2922cab5d03131d9b41 (diff) | |
| download | linux-stable-68829256e1f9ba375080e762f2c82b33a25f55e1.tar.gz linux-stable-68829256e1f9ba375080e762f2c82b33a25f55e1.tar.bz2 linux-stable-68829256e1f9ba375080e762f2c82b33a25f55e1.zip | |
timekeeping: Use proper ktime_add when adding nsecs in coarse offset
[ Upstream commit 0354c1a3cdf31f44b035cfad14d32282e815a572 ]
While this doesn't actually amount to a real difference, since the macro
evaluates to the same thing, every place else operates on ktime_t using
these functions, so let's not break the pattern.
Fixes: e3ff9c3678b4 ("timekeeping: Repair ktime_get_coarse*() granularity")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/20190621203249.3909-1-Jason@zx2c4.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 443edcddac8a..c2708e1f0c69 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -823,7 +823,7 @@ ktime_t ktime_get_coarse_with_offset(enum tk_offsets offs) } while (read_seqcount_retry(&tk_core.seq, seq)); - return base + nsecs; + return ktime_add_ns(base, nsecs); } EXPORT_SYMBOL_GPL(ktime_get_coarse_with_offset); |