diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-16 11:12:56 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-16 11:12:56 -0400 |
| commit | 898c889bbfca637e857a149bbb2e0b138b48b3e9 (patch) | |
| tree | d48a1fae10b5c24b7e9ca0a37ce681f5dc354bd1 | |
| parent | 6b21d7d72fb17a63222c17cc922e6ca4cf840c1b (diff) | |
| download | longterm-queue-4.18-898c889bbfca637e857a149bbb2e0b138b48b3e9.tar.gz | |
timekeeping: add fix of previous fix
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/timekeeping-Use-proper-ktime_add-when-adding-nsecs-i.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/queue/series b/queue/series index 5203b91..20748a9 100644 --- a/queue/series +++ b/queue/series @@ -231,3 +231,4 @@ blk-mq-move-cancel-of-requeue_work-to-the-front-of-b.patch initramfs-don-t-free-a-non-existent-initrd.patch ipvs-defer-hook-registration-to-avoid-leaks.patch selftests-fib_rule_tests-use-pre-defined-DEV_ADDR.patch +timekeeping-Use-proper-ktime_add-when-adding-nsecs-i.patch diff --git a/queue/timekeeping-Use-proper-ktime_add-when-adding-nsecs-i.patch b/queue/timekeeping-Use-proper-ktime_add-when-adding-nsecs-i.patch new file mode 100644 index 0000000..2211635 --- /dev/null +++ b/queue/timekeeping-Use-proper-ktime_add-when-adding-nsecs-i.patch @@ -0,0 +1,34 @@ +From 0354c1a3cdf31f44b035cfad14d32282e815a572 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 + +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.7.4 + |