diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-16 03:26:16 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-22 03:41:00 +0400 |
| commit | 6aa16a26585520993b5e464471550d8d1b8364c9 (patch) | |
| tree | 8e5b6da21c4e1292ee2d0f7205838eb93804f3ae /arch/arm/mach-msm | |
| parent | e5c0228d61f5802a14be901ae7fb97781c125987 (diff) | |
| download | linux-6aa16a26585520993b5e464471550d8d1b8364c9.tar.xz | |
ARM: msm: Switch to sched_clock_register()
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>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 1e9c3383daba..fd1644987534 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -187,7 +187,7 @@ static struct notifier_block msm_timer_cpu_nb = { .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); } @@ -229,7 +229,7 @@ err: res = clocksource_register_hz(cs, dgt_hz); if (res) 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 |