summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-11-08 10:34:03 -0800
committerDavid Brown <davidb@codeaurora.org>2011-11-10 10:36:32 -0800
commit2852ccaed4461365e6627fadb9e214a52fa3c600 (patch)
tree3d3ede5633900e019e2e319f06419d98118ff23e
parent1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff)
downloadblackbird-op-linux-2852ccaed4461365e6627fadb9e214a52fa3c600.tar.gz
blackbird-op-linux-2852ccaed4461365e6627fadb9e214a52fa3c600.zip
msm: timer: Tighten #ifdef for local timer support
It is more correct to only define the local timer support code when CONFIG_LOCAL_TIMERS=y. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org>
-rw-r--r--arch/arm/mach-msm/timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index afeeca52fc66..1cab55983d52 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -279,7 +279,7 @@ static void __init msm_timer_init(void)
}
}
-#ifdef CONFIG_SMP
+#ifdef CONFIG_LOCAL_TIMERS
int __cpuinit local_timer_setup(struct clock_event_device *evt)
{
static bool local_timer_inited;
@@ -321,8 +321,7 @@ void local_timer_stop(struct clock_event_device *evt)
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
disable_percpu_irq(evt->irq);
}
-
-#endif
+#endif /* CONFIG_LOCAL_TIMERS */
struct sys_timer msm_timer = {
.init = msm_timer_init
OpenPOWER on IntegriCloud