summaryrefslogtreecommitdiffstats
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 19:29:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 13:58:49 -0700
commit3cca53b02a5bab0f407b1add2f84c22c20243a79 (patch)
tree06d375432c8c5c8895378e0b5049920e73211b2d /kernel/irq/handle.c
parent85ac3ab254405edcc7bef7d61b03930247882efc (diff)
downloadlinux-3cca53b02a5bab0f407b1add2f84c22c20243a79.tar.gz
linux-3cca53b02a5bab0f407b1add2f84c22c20243a79.tar.bz2
linux-3cca53b02a5bab0f407b1add2f84c22c20243a79.zip
[PATCH] irq-flags: generic irq: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 5a360dd4331b..6070e0464690 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -113,7 +113,7 @@ 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 (!(action->flags & IRQF_DISABLED))
local_irq_enable();
do {
@@ -124,7 +124,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();