diff options
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
-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 = { | |||
187 | .notifier_call = msm_timer_cpu_notify, | 187 | .notifier_call = msm_timer_cpu_notify, |
188 | }; | 188 | }; |
189 | 189 | ||
190 | static notrace u32 msm_sched_clock_read(void) | 190 | static u64 notrace msm_sched_clock_read(void) |
191 | { | 191 | { |
192 | return msm_clocksource.read(&msm_clocksource); | 192 | return msm_clocksource.read(&msm_clocksource); |
193 | } | 193 | } |
@@ -229,7 +229,7 @@ err: | |||
229 | res = clocksource_register_hz(cs, dgt_hz); | 229 | res = clocksource_register_hz(cs, dgt_hz); |
230 | if (res) | 230 | if (res) |
231 | pr_err("clocksource_register failed\n"); | 231 | pr_err("clocksource_register failed\n"); |
232 | setup_sched_clock(msm_sched_clock_read, sched_bits, dgt_hz); | 232 | sched_clock_register(msm_sched_clock_read, sched_bits, dgt_hz); |
233 | } | 233 | } |
234 | 234 | ||
235 | #ifdef CONFIG_OF | 235 | #ifdef CONFIG_OF |