Title: [7933] trunk/arch/blackfin/kernel/time-ts.c: blackfin: convert cyc2ns() to clocksource_cyc2ns()
- Revision
- 7933
- Author
- vapier
- Date
- 2009-12-03 22:32:11 -0500 (Thu, 03 Dec 2009)
Log Message
blackfin: convert cyc2ns() to clocksource_cyc2ns()
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/time-ts.c (7932 => 7933)
--- trunk/arch/blackfin/kernel/time-ts.c 2009-12-04 03:19:07 UTC (rev 7932)
+++ trunk/arch/blackfin/kernel/time-ts.c 2009-12-04 03:32:11 UTC (rev 7933)
@@ -64,7 +64,8 @@
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 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)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
