Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

torvalds · torvalds · commit 4d92c8d036a7 · 2016-11-23T13:15:15.000-08:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num)`
`218`	`218`	`*/`
`219`	`219`	`unsigned long long sched_clock(void)`
`220`	`220`	`{`
`221`		`- return clocksource_cyc2ns(get_cycles(),`
`222`		`- sched_clock_mult, SCHED_CLOCK_SHIFT);`
	`221`	`+ return mult_frac(get_cycles(),`
	`222`	`+ sched_clock_mult, 1ULL << SCHED_CLOCK_SHIFT);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`int setup_profiling_timer(unsigned int multiplier)`