diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-04-23 17:07:29 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-04-23 17:07:29 -0400 |
commit | 764cb81cdc0620711d2cef5d06e9ef03c9d84184 (patch) | |
tree | 2a42b808807ed8690bb7b106b428744349ed54ce /arch/blackfin/kernel/time-ts.c | |
parent | 8cab0288c6376b9c00155b0802cbe84118d1ba89 (diff) |
[Blackfin] arch: actually implement get_cycles function
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/time-ts.c')
-rw-r--r-- | arch/blackfin/kernel/time-ts.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index 3aad6d71072..1ce8cb1e498 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/profile.h> | 12 | #include <linux/profile.h> |
13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
14 | #include <linux/time.h> | 14 | #include <linux/time.h> |
15 | #include <linux/timex.h> | ||
15 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
16 | #include <linux/clocksource.h> | 17 | #include <linux/clocksource.h> |
17 | #include <linux/clockchips.h> | 18 | #include <linux/clockchips.h> |
@@ -35,9 +36,7 @@ static inline unsigned long long cycles_2_ns(cycle_t cyc) | |||
35 | 36 | ||
36 | static cycle_t read_cycles(void) | 37 | static cycle_t read_cycles(void) |
37 | { | 38 | { |
38 | unsigned long tmp, tmp2; | 39 | return get_cycles(); |
39 | asm("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2)); | ||
40 | return tmp | ((cycle_t)tmp2 << 32); | ||
41 | } | 40 | } |
42 | 41 | ||
43 | unsigned long long sched_clock(void) | 42 | unsigned long long sched_clock(void) |