---

yaml --- r: 177322 b: refs/heads/master c: c768a94 h: refs/heads/master v: v3
git-mirror · Dec 15, 2009 · 74a4af4 · 74a4af4
1 parent 7327a81
commit 74a4af4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e452e5d3f0066307a28e3a6f06b4b51f0e1594
+refs/heads/master: c768a943fd8f41f5f7ed33c91d50818b301f5635
diff --git a/trunk/arch/blackfin/kernel/time-ts.c b/trunk/arch/blackfin/kernel/time-ts.c
@@ -64,7 +64,8 @@ static struct clocksource bfin_cs_cycles = {
 
 static inline unsigned long long bfin_cs_cycles_sched_clock(void)
 {
-	return cyc2ns(&bfin_cs_cycles, bfin_read_cycles(&bfin_cs_cycles));
+	return clocksource_cyc2ns(bfin_read_cycles(&bfin_cs_cycles),
+		bfin_cs_cycles.mult, bfin_cs_cycles.shift);
 }
 
 static int __init bfin_cs_cycles_init(void)
@@ -111,7 +112,8 @@ static struct clocksource bfin_cs_gptimer0 = {
 
 static inline unsigned long long bfin_cs_gptimer0_sched_clock(void)
 {
-	return cyc2ns(&bfin_cs_gptimer0, bfin_read_TIMER0_COUNTER());
+	return clocksource_cyc2ns(bfin_read_TIMER0_COUNTER(),
+		bfin_cs_gptimer0.mult, bfin_cs_gptimer0.shift);
 }
 
 static int __init bfin_cs_gptimer0_init(void)