diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:04:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:04:48 +0100 |
commit | 78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch) | |
tree | c6ceab663de16501d1dda1c1596fe2dacaaef8e3 /arch/cris/include/asm/timex.h | |
parent | 9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff) | |
parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
download | op-kernel-dev-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.zip op-kernel-dev-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.tar.gz |
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'arch/cris/include/asm/timex.h')
-rw-r--r-- | arch/cris/include/asm/timex.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/cris/include/asm/timex.h b/arch/cris/include/asm/timex.h new file mode 100644 index 0000000..980924a --- /dev/null +++ b/arch/cris/include/asm/timex.h @@ -0,0 +1,24 @@ +/* + * linux/include/asm-cris/timex.h + * + * CRIS architecture timex specifications + */ + +#ifndef _ASM_CRIS_TIMEX_H +#define _ASM_CRIS_TIMEX_H + +#include <arch/timex.h> + +/* + * We don't have a cycle-counter.. but we do not support SMP anyway where this is + * used so it does not matter. + */ + +typedef unsigned long long cycles_t; + +static inline cycles_t get_cycles(void) +{ + return 0; +} + +#endif |