From: "tip-bot for Jason A. Donenfeld" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, arnd@arndb.de,
mingo@kernel.org, hpa@zytor.com, Jason@zx2c4.com
Subject: [tip:timers/core] timekeeping: Use proper ktime_add when adding nsecs in coarse offset
Date: Sat, 22 Jun 2019 12:28:17 -0700 [thread overview]
Message-ID: <tip-0354c1a3cdf31f44b035cfad14d32282e815a572@git.kernel.org> (raw)
In-Reply-To: <20190621203249.3909-1-Jason@zx2c4.com>
Commit-ID: 0354c1a3cdf31f44b035cfad14d32282e815a572
Gitweb: https://git.kernel.org/tip/0354c1a3cdf31f44b035cfad14d32282e815a572
Author: Jason A. Donenfeld <Jason@zx2c4.com>
AuthorDate: Fri, 21 Jun 2019 22:32:47 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 22 Jun 2019 12:11:27 +0200
timekeeping: Use proper ktime_add when adding nsecs in coarse offset
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
---
kernel/time/timekeeping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
prev parent reply other threads:[~2019-06-22 19:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 20:32 [PATCH v5 1/3] timekeeping: use proper ktime_add when adding nsecs in coarse offset Jason A. Donenfeld
2019-06-21 20:32 ` [PATCH v5 2/3] timekeeping: use proper clock specifier names in functions Jason A. Donenfeld
2019-06-22 19:29 ` [tip:timers/core] timekeeping: Use " tip-bot for Jason A. Donenfeld
2019-06-21 20:32 ` [PATCH v5 3/3] timekeeping: add missing _ns functions for coarse accessors Jason A. Donenfeld
2019-06-21 20:45 ` Arnd Bergmann
2019-06-22 19:29 ` [tip:timers/core] timekeeping: Add " tip-bot for Jason A. Donenfeld
2019-06-22 19:28 ` tip-bot for Jason A. Donenfeld [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-0354c1a3cdf31f44b035cfad14d32282e815a572@git.kernel.org \
--to=tipbot@zytor.com \
--cc=Jason@zx2c4.com \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).