---

yaml --- r: 253897 b: refs/heads/master c: 650f156 h: refs/heads/master i: 253895: ce95e00 v: v3
git-mirror · Jun 17, 2011 · 303625c · 303625c
1 parent 5c79e16
commit 303625c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)