aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 17:30:07 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-01 17:30:07 -0400
commita2166abd06e7a9fd34eb18b7b27da18c6146e6ef (patch)
tree42071bca4f8e53295c2c5ce50db43e86a3d4fc37 /kernel
parent9262e9149f346a5443300f8c451b8e7631e81a42 (diff)
[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')
-rw-r--r--kernel/irq/handle.c13
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 @@
16#include <linux/interrupt.h> 16#include <linux/interrupt.h>
17#include <linux/kernel_stat.h> 17#include <linux/kernel_stat.h>
18 18
19#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
20#include <asm/dyntick.h>
21#endif
22
19#include "internals.h" 23#include "internals.h"
20 24
21/** 25/**
@@ -113,6 +117,15 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
113 irqreturn_t ret, retval = IRQ_NONE; 117 irqreturn_t ret, retval = IRQ_NONE;
114 unsigned int status = 0; 118 unsigned int status = 0;
115 119
120#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
121 if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {
122 write_seqlock(&xtime_lock);
123 if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)
124 system_timer->dyn_tick->handler(irq, 0, regs);
125 write_sequnlock(&xtime_lock);
126 }
127#endif
128
116 if (!(action->flags & SA_INTERRUPT)) 129 if (!(action->flags & SA_INTERRUPT))
117 local_irq_enable(); 130 local_irq_enable();
118 131