summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-03-05 02:15:19 +0100
committerStephen Boyd <sboyd@codeaurora.org>2013-06-25 02:45:58 +0200
commit3d53ceeca7bae807e5aba0935347f3757127a821 (patch)
tree27533abf1d3fb1aa7c32d862c47577b060bc8cfe /arch
parentMerge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff)
downloadlinux-3d53ceeca7bae807e5aba0935347f3757127a821.tar.xz
linux-3d53ceeca7bae807e5aba0935347f3757127a821.zip
ARM: smp: Remove duplicate dummy timer implementation
Drop ARM's version of the dummy timer now that we have a generic implementation in drivers/clocksource. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/smp.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 47ab90563bf4..4dc883a77adc 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -503,24 +503,6 @@ void tick_broadcast(const struct cpumask *mask)
}
#endif
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
- struct clock_event_device *evt)
-{
-}
-
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
-{
- evt->name = "dummy_timer";
- evt->features = CLOCK_EVT_FEAT_ONESHOT |
- CLOCK_EVT_FEAT_PERIODIC |
- CLOCK_EVT_FEAT_DUMMY;
- evt->rating = 100;
- evt->mult = 1;
- evt->set_mode = broadcast_timer_set_mode;
-
- clockevents_register_device(evt);
-}
-
static struct local_timer_ops *lt_ops;
#ifdef CONFIG_LOCAL_TIMERS
@@ -544,8 +526,8 @@ static void __cpuinit percpu_timer_setup(void)
evt->cpumask = cpumask_of(cpu);
- if (!lt_ops || lt_ops->setup(evt))
- broadcast_timer_setup(evt);
+ if (lt_ops)
+ lt_ops->setup(evt);
}
#ifdef CONFIG_HOTPLUG_CPU