diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
| commit | 74392592bbf7e93ef383588e21aea0c1450d6f12 (patch) | |
| tree | 086981f9ef51d57a34fbc5fde8095652877cf739 /arch/blackfin/kernel/time-ts.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 (diff) | |
| parent | Fix caller information for warn_slowpath_null (diff) | |
| download | linux-dev-74392592bbf7e93ef383588e21aea0c1450d6f12.tar.xz linux-dev-74392592bbf7e93ef383588e21aea0c1450d6f12.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/blackfin/kernel/time-ts.c')
| -rw-r--r-- | arch/blackfin/kernel/time-ts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index 0ed2badfd746..27646121280a 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c @@ -58,16 +58,11 @@ static inline unsigned long long cycles_2_ns(cycle_t cyc) return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR; } -static cycle_t read_cycles(void) +static cycle_t read_cycles(struct clocksource *cs) { return __bfin_cycles_off + (get_cycles() << __bfin_cycles_mod); } -unsigned long long sched_clock(void) -{ - return cycles_2_ns(read_cycles()); -} - static struct clocksource clocksource_bfin = { .name = "bfin_cycles", .rating = 350, @@ -77,6 +72,11 @@ static struct clocksource clocksource_bfin = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; +unsigned long long sched_clock(void) +{ + return cycles_2_ns(read_cycles(&clocksource_bfin)); +} + static int __init bfin_clocksource_init(void) { set_cyc2ns_scale(get_cclk() / 1000); |