aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/spurious.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-07 16:11:30 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 06:58:17 -0500
commitc1594b77e46124bb462f961e536120e471c67446 (patch)
tree3f52ad5809125ab5be6db1fd4b1212fe6127df66 /kernel/irq/spurious.c
parent163ef3091195f514a06f064b12914597d2644c55 (diff)
genirq: Move IRQ_DISABLED to core
Keep status in sync until all abusers are fixed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r--kernel/irq/spurious.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 51504837d8cc..367614f858ff 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -50,7 +50,7 @@ bool irq_wait_for_poll(struct irq_desc *desc)
50 raw_spin_lock(&desc->lock); 50 raw_spin_lock(&desc->lock);
51 } while (desc->istate & IRQS_INPROGRESS); 51 } while (desc->istate & IRQS_INPROGRESS);
52 /* Might have been disabled in meantime */ 52 /* Might have been disabled in meantime */
53 return !(desc->status & IRQ_DISABLED) && desc->action; 53 return !(desc->istate & IRQS_DISABLED) && desc->action;
54#else 54#else
55 return false; 55 return false;
56#endif 56#endif
@@ -75,7 +75,7 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
75 * Do not poll disabled interrupts unless the spurious 75 * Do not poll disabled interrupts unless the spurious
76 * disabled poller asks explicitely. 76 * disabled poller asks explicitely.
77 */ 77 */
78 if ((desc->status & IRQ_DISABLED) && !force) 78 if ((desc->istate & IRQS_DISABLED) && !force)
79 goto out; 79 goto out;
80 80
81 /* 81 /*