summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/timex.h
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-05-21 13:46:05 +0400
committerCatalin Marinas <catalin.marinas@arm.com>2013-06-10 20:58:20 +0400
commit6916b14ea140ff5c915895eefe9431888a39a84d (patch)
tree4b12c1174adcb73d652a88dc00fbff9fec39e865 /arch/arm64/include/asm/timex.h
parent737c16dffc458e58ee7840556d43b874cb8e16a0 (diff)
downloadlinux-6916b14ea140ff5c915895eefe9431888a39a84d.tar.xz
arm64: kernel: compiling issue, need delete read_current_timer()
Under arm64, we will calibrate the delay loop statically using a known timer frequency, so delete read_current_timer(), or it will cause compiling issue with allmodconfig. The related error: ERROR: "read_current_timer" [lib/rbtree_test.ko] undefined! ERROR: "read_current_timer" [lib/interval_tree_test.ko] undefined! ERROR: "read_current_timer" [fs/ext4/ext4.ko] undefined! ERROR: "read_current_timer" [crypto/tcrypt.ko] undefined! Signed-off-by: Chen Gang <gang.chen@asianux.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/timex.h')
-rw-r--r--arch/arm64/include/asm/timex.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/timex.h b/arch/arm64/include/asm/timex.h
index b24a31a7e2c9..81a076eb37fa 100644
--- a/arch/arm64/include/asm/timex.h
+++ b/arch/arm64/include/asm/timex.h
@@ -16,14 +16,14 @@
#ifndef __ASM_TIMEX_H
#define __ASM_TIMEX_H
+#include <asm/arch_timer.h>
+
/*
* Use the current timer as a cycle counter since this is what we use for
* the delay loop.
*/
-#define get_cycles() ({ cycles_t c; read_current_timer(&c); c; })
+#define get_cycles() arch_counter_get_cntvct()
#include <asm-generic/timex.h>
-#define ARCH_HAS_READ_CURRENT_TIMER
-
#endif