浏览代码

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
Linus Torvalds 8 年之前
父节点
当前提交
4d92c8d036
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/tile/kernel/time.c

+ 2 - 2
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)
 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)
 int setup_profiling_timer(unsigned int multiplier)