diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 14:11:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 14:11:43 -0700 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/blackfin/include/asm/timex.h | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
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 |