UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Chen Gang 2013-05-21 10:46:05 +01:00 committed by Catalin Marinas
parent 737c16dffc
commit 6916b14ea1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/include/asm/timex.h
View File

@ -16,14 +16,14 @@
#ifndef __ASM_TIMEX_H #ifndef __ASM_TIMEX_H
#define __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 * Use the current timer as a cycle counter since this is what we use for
* the delay loop. * 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> #include <asm-generic/timex.h>
#define ARCH_HAS_READ_CURRENT_TIMER
#endif #endif

6
arch/arm64/kernel/time.c
View File

@ -68,12 +68,6 @@ unsigned long long notrace sched_clock(void)
return arch_timer_read_counter() * sched_clock_mult; return arch_timer_read_counter() * sched_clock_mult;
} }
int read_current_timer(unsigned long *timer_value)
{
*timer_value = arch_timer_read_counter();
return 0;
}
void __init time_init(void) void __init time_init(void)
{ {
u32 arch_timer_rate; u32 arch_timer_rate;