3 files changed, 7 insertions, 12 deletions

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/manage.c b/kernel/irq/manage.c
index 203a518b6f14..853aefbd184b 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -462,7 +462,9 @@ void free_irq(unsigned int irq, void *dev_id)
                  * We do this after actually deregistering it, to make sure that
                  * a 'real' IRQ doesn't run in parallel with our fake
                  */
+                local_irq_save(flags);
                 handler(irq, dev_id);
+                local_irq_restore(flags);
         }
 #endif
 }
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index c38272746887..a8046791ba2d 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -63,15 +63,11 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
         desc->chip->enable(irq);
 
         /*
-         * Temporary hack to figure out more about the problem, which
-         * is causing the ancient network cards to die.
+         * We do not resend level type interrupts. Level type
+         * interrupts are resent by hardware when they are still
+         * active.
          */
-        if (desc->handle_irq != handle_edge_irq) {
-                WARN_ON_ONCE(1);
-                return;
-        }
-
-        if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+        if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
                 desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
                 if (!desc->chip || !desc->chip->retrigger ||