sparseirq: move kstat_irqs from kstat to irq_desc - fix

fix non-sparseirq architectures.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 20 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 9fc5e69213de..4ef555c50db8 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -327,7 +327,11 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out_unlock;
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+#ifdef CONFIG_HAVE_DYN_ARRAY
         kstat_irqs_this_cpu(desc)++;
+#else
+        kstat_irqs_this_cpu(irq)++;
+#endif
 
         action = desc->action;
         if (unlikely(!action || (desc->status & IRQ_DISABLED)))
@@ -368,7 +372,11 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out_unlock;
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+#ifdef CONFIG_HAVE_DYN_ARRAY
         kstat_irqs_this_cpu(desc)++;
+#else
+        kstat_irqs_this_cpu(irq)++;
+#endif
 
         /*
          * If its disabled or no action available
@@ -415,7 +423,11 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
                 goto out;
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+#ifdef CONFIG_HAVE_DYN_ARRAY
         kstat_irqs_this_cpu(desc)++;
+#else
+        kstat_irqs_this_cpu(irq)++;
+#endif
 
         /*
          * If its disabled or no action available
@@ -479,8 +491,11 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                 mask_ack_irq(desc, irq);
                 goto out_unlock;
         }
-
+#ifdef CONFIG_HAVE_DYN_ARRAY
         kstat_irqs_this_cpu(desc)++;
+#else
+        kstat_irqs_this_cpu(irq)++;
+#endif
 
         /* Start handling the irq */
         desc->chip->ack(irq);
@@ -535,7 +550,11 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
         irqreturn_t action_ret;
 
+#ifdef CONFIG_HAVE_DYN_ARRAY
         kstat_irqs_this_cpu(desc)++;
+#else
+        kstat_irqs_this_cpu(irq)++;
+#endif
 
         if (desc->chip->ack)
                 desc->chip->ack(irq);