Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6916b14e authored by Chen Gang's avatar Chen Gang Committed by Catalin Marinas
Browse files

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: default avatarChen Gang <gang.chen@asianux.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 737c16df

arch/arm64/include/asm/timex.h

+3 −3
Original line number Diff line number Diff line
@@ -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

arch/arm64/kernel/time.c

+0 −6
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ unsigned long long notrace sched_clock(void) 
	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)

{

	u32 arch_timer_rate;