Title: [6665] trunk/arch/blackfin/kernel/time-ts.c: [#5244] fixup gptimer merge with mainline
- Revision
- 6665
- Author
- vapier
- Date
- 2009-06-11 17:56:53 -0500 (Thu, 11 Jun 2009)
Log Message
[#5244] fixup gptimer merge with mainline
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/time-ts.c (6664 => 6665)
--- trunk/arch/blackfin/kernel/time-ts.c 2009-06-11 22:21:57 UTC (rev 6664)
+++ trunk/arch/blackfin/kernel/time-ts.c 2009-06-11 22:56:53 UTC (rev 6665)
@@ -59,7 +59,7 @@
return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR;
}
-static cycle_t read_cycles(struct clocksource *cs)
+static cycle_t bfin_read_cycles(struct clocksource *cs)
{
return __bfin_cycles_off + (get_cycles() << __bfin_cycles_mod);
}
@@ -75,7 +75,7 @@
unsigned long long sched_clock(void)
{
- return cycles_2_ns(read_cycles(&bfin_cs_cycles));
+ return cycles_2_ns(bfin_read_cycles(&bfin_cs_cycles));
}
static int __init bfin_cs_cycles_init(void)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
