aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/timex.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include/asm/timex.h')
-rw-r--r--arch/arm/include/asm/timex.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index 3be8de3adab..83f2aa83899 100644
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -12,13 +12,13 @@
#ifndef _ASMARM_TIMEX_H
#define _ASMARM_TIMEX_H
+#ifdef CONFIG_ARCH_MULTIPLATFORM
+#define CLOCK_TICK_RATE 1000000
+#else
#include <mach/timex.h>
+#endif
typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles (void)
-{
- return 0;
-}
+#define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
#endif