genirq: revert dynarray
Revert the dynarray changes. They need more thought and polishing. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:

committed by
Ingo Molnar

parent
ee32c97322
commit
d6c88a507e
@@ -326,11 +326,7 @@ 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
|
||||
kstat_incr_irqs_this_cpu(irq, desc);
|
||||
|
||||
action = desc->action;
|
||||
if (unlikely(!action || (desc->status & IRQ_DISABLED)))
|
||||
@@ -371,11 +367,7 @@ 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
|
||||
kstat_incr_irqs_this_cpu(irq, desc);
|
||||
|
||||
/*
|
||||
* If its disabled or no action available
|
||||
@@ -422,11 +414,7 @@ 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
|
||||
kstat_incr_irqs_this_cpu(irq, desc);
|
||||
|
||||
/*
|
||||
* If its disabled or no action available
|
||||
@@ -490,11 +478,7 @@ 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
|
||||
kstat_incr_irqs_this_cpu(irq, desc);
|
||||
|
||||
/* Start handling the irq */
|
||||
desc->chip->ack(irq);
|
||||
@@ -549,11 +533,7 @@ 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
|
||||
kstat_incr_irqs_this_cpu(irq, desc);
|
||||
|
||||
if (desc->chip->ack)
|
||||
desc->chip->ack(irq);
|
||||
|
Reference in New Issue
Block a user