summaryrefslogtreecommitdiffstats
path: root/kernel/irq/spurious.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-07 22:11:30 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:17 +0100
commitc1594b77e46124bb462f961e536120e471c67446 (patch)
tree3f52ad5809125ab5be6db1fd4b1212fe6127df66 /kernel/irq/spurious.c
parent163ef3091195f514a06f064b12914597d2644c55 (diff)
downloadop-kernel-dev-c1594b77e46124bb462f961e536120e471c67446.zip
op-kernel-dev-c1594b77e46124bb462f961e536120e471c67446.tar.gz
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 5150483..367614f 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -50,7 +50,7 @@ bool irq_wait_for_poll(struct irq_desc *desc)
raw_spin_lock(&desc->lock);
} while (desc->istate & IRQS_INPROGRESS);
/* Might have been disabled in meantime */
- return !(desc->status & IRQ_DISABLED) && desc->action;
+ return !(desc->istate & IRQS_DISABLED) && desc->action;
#else
return false;
#endif
@@ -75,7 +75,7 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
* Do not poll disabled interrupts unless the spurious
* disabled poller asks explicitely.
*/
- if ((desc->status & IRQ_DISABLED) && !force)
+ if ((desc->istate & IRQS_DISABLED) && !force)
goto out;
/*
OpenPOWER on IntegriCloud