On 05/13/13 12:26, Stephen Boyd wrote: > Drop ARM's version of the dummy timer now that we have a generic > implementation in drivers/clocksource. > > Cc: Russell King <linux@xxxxxxxxxxxxxxxx> > Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Russell, can you please ack this patch and patch #11? > --- > arch/arm/kernel/smp.c | 22 ++-------------------- > 1 file changed, 2 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c > index 47ab905..4dc883a 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 -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html