ARM: OMAP: Synced irq.c with mainline

Removed duplicate dyn-tick call.

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index ac1534db75457176d3b820b82bf23ec0c9fd2619..395137a8fad276ce20cb250d58920f7c12fac501 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -346,12 +346,6 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
        if (!(action->flags & SA_INTERRUPT))
                local_irq_enable();
 
-#ifdef CONFIG_NO_IDLE_HZ
-       if ((!(action->flags & SA_TIMER)) && system_timer->dyn_tick->handler &&
-           (system_timer->dyn_tick->state & DYN_TICK_ENABLED))
-               system_timer->dyn_tick->handler(irq, 0, regs);
-#endif
-
        status = 0;
        do {
                ret = action->handler(irq, action->dev_id, regs);