diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 12:05:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 12:05:38 -0400 |
| commit | ea1cd65a648bd98ff9d028a647462d28313aadfd (patch) | |
| tree | b1d45b523813129563f43056f2c20ec72228b263 | |
| parent | 4907cdca7210c5895311bddcf05a4c85b67d8566 (diff) | |
| parent | 224aa3ed45c8735ae02bb2ecca002409fa6aa772 (diff) | |
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
| -rw-r--r-- | drivers/clocksource/vf_pit_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c index 02821b06a39e..a918bc481c52 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) | |||
| 54 | 54 | ||
| 55 | static u64 pit_read_sched_clock(void) | 55 | static u64 pit_read_sched_clock(void) |
| 56 | { | 56 | { |
| 57 | return __raw_readl(clksrc_base + PITCVAL); | 57 | return ~__raw_readl(clksrc_base + PITCVAL); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static int __init pit_clocksource_init(unsigned long rate) | 60 | static int __init pit_clocksource_init(unsigned long rate) |