diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 19:23:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 19:23:18 +0200 |
| commit | 604a830d4fb5bf2334263bd597de22652e63b7e6 (patch) | |
| tree | 6e7c52a829d3bbad08dc42787b3db150c3457c7d /kernel | |
| parent | Merge branch 'printk-cleanups' (diff) | |
| parent | timekeeping: Fix __ktime_get_fast_ns() regression (diff) | |
| download | linux-604a830d4fb5bf2334263bd597de22652e63b7e6.tar.xz linux-604a830d4fb5bf2334263bd597de22652e63b7e6.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A single fix for a regression introduced in 4.8 which causes the
trace/perf clock to return random nonsense if CONFIG_DEBUG_TIMEKEEPING
is set"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Fix __ktime_get_fast_ns() regression
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/timekeeping.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e07fb093f819..37dec7e3db43 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -403,8 +403,11 @@ static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf) tkr = tkf->base + (seq & 0x01); now = ktime_to_ns(tkr->base); - now += clocksource_delta(tkr->read(tkr->clock), - tkr->cycle_last, tkr->mask); + now += timekeeping_delta_to_ns(tkr, + clocksource_delta( + tkr->read(tkr->clock), + tkr->cycle_last, + tkr->mask)); } while (read_seqcount_retry(&tkf->seq, seq)); return now; |