Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-17 08:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: msm: Switch to sched_clock_register()

Browse Source 
The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Stephen Boyd 2013-11-15 15:26:16 -08:00 committed by Kevin Hilman
parent e5c0228d61
commit 6aa16a2658
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-msm/timer.c
View File

@ -187,7 +187,7 @@ static struct notifier_block msm_timer_cpu_nb = {
.notifier_call = msm_timer_cpu_notify, .notifier_call = msm_timer_cpu_notify,
}; };
static notrace u32 msm_sched_clock_read(void) static u64 notrace msm_sched_clock_read(void)
{ {
return msm_clocksource.read(&msm_clocksource); return msm_clocksource.read(&msm_clocksource);
} }
@ -229,7 +229,7 @@ err:
res = clocksource_register_hz(cs, dgt_hz); res = clocksource_register_hz(cs, dgt_hz);
if (res) if (res)
pr_err("clocksource_register failed\n"); pr_err("clocksource_register failed\n");
setup_sched_clock(msm_sched_clock_read, sched_bits, dgt_hz); sched_clock_register(msm_sched_clock_read, sched_bits, dgt_hz);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF