| From 705c4243943e1bcb0db67c0c605ac101d4ab017b Mon Sep 17 00:00:00 2001 |
| From: "Jason A. Donenfeld" <Jason@zx2c4.com> |
| Date: Fri, 21 Jun 2019 22:32:47 +0200 |
| Subject: [PATCH] timekeeping: Use proper ktime_add when adding nsecs in coarse |
| offset |
| |
| commit 0354c1a3cdf31f44b035cfad14d32282e815a572 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c |
| index 44b726bab4bd..d911c8470149 100644 |
| --- a/kernel/time/timekeeping.c |
| +++ b/kernel/time/timekeeping.c |
| @@ -819,7 +819,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); |
| |
| -- |
| 2.27.0 |
| |
