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

ea1cd65a · Linus Torvalds <[email protected]> · 2014-03-19 09:05:38 -07:00

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

Commit: ea1cd65a648bd98ff9d028a647462d28313aadfd
Parents: 4907cdca · 224aa3ed

Merge commit. Changes below are compared with the first parent: 4907cdca.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/clocksource/vf_pit_timer.c	modified	+1	−1	View file

drivers/clocksource/vf_pit_timer.c

View file

diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c
index 02821b0..a918bc4 100644
--- a/drivers/clocksource/vf_pit_timer.c
+++ b/drivers/clocksource/vf_pit_timer.c
@@ -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)