summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-12-04 03:32:11 +0000
committerMike Frysinger <vapier@gentoo.org>2009-12-15 00:16:47 -0500
commitc768a943fd8f41f5f7ed33c91d50818b301f5635 (patch)
treeaa6e1eaf58f3f1dfc23d434ea5dc60ef9ce72bfc /arch/blackfin
parent99e452e5d3f0066307a28e3a6f06b4b51f0e1594 (diff)
downloadlinux-c768a943fd8f41f5f7ed33c91d50818b301f5635.tar.bz2
Blackfin: convert cyc2ns() to clocksource_cyc2ns()
The former no longer exists. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/time-ts.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index eef528389d2f..17c38c5b5b22 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/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)