commit 3cca53b02a5bab0f407b1add2f84c22c20243a79
author Thomas Gleixner <tglx@linutronix.de> Sat Jul 01 19:29:31 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun Jul 02 13:58:49 2006 -0700
tree 06d375432c8c5c8895378e0b5049920e73211b2d
parent 85ac3ab254405edcc7bef7d61b03930247882efc

[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>

kernel/irq/handle.c

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 5a360dd..6070e04 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -113,7 +113,7 @@
 	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 @@
 		action = action->next;
 	} while (action);
 
-	if (status & SA_SAMPLE_RANDOM)
+	if (status & IRQF_SAMPLE_RANDOM)
 		add_interrupt_randomness(irq);
 	local_irq_disable();