aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-19 09:05:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-19 09:05:38 -0700
commitea1cd65a648bd98ff9d028a647462d28313aadfd (patch)
treeb1d45b523813129563f43056f2c20ec72228b263 /drivers
parent4907cdca7210c5895311bddcf05a4c85b67d8566 (diff)
parent224aa3ed45c8735ae02bb2ecca002409fa6aa772 (diff)
downloadlinux-linaro-stable-ea1cd65a648bd98ff9d028a647462d28313aadfd.tar.gz
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clocksource/vf_pit_timer.c2
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)
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)