From bfeab0d8df1e8af4c44f48bce2870aec570d2999 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 29 Jun 2006 02:24:54 -0700
Subject: [PATCH] --- yaml --- r: 31077 b: refs/heads/master c:
 7a55713ab456d267815fd5ca3c3d0fd14301f306 h: refs/heads/master i:   31075:
 682a13d2a334a296ea5b9c963952734fc4308d30 v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/irq/autoprobe.c | 8 ++++++++
 trunk/kernel/irq/handle.c    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99171caa9b2b..bba959a48d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd87eb3a24c4527741122713e223d74b85d43c85
+refs/heads/master: 7a55713ab456d267815fd5ca3c3d0fd14301f306
diff --git a/trunk/kernel/irq/autoprobe.c b/trunk/kernel/irq/autoprobe.c
index cfdb63eb5c94..533068cfb607 100644
--- a/trunk/kernel/irq/autoprobe.c
+++ b/trunk/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
@@ -41,6 +43,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/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index a04b516afa59..3a2dbcc9e215 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/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