Merge commit 'v2.6.31-rc7' into irq/core

[safe/jmp/linux-2.6] / kernel / irq / resend.c

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 096b102..090c376 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -33,13 +33,13 @@ static void resend_irqs(unsigned long arg)
        struct irq_desc *desc;
        int irq;
 
-       while (!bitmap_empty(irqs_resend, NR_IRQS)) {
-               irq = find_first_bit(irqs_resend, NR_IRQS);
+       while (!bitmap_empty(irqs_resend, nr_irqs)) {
+               irq = find_first_bit(irqs_resend, nr_irqs);
                clear_bit(irq, irqs_resend);
-               desc = irq_desc + irq;
-               spin_lock_irqsave(&desc->lock, flags);
-               desc->handle_irq(irq, desc, NULL);
-               spin_unlock_irqrestore(&desc->lock, flags);
+               desc = irq_to_desc(irq);
+               local_irq_disable();
+               desc->handle_irq(irq, desc);
+               local_irq_enable();
        }
 }
 
@@ -62,12 +62,15 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
         */
        desc->chip->enable(irq);
 
-       if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-               desc->status &= ~IRQ_PENDING;
-               desc->status = status | IRQ_REPLAY;
+       /*
+        * We do not resend level type interrupts. Level type
+        * interrupts are resent by hardware when they are still
+        * active.
+        */
+       if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+               desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
-               if (!desc->chip || !desc->chip->retrigger ||
-                                       !desc->chip->retrigger(irq)) {
+               if (!desc->chip->retrigger || !desc->chip->retrigger(irq)) {
 #ifdef CONFIG_HARDIRQS_SW_RESEND
                        /* Set it pending and activate the softirq: */
                        set_bit(irq, irqs_resend);