From 303625c80751ed314a82660cad80097769c99240 Mon Sep 17 00:00:00 2001 From: Jeff Ohlstein Date: Fri, 17 Jun 2011 13:55:38 -0700 Subject: [PATCH] --- yaml --- r: 253897 b: refs/heads/master c: 650f156775c2638cc02ed7df31186a09ba79666a h: refs/heads/master i: 253895: ce95e00c99c28c15e8ec10eee22332cf4d6252b0 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-msm/timer.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 209c7f3361e3..d7f7d04c49c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebf30dc91cc8592cd72b004219cfc276b3ad2854 +refs/heads/master: 650f156775c2638cc02ed7df31186a09ba79666a diff --git a/trunk/arch/arm/mach-msm/timer.c b/trunk/arch/arm/mach-msm/timer.c index 9bfdd5ad2441..2232032181be 100644 --- a/trunk/arch/arm/mach-msm/timer.c +++ b/trunk/arch/arm/mach-msm/timer.c @@ -102,7 +102,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs) { struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource); - return readl(clk->global_counter); + /* + * Shift timer count down by a constant due to unreliable lower bits + * on some targets. + */ + return readl(clk->global_counter) >> clk->shift; } static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)