From 72cd20061f0071f688240336ad42034ce10e5404 Mon Sep 17 00:00:00 2001 From: Mian Yousaf Kaukab Date: Tue, 22 Jun 2010 11:37:20 +0200 Subject: fix build errors with CPU_IDLE enabled Current PM for Montblanc enables both LOCAL_TIMERS and GENERIC_CLOCKEVENTS_BROADCAST. This causes build error with v2.6.34. This patch fixes this error. The PM scheme should be reviewed for v2.6.34. Signed-off-by: Mian Yousaf Kaukab Change-Id: I941ff47200bb2bb64fda65bad89a4f993c4daa04 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2431 Reviewed-by: Jonas ABERG --- arch/arm/kernel/smp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index a01194e583f..5c383b08afa 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -425,11 +425,14 @@ asmlinkage void __exception do_local_timer(struct pt_regs *regs) #endif #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST -static void smp_timer_broadcast(const struct cpumask *mask) +void smp_timer_broadcast(const struct cpumask *mask) { send_ipi_message(mask, IPI_TIMER); } +#endif +#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && \ + !defined(CONFIG_LOCAL_TIMERS) static void broadcast_timer_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { -- cgit v1.2.3