diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-08 06:36:06 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:17 -0500 |
commit | 6e40262ea43c4b0e3f435b3a083e4461ef921c17 (patch) | |
tree | 4548c1607f81701b77c0d63b544096cdee8ccde0 /kernel/irq/manage.c | |
parent | 2a0d6fb335d4428285dab2d254911748e6040807 (diff) |
genirq: Move IRQ_MASKED to core
Keep status in sync until all users are fixed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index ac060814a787..83fd20194e5b 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -646,8 +646,9 @@ again: | |||
646 | goto again; | 646 | goto again; |
647 | } | 647 | } |
648 | 648 | ||
649 | if (!(desc->istate & IRQS_DISABLED) && (desc->status & IRQ_MASKED)) { | 649 | if (!(desc->istate & IRQS_DISABLED) && (desc->istate & IRQS_MASKED)) { |
650 | desc->status &= ~IRQ_MASKED; | 650 | irq_compat_clr_masked(desc); |
651 | desc->istate &= ~IRQS_MASKED; | ||
651 | desc->irq_data.chip->irq_unmask(&desc->irq_data); | 652 | desc->irq_data.chip->irq_unmask(&desc->irq_data); |
652 | } | 653 | } |
653 | raw_spin_unlock_irq(&desc->lock); | 654 | raw_spin_unlock_irq(&desc->lock); |