diff --git a/[refs] b/[refs] index 65948b8290d5..5073e08e18fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f84dbb912f344270f31d5cce974f12908a47798d +refs/heads/master: 8d00a6c8f6b08e7167bc03bf955cdc7e47c5132e diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 8ccb462ea42c..f3047df2d23c 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -197,10 +197,6 @@ extern int setup_irq(unsigned int irq, struct irqaction *new); #ifdef CONFIG_GENERIC_HARDIRQS -#ifndef handle_dynamic_tick -# define handle_dynamic_tick(a) do { } while (0) -#endif - #ifdef CONFIG_SMP #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index 5fa6198e9139..f4c8a03a9fbb 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -131,8 +131,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; - handle_dynamic_tick(action); - if (!(action->flags & IRQF_DISABLED)) local_irq_enable_in_hardirq();