diff options
| author | Linus Torvalds | 2016-11-23 22:15:15 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-11-23 22:15:15 +0100 |
| commit | 4d92c8d036a7f1c9671eb672e7623925f5274737 (patch) | |
| tree | 6531618af4a41adfc421fed8131d8263e59f1b8d | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | tile: avoid using clocksource_cyc2ns with absolute cycle count (diff) | |
| download | kernel-qcow2-linux-4d92c8d036a7f1c9671eb672e7623925f5274737.tar.gz kernel-qcow2-linux-4d92c8d036a7f1c9671eb672e7623925f5274737.tar.xz kernel-qcow2-linux-4d92c8d036a7f1c9671eb672e7623925f5274737.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile bugfix from Chris Metcalf:
"This fixes a bug that causes reboots after 208 days of uptime :-)"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: avoid using clocksource_cyc2ns with absolute cycle count
| -rw-r--r-- | arch/tile/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index 178989e6d3e3..ea960d660917 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -218,8 +218,8 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num) */ unsigned long long sched_clock(void) { - return clocksource_cyc2ns(get_cycles(), - sched_clock_mult, SCHED_CLOCK_SHIFT); + return mult_frac(get_cycles(), + sched_clock_mult, 1ULL << SCHED_CLOCK_SHIFT); } int setup_profiling_timer(unsigned int multiplier) |