2 files changed, 9 insertions, 0 deletions

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index cfdb63eb5c94..533068cfb607 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -11,6 +11,8 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
+#include "internals.h"
+
 /*
  * Autodetection depends on the fact that any interrupt that
  * comes in on to an unassigned handler will get stuck with
@@ -42,6 +44,12 @@ unsigned long probe_irq_on(void)
                 spin_lock_irq(&desc->lock);
                 if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
                         /*
+                         * An old-style architecture might still have
+                         * the handle_bad_irq handler there:
+                         */
+                        compat_irq_chip_set_default_handler(desc);
+
+                        /*
                          * Some chips need to know about probing in
                          * progress:
                          */
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index a04b516afa59..3a2dbcc9e215 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -46,6 +46,7 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
         [0 ... NR_IRQS-1] = {
                 .status = IRQ_DISABLED,
                 .chip = &no_irq_type,
+                .handle_irq = handle_bad_irq,
                 .depth = 1,
                 .lock = SPIN_LOCK_UNLOCKED,
 #ifdef CONFIG_SMP