diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 14:10:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 16:55:10 +0200 |
| commit | 32f4125ebffee4f3c4dbc6a437fc656129eb9e60 (patch) | |
| tree | d64c6bb7ba40c33734896303734416ea5b4f3290 /kernel/irq/handle.c | |
| parent | c2d0c555c22242c3a76e366074c4d83ef9fa3b8c (diff) | |
| download | blackbird-op-linux-32f4125ebffee4f3c4dbc6a437fc656129eb9e60.tar.gz blackbird-op-linux-32f4125ebffee4f3c4dbc6a437fc656129eb9e60.zip | |
genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data
We really need these flags for some of the interrupt chips. Move it
from internal state to irq_data and provide proper accessors.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Daney <ddaney@caviumnetworks.com>
Diffstat (limited to 'kernel/irq/handle.c')
| -rw-r--r-- | kernel/irq/handle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 517561fc7317..60fd5cd75c77 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -178,13 +178,13 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) irq_compat_clr_pending(desc); desc->istate &= ~IRQS_PENDING; irq_compat_set_progress(desc); - desc->istate |= IRQS_INPROGRESS; + irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS); raw_spin_unlock(&desc->lock); ret = handle_irq_event_percpu(desc, action); raw_spin_lock(&desc->lock); - desc->istate &= ~IRQS_INPROGRESS; + irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS); irq_compat_clr_progress(desc); return ret; } |
