commit 7acdd53e5b2c55b6f7e3427e85e2f91fa814a4f9
author Thomas Gleixner <tglx@linutronix.de> Mon Feb 07 20:40:54 2011 +0100
committer Thomas Gleixner <tglx@linutronix.de> Sat Feb 19 12:58:15 2011 +0100
tree 4806536bae32605a3107d6c4384547693eda566c
parent bd062e7667ac173afef57fbfe9327f3b914a9d4c

genirq: Move IRQ_SPURIOUS_DISABLED to core state

No users outside.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

kernel/irq/spurious.c

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index bc06207..2941d8a 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -146,15 +146,15 @@
 	irq_poll_cpu = smp_processor_id();
 
 	for_each_irq_desc(i, desc) {
-		unsigned int status;
+		unsigned int state;
 
 		if (!i)
 			 continue;
 
 		/* Racy but it doesn't matter */
-		status = desc->status;
+		state = desc->istate;
 		barrier();
-		if (!(status & IRQ_SPURIOUS_DISABLED))
+		if (!(state & IRQS_SPURIOUS_DISABLED))
 			continue;
 
 		local_irq_disable();
@@ -298,7 +298,7 @@
 		 * Now kill the IRQ
 		 */
 		printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
-		desc->status |= IRQ_SPURIOUS_DISABLED;
+		desc->istate |= IRQS_SPURIOUS_DISABLED;
 		desc->depth++;
 		irq_disable(desc);