11 files changed, 40 insertions, 17 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 32efca71ce88..7ca55c9deba4 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -56,9 +56,9 @@ typedef	void (*irq_flow_handler_t)(unsigned int irq,
 #define IRQ_REPLAY              0x00000200      /* DEPRECATED */
 #define IRQ_WAITING             0x00000400      /* DEPRECATED */
 #define IRQ_DISABLED            0x00000800      /* DEPRECATED */
+#define IRQ_PENDING             0x00001000      /* DEPRECATED */
 #endif
 
-#define IRQ_PENDING             0x00001000      /* IRQ pending - replay on enable */
 
 #define IRQ_LEVEL               0x00004000      /* IRQ level triggered */
 #define IRQ_MASKED              0x00008000      /* IRQ masked - shouldn't be seen again */
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 9ea8bb99f7c1..aab64c262726 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -76,8 +76,10 @@ unsigned long probe_irq_on(void)
                 raw_spin_lock_irq(&desc->lock);
                 if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
                         desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;
-                        if (irq_startup(desc))
-                                desc->status |= IRQ_PENDING;
+                        if (irq_startup(desc)) {
+                                irq_compat_set_pending(desc);
+                                desc->istate |= IRQS_PENDING;
+                        }
                 }
                 raw_spin_unlock_irq(&desc->lock);
         }
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:
diff --git a/kernel/irq/compat.h b/kernel/irq/compat.h
index bc0c2a501e82..0067a69781f4 100644
--- a/kernel/irq/compat.h
+++ b/kernel/irq/compat.h
@@ -15,15 +15,25 @@ static inline void irq_compat_set_disabled(struct irq_desc *desc)
 {
         desc->status |= IRQ_DISABLED;
 }
-
 static inline void irq_compat_clr_disabled(struct irq_desc *desc)
 {
         desc->status &= ~IRQ_DISABLED;
 }
+static inline void irq_compat_set_pending(struct irq_desc *desc)
+{
+        desc->status |= IRQ_PENDING;
+}
+
+static inline void irq_compat_clr_pending(struct irq_desc *desc)
+{
+        desc->status &= ~IRQ_PENDING;
+}
 #else
 static inline void irq_compat_set_progress(struct irq_desc *desc) { }
 static inline void irq_compat_clr_progress(struct irq_desc *desc) { }
 static inline void irq_compat_set_disabled(struct irq_desc *desc) { }
 static inline void irq_compat_clr_disabled(struct irq_desc *desc) { }
+static inline void irq_compat_set_pending(struct irq_desc *desc) { }
+static inline void irq_compat_clr_pending(struct irq_desc *desc) { }
 #endif
 
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index d4ae0b1ccc00..6e34bdbeb26a 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -122,7 +122,8 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
         struct irqaction *action = desc->action;
         irqreturn_t ret;
 
-        desc->status &= ~IRQ_PENDING;
+        irq_compat_clr_pending(desc);
+        desc->istate &= ~IRQS_PENDING;
         irq_compat_set_progress(desc);
         desc->istate |= IRQS_INPROGRESS;
         raw_spin_unlock(&desc->lock);
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 919d2dd0bb33..fdf2524437eb 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -46,6 +46,7 @@ enum {
  * IRQS_REPLAY                  - irq is replayed
  * IRQS_WAITING                 - irq is waiting
  * IRQS_DISABLED                - irq is disabled
+ * IRQS_PENDING                 - irq is pending and replayed later
  */
 enum {
         IRQS_AUTODETECT         = 0x00000001,
@@ -56,6 +57,7 @@ enum {
         IRQS_REPLAY             = 0x00000040,
         IRQS_WAITING            = 0x00000080,
         IRQS_DISABLED           = 0x00000100,
+        IRQS_PENDING            = 0x00000200,
 };
 
 #define irq_data_to_desc(data)  container_of(data, struct irq_desc, irq_data)
@@ -139,7 +141,6 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
                 print_symbol("%s\n", (unsigned long)desc->action->handler);
         }
 
-        P(IRQ_PENDING);
         P(IRQ_LEVEL);
         P(IRQ_MASKED);
 #ifdef CONFIG_IRQ_PER_CPU
@@ -154,6 +155,7 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
         PS(IRQS_REPLAY);
         PS(IRQS_WAITING);
         PS(IRQS_DISABLED);
+        PS(IRQS_PENDING);
 }
 
 #undef P
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 77ff275b54cf..ac060814a787 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -714,10 +714,11 @@ static int irq_thread(void *data)
                          * CHECKME: We might need a dedicated
                          * IRQ_THREAD_PENDING flag here, which
                          * retriggers the thread in check_irq_resend()
-                         * but AFAICT IRQ_PENDING should be fine as it
+                         * but AFAICT IRQS_PENDING should be fine as it
                          * retriggers the interrupt itself --- tglx
                          */
-                        desc->status |= IRQ_PENDING;
+                        irq_compat_set_pending(desc);
+                        desc->istate |= IRQS_PENDING;
                         raw_spin_unlock_irq(&desc->lock);
                 } else {
                         raw_spin_unlock_irq(&desc->lock);
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index d6bfb89cce91..d7389418e91a 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -69,7 +69,8 @@ int check_wakeup_irqs(void)
         int irq;
 
         for_each_irq_desc(irq, desc)
-                if ((desc->status & IRQ_WAKEUP) && (desc->status & IRQ_PENDING))
+                if ((desc->status & IRQ_WAKEUP) &&
+                    (desc->istate & IRQS_PENDING))
                         return -EBUSY;
 
         return 0;
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index f83387cd11f3..ff1fea060014 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -64,8 +64,9 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
                 return;
         if (desc->istate & IRQS_REPLAY)
                 return;
-        if (desc->status & IRQ_PENDING) {
-                desc->status &= ~IRQ_PENDING;
+        if (desc->istate & IRQS_PENDING) {
+                irq_compat_clr_pending(desc);
+                desc->istate &= ~IRQS_PENDING;
                 desc->istate |= IRQS_REPLAY;
 
                 if (!desc->irq_data.chip->irq_retrigger ||
diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
index 5e3411c7c62b..623fcf83e7de 100644
--- a/kernel/irq/settings.h
+++ b/kernel/irq/settings.h
@@ -14,3 +14,5 @@ enum {
 #define IRQ_WAITING             GOT_YOU_MORON
 #undef IRQ_DISABLED
 #define IRQ_DISABLED            GOT_YOU_MORON
+#undef IRQ_PENDING
+#define IRQ_PENDING             GOT_YOU_MORON
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 367614f858ff..692ce2bae302 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -93,7 +93,8 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
                  * Already running: If it is shared get the other
                  * CPU to go looking for our mystery interrupt too
                  */
-                desc->status |= IRQ_PENDING;
+                irq_compat_set_pending(desc);
+                desc->istate |= IRQS_PENDING;
                 goto out;
         }
 
@@ -103,7 +104,7 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
                 if (handle_irq_event(desc) == IRQ_HANDLED)
                         ret = IRQ_HANDLED;
                 action = desc->action;
-        } while ((desc->status & IRQ_PENDING) && action);
+        } while ((desc->istate & IRQS_PENDING) && action);
         desc->istate &= ~IRQS_POLL_INPROGRESS;
 out:
         raw_spin_unlock(&desc->lock);