genirq: Move IRQ_PENDING flag to core

Keep status in sync until all users are fixed.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 527df7ab1b05..17c87865bfb1 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -518,7 +518,8 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
          * then mask it and get out of here:
          */
         if (unlikely(!desc->action || (desc->istate & IRQS_DISABLED))) {
-                desc->status |= IRQ_PENDING;
+                irq_compat_set_pending(desc);
+                desc->istate |= IRQS_PENDING;
                 mask_irq(desc);
                 goto out;
         }
@@ -558,7 +559,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
         if (unlikely((desc->istate & (IRQS_DISABLED | IRQS_INPROGRESS) ||
                       !desc->action))) {
                 if (!irq_check_poll(desc)) {
-                        desc->status |= IRQ_PENDING;
+                        irq_compat_set_pending(desc);
+                        desc->istate |= IRQS_PENDING;
                         mask_ack_irq(desc);
                         goto out_unlock;
                 }
@@ -579,7 +581,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                  * one, we could have masked the irq.
                  * Renable it, if it was not disabled in meantime.
                  */
-                if (unlikely(desc->status & IRQ_PENDING)) {
+                if (unlikely(desc->istate & IRQS_PENDING)) {
                         if (!(desc->istate & IRQS_DISABLED) &&
                             (desc->status & IRQ_MASKED))
                                 unmask_irq(desc);
@@ -587,7 +589,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 
                 handle_irq_event(desc);
 
-        } while ((desc->status & IRQ_PENDING) &&
+        } while ((desc->istate & IRQS_PENDING) &&
                  !(desc->istate & IRQS_DISABLED));
 
 out_unlock: