aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2010-06-22 11:37:20 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:38 -0600
commit72cd20061f0071f688240336ad42034ce10e5404 (patch)
treefe7bbb7a6137e5957ab29888c952e5d0e76fb37a /arch
parentdecca87d7da6bc18f577bd67a175e949728ec610 (diff)
downloadlinux-2.6.34-ux500-72cd20061f0071f688240336ad42034ce10e5404.tar.gz
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 <mian.yousaf.kaukab@stericsson.com> Change-Id: I941ff47200bb2bb64fda65bad89a4f993c4daa04 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2431 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/smp.c5
1 files changed, 4 insertions, 1 deletions
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)
{