diff options
Diffstat (limited to 'kernel/irq/handle.c')
| -rw-r--r-- | kernel/irq/handle.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 5a360dd4331b..6d8b30114961 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -16,6 +16,10 @@ #include <linux/interrupt.h> #include <linux/kernel_stat.h> +#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM) +#include <asm/dyntick.h> +#endif + #include "internals.h" /** @@ -92,6 +96,22 @@ struct irq_chip no_irq_chip = { }; /* + * Generic dummy implementation which can be used for + * real dumb interrupt sources + */ +struct irq_chip dummy_irq_chip = { + .name = "dummy", + .startup = noop_ret, + .shutdown = noop, + .enable = noop, + .disable = noop, + .ack = noop, + .mask = noop, + .unmask = noop, + .end = noop, +}; + +/* * Special, empty irq handler: */ irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs) @@ -113,7 +133,16 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; - if (!(action->flags & SA_INTERRUPT)) +#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM) + if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) { + write_seqlock(&xtime_lock); + if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) + system_timer->dyn_tick->handler(irq, 0, regs); + write_sequnlock(&xtime_lock); + } +#endif + + if (!(action->flags & IRQF_DISABLED)) local_irq_enable(); do { @@ -124,7 +153,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, action = action->next; } while (action); - if (status & SA_SAMPLE_RANDOM) + if (status & IRQF_SAMPLE_RANDOM) add_interrupt_randomness(irq); local_irq_disable(); |