diff options
| author | Mike Frysinger | 2008-04-23 23:07:29 +0200 |
|---|---|---|
| committer | Bryan Wu | 2008-04-23 23:07:29 +0200 |
| commit | 764cb81cdc0620711d2cef5d06e9ef03c9d84184 (patch) | |
| tree | 2a42b808807ed8690bb7b106b428744349ed54ce /arch | |
| parent | [Blackfin] arch: add boot messages to quickly distinguish between MPU/NOMPU s... (diff) | |
| download | kernel-qcow2-linux-764cb81cdc0620711d2cef5d06e9ef03c9d84184.tar.gz kernel-qcow2-linux-764cb81cdc0620711d2cef5d06e9ef03c9d84184.tar.xz kernel-qcow2-linux-764cb81cdc0620711d2cef5d06e9ef03c9d84184.zip | |
[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')
| -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 3aad6d710726..1ce8cb1e4982 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c @@ -12,6 +12,7 @@ #include <linux/profile.h> #include <linux/interrupt.h> #include <linux/time.h> +#include <linux/timex.h> #include <linux/irq.h> #include <linux/clocksource.h> #include <linux/clockchips.h> @@ -35,9 +36,7 @@ static inline unsigned long long cycles_2_ns(cycle_t cyc) static cycle_t read_cycles(void) { - unsigned long tmp, tmp2; - asm("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2)); - return tmp | ((cycle_t)tmp2 << 32); + return get_cycles(); } unsigned long long sched_clock(void) |