diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:18:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:21 -0400 |
commit | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (patch) | |
tree | 6c08e7b8ed988053f421e38578fa11db538b0747 /kernel/irq | |
parent | f82bc1762e0e74b7e0040a4d83be06d32c37fc2e (diff) |
[PATCH] genirq: ARM dyntick cleanup
Linus: "The hacks in kernel/irq/handle.c are really horrid. REALLY
horrid."
They are indeed. Move the dyntick quirks to ARM where they belong.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/handle.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 6d8b30114961..aeb6e391276c 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -16,10 +16,6 @@ | |||
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 | |||
23 | #include "internals.h" | 19 | #include "internals.h" |
24 | 20 | ||
25 | /** | 21 | /** |
@@ -133,14 +129,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, | |||
133 | irqreturn_t ret, retval = IRQ_NONE; | 129 | irqreturn_t ret, retval = IRQ_NONE; |
134 | unsigned int status = 0; | 130 | unsigned int status = 0; |
135 | 131 | ||
136 | #if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM) | 132 | handle_dynamic_tick(action); |
137 | if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) { | ||
138 | write_seqlock(&xtime_lock); | ||
139 | if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) | ||
140 | system_timer->dyn_tick->handler(irq, 0, regs); | ||
141 | write_sequnlock(&xtime_lock); | ||
142 | } | ||
143 | #endif | ||
144 | 133 | ||
145 | if (!(action->flags & IRQF_DISABLED)) | 134 | if (!(action->flags & IRQF_DISABLED)) |
146 | local_irq_enable(); | 135 | local_irq_enable(); |