diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-03-04 20:15:19 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-24 20:45:58 -0400 |
commit | 3d53ceeca7bae807e5aba0935347f3757127a821 (patch) | |
tree | 27533abf1d3fb1aa7c32d862c47577b060bc8cfe /arch/arm/kernel | |
parent | 42cba6e27c4cddc4df701c597dbfa666e1c013c8 (diff) |
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/arm/kernel')
-rw-r--r-- | arch/arm/kernel/smp.c | 22 |
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) | |||
503 | } | 503 | } |
504 | #endif | 504 | #endif |
505 | 505 | ||
506 | static void broadcast_timer_set_mode(enum clock_event_mode mode, | ||
507 | struct clock_event_device *evt) | ||
508 | { | ||
509 | } | ||
510 | |||
511 | static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt) | ||
512 | { | ||
513 | evt->name = "dummy_timer"; | ||
514 | evt->features = CLOCK_EVT_FEAT_ONESHOT | | ||
515 | CLOCK_EVT_FEAT_PERIODIC | | ||
516 | CLOCK_EVT_FEAT_DUMMY; | ||
517 | evt->rating = 100; | ||
518 | evt->mult = 1; | ||
519 | evt->set_mode = broadcast_timer_set_mode; | ||
520 | |||
521 | clockevents_register_device(evt); | ||
522 | } | ||
523 | |||
524 | static struct local_timer_ops *lt_ops; | 506 | static struct local_timer_ops *lt_ops; |
525 | 507 | ||
526 | #ifdef CONFIG_LOCAL_TIMERS | 508 | #ifdef CONFIG_LOCAL_TIMERS |
@@ -544,8 +526,8 @@ static void __cpuinit percpu_timer_setup(void) | |||
544 | 526 | ||
545 | evt->cpumask = cpumask_of(cpu); | 527 | evt->cpumask = cpumask_of(cpu); |
546 | 528 | ||
547 | if (!lt_ops || lt_ops->setup(evt)) | 529 | if (lt_ops) |
548 | broadcast_timer_setup(evt); | 530 | lt_ops->setup(evt); |
549 | } | 531 | } |
550 | 532 | ||
551 | #ifdef CONFIG_HOTPLUG_CPU | 533 | #ifdef CONFIG_HOTPLUG_CPU |