Commit ea1cd65a authored Mar 19, 2014 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single bugfix: make the scheduler clock on Vybrid SoCs count
  forward"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: vf_pit_timer: use complement for sched_clock reading

parents 4907cdca 224aa3ed

drivers/clocksource/vf_pit_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ static inline void pit_irq_acknowledge(void)

		static u64 pit_read_sched_clock(void)
		{
		return __raw_readl(clksrc_base + PITCVAL);
		return ~__raw_readl(clksrc_base + PITCVAL);
		}

		static int __init pit_clocksource_init(unsigned long rate)