Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d92c8d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ded9b5dd e658a6f1

arch/tile/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -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)