diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /include/asm-arm/hw_irq.h | |
parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-arm/hw_irq.h')
-rw-r--r-- | include/asm-arm/hw_irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/hw_irq.h b/include/asm-arm/hw_irq.h index 275b574fd1a5..ea856971989a 100644 --- a/include/asm-arm/hw_irq.h +++ b/include/asm-arm/hw_irq.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #if defined(CONFIG_NO_IDLE_HZ) | 9 | #if defined(CONFIG_NO_IDLE_HZ) |
10 | # include <asm/dyntick.h> | 10 | # include <asm/dyntick.h> |
11 | # define handle_dynamic_tick(action) \ | 11 | # define handle_dynamic_tick(action) \ |
12 | if (!(action->flags & SA_TIMER) && system_timer->dyn_tick) { \ | 12 | if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) { \ |
13 | write_seqlock(&xtime_lock); \ | 13 | write_seqlock(&xtime_lock); \ |
14 | if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \ | 14 | if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \ |
15 | system_timer->dyn_tick->handler(irq, 0, regs); \ | 15 | system_timer->dyn_tick->handler(irq, 0, regs); \ |