diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/blackfin/include/asm/timex.h | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
| download | linux-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.tar.xz | |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
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 |