summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-23 13:15:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-23 13:15:15 -0800
commit4d92c8d036a7f1c9671eb672e7623925f5274737 (patch)
tree6531618af4a41adfc421fed8131d8263e59f1b8d
parentded9b5dd205ef04aa095c3b731c635b201191a59 (diff)
parente658a6f14d7c0243205f035979d0ecf6c12a036f (diff)
downloadlinux-4d92c8d036a7f1c9671eb672e7623925f5274737.tar.bz2
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.c4
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)