diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 23:30:07 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-01 23:30:07 +0200 |
| commit | a2166abd06e7a9fd34eb18b7b27da18c6146e6ef (patch) | |
| tree | 42071bca4f8e53295c2c5ce50db43e86a3d4fc37 /kernel/irq | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-a2166abd06e7a9fd34eb18b7b27da18c6146e6ef.tar.xz linux-a2166abd06e7a9fd34eb18b7b27da18c6146e6ef.zip | |
[ARM] 3679/1: ARM: Make ARM dyntick implementation work with genirq
Patch from Thomas Gleixner
From: Thomas Gleixner <tglx@linutronix.de>
Make the ARM dyntick implementation work with the generic
irq code. This hopefully goes away once we consolidated the
dyntick implementations.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/handle.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 5a360dd4331b..961b87591731 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" /** @@ -113,6 +117,15 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; +#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 & SA_INTERRUPT)) local_irq_enable(); |