diff options
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
-rw-r--r-- | arch/arm/mach-msm/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index e7f8e5a4d48f..38b95e949d13 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
@@ -263,13 +263,13 @@ static void __init msm_timer_init(void) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | #ifdef CONFIG_SMP | 265 | #ifdef CONFIG_SMP |
266 | void __cpuinit local_timer_setup(struct clock_event_device *evt) | 266 | int __cpuinit local_timer_setup(struct clock_event_device *evt) |
267 | { | 267 | { |
268 | struct msm_clock *clock = &msm_clocks[MSM_GLOBAL_TIMER]; | 268 | struct msm_clock *clock = &msm_clocks[MSM_GLOBAL_TIMER]; |
269 | 269 | ||
270 | /* Use existing clock_event for cpu 0 */ | 270 | /* Use existing clock_event for cpu 0 */ |
271 | if (!smp_processor_id()) | 271 | if (!smp_processor_id()) |
272 | return; | 272 | return 0; |
273 | 273 | ||
274 | writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); | 274 | writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); |
275 | 275 | ||
@@ -295,6 +295,7 @@ void __cpuinit local_timer_setup(struct clock_event_device *evt) | |||
295 | gic_enable_ppi(clock->irq.irq); | 295 | gic_enable_ppi(clock->irq.irq); |
296 | 296 | ||
297 | clockevents_register_device(evt); | 297 | clockevents_register_device(evt); |
298 | return 0; | ||
298 | } | 299 | } |
299 | 300 | ||
300 | inline int local_timer_ack(void) | 301 | inline int local_timer_ack(void) |