4 files changed, 17 insertions, 9 deletions

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 893df8280756..4b8a8da4b2e0 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1256,12 +1256,15 @@ static struct irq_chip ioapic_chip;
 static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
 {
         if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
-                        trigger == IOAPIC_LEVEL)
+            trigger == IOAPIC_LEVEL) {
+                irq_desc[irq].status |= IRQ_LEVEL;
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                          handle_fasteoi_irq, "fasteoi");
-        else
+        } else {
+                irq_desc[irq].status &= ~IRQ_LEVEL;
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                          handle_edge_irq, "edge");
+        }
         set_intr_gate(vector, interrupt[irq]);
 }
 
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 050141c0602b..f57f8b901912 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -800,12 +800,15 @@ static struct irq_chip ioapic_chip;
 
 static void ioapic_register_intr(int irq, unsigned long trigger)
 {
-        if (trigger)
+        if (trigger) {
+                irq_desc[irq].status |= IRQ_LEVEL;
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                               handle_fasteoi_irq, "fasteoi");
-        else
+        } else {
+                irq_desc[irq].status &= ~IRQ_LEVEL;
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                               handle_edge_irq, "edge");
+        }
 }
 
 static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 615ce97c6cfd..f1a73f0b54e7 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -352,13 +352,10 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
          * keep it masked and get out of here
          */
         action = desc->action;
-        if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
-                desc->status |= IRQ_PENDING;
+        if (unlikely(!action || (desc->status & IRQ_DISABLED)))
                 goto out_unlock;
-        }
 
         desc->status |= IRQ_INPROGRESS;
-        desc->status &= ~IRQ_PENDING;
         spin_unlock(&desc->lock);
 
         action_ret = handle_IRQ_event(irq, action);
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 5bfeaed7e487..a8046791ba2d 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -62,7 +62,12 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
          */
         desc->chip->enable(irq);
 
-        if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+        /*
+         * 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 ||