diff options
author | James Morris <jmorris@namei.org> | 2008-09-22 04:41:56 +0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-09-22 04:41:56 +0400 |
commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /arch/blackfin/include/asm/timex.h | |
parent | f058925b201357fba48d56cc9c1719ae274b2022 (diff) | |
parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/blackfin/include/asm/timex.h')
-rw-r--r-- | arch/blackfin/include/asm/timex.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/timex.h b/arch/blackfin/include/asm/timex.h new file mode 100644 index 000000000000..22b0806161bb --- /dev/null +++ b/arch/blackfin/include/asm/timex.h @@ -0,0 +1,23 @@ +/* + * asm-blackfin/timex.h: cpu cycles! + * + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef _ASM_BLACKFIN_TIMEX_H +#define _ASM_BLACKFIN_TIMEX_H + +#define CLOCK_TICK_RATE 1000000 /* Underlying HZ */ + +typedef unsigned long long cycles_t; + +static inline cycles_t get_cycles(void) +{ + unsigned long tmp, tmp2; + __asm__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2)); + return tmp | ((cycles_t)tmp2 << 32); +} + +#endif |