diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:04:12 +0000 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 10:17:58 -0700 |
commit | a016a5bd62e29a738531d9d4d925037a1fdb52f5 (patch) | |
tree | fae4bd36497978838b685ffa0e3a274673716ef1 /kernel/time | |
parent | 7c032df5570388044b4efda3d9f4d2ffb96a3116 (diff) | |
download | linux-stable-a016a5bd62e29a738531d9d4d925037a1fdb52f5.tar.gz linux-stable-a016a5bd62e29a738531d9d4d925037a1fdb52f5.tar.bz2 linux-stable-a016a5bd62e29a738531d9d4d925037a1fdb52f5.zip |
timekeeping: Use ktime_t based data for ktime_get()
Speed up ktime_get() by using ktime_t based data. Text size shrinks by
64 bytes on x8664.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/timekeeping.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 86a92476c027..d5be1425cc03 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -407,18 +407,19 @@ ktime_t ktime_get(void) { struct timekeeper *tk = &tk_core.timekeeper; unsigned int seq; - s64 secs, nsecs; + ktime_t base; + s64 nsecs; WARN_ON(timekeeping_suspended); do { seq = read_seqcount_begin(&tk_core.seq); - secs = tk->xtime_sec + tk->wall_to_monotonic.tv_sec; - nsecs = timekeeping_get_ns(tk) + tk->wall_to_monotonic.tv_nsec; + base = tk->base_mono; + nsecs = timekeeping_get_ns(tk); } while (read_seqcount_retry(&tk_core.seq, seq)); - return ktime_set(secs, nsecs); + return ktime_add_ns(base, nsecs); } EXPORT_SYMBOL_GPL(ktime_get); |