projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import PULS_20160108
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm64
/
kernel
/
time.c
diff --git
a/arch/arm64/kernel/time.c
b/arch/arm64/kernel/time.c
index b0ef18d14c3bec15d444b11f622596de68dff255..3a369aa36714eedc1176dbc4001d079615254ced 100644
(file)
--- a/
arch/arm64/kernel/time.c
+++ b/
arch/arm64/kernel/time.c
@@
-32,6
+32,7
@@
#include <linux/timer.h>
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/irq.h>
#include <linux/delay.h>
+#include <linux/clocksource.h>
#include <clocksource/arm_arch_timer.h>
#include <clocksource/arm_arch_timer.h>
@@
-60,13
+61,6
@@
unsigned long profile_pc(struct pt_regs *regs)
EXPORT_SYMBOL(profile_pc);
#endif
EXPORT_SYMBOL(profile_pc);
#endif
-static u64 sched_clock_mult __read_mostly;
-
-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();
int read_current_timer(unsigned long *timer_value)
{
*timer_value = arch_timer_read_counter();
@@
-77,13
+71,11
@@
void __init time_init(void)
{
u32 arch_timer_rate;
{
u32 arch_timer_rate;
- if (arch_timer_init())
- panic("Unable to initialise architected timer.\n");
+ clocksource_of_init();
arch_timer_rate = arch_timer_get_rate();
arch_timer_rate = arch_timer_get_rate();
-
- /* Cache the sched_clock multiplier to save a divide in the hot path. */
- sched_clock_mult = NSEC_PER_SEC / arch_timer_rate;
+ if (!arch_timer_rate)
+ panic("Unable to initialise architected timer.\n");
/* Calibrate the delay loop directly */
lpj_fine = arch_timer_rate / HZ;
/* Calibrate the delay loop directly */
lpj_fine = arch_timer_rate / HZ;