2 files changed, 5 insertions, 1 deletions

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 515ad40bde15..32e1ab1477d1 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -180,6 +180,8 @@ fastcall unsigned int __do_IRQ(unsigned int irq)
                 if (desc->chip->ack)
                         desc->chip->ack(irq);
                 action_ret = handle_IRQ_event(irq, desc->action);
+                if (!noirqdebug)
+                        note_interrupt(irq, desc, action_ret);
                 desc->chip->end(irq);
                 return 1;
         }
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 9d8c79b48823..b0d81aae472f 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -146,7 +146,9 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
 
         if (unlikely(irqfixup)) {
                 /* Don't punish working computers */
-                if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) {
+                if ((irqfixup == 2 && ((irq == 0) ||
+                                (desc->action->flags & IRQF_IRQPOLL))) ||
+                                action_ret == IRQ_NONE) {
                         int ok = misrouted_irq(irq);
                         if (action_ret == IRQ_NONE)
                                 desc->irqs_unhandled -= ok;