From 711a8c7672edd14f05e5e3a01605f1f9b80930ba Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 25 Oct 2006 13:22:27 +1000
Subject: [PATCH] --- yaml --- r: 40290 b: refs/heads/master c:
 f4d4c354bca18210296cc0a8f592c0cdb720bf20 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/platforms/chrp/setup.c | 4 +++-
 trunk/arch/powerpc/sysdev/i8259.c         | 5 +++++
 trunk/include/asm-powerpc/i8259.h         | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 55834eccdae0..ec4c27b771f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f49196a5f53aa62a964b08ffa2c59699a0c8eb53
+refs/heads/master: f4d4c354bca18210296cc0a8f592c0cdb720bf20
diff --git a/trunk/arch/powerpc/platforms/chrp/setup.c b/trunk/arch/powerpc/platforms/chrp/setup.c
index cae3d13229b9..49b8dabcbc99 100644
--- a/trunk/arch/powerpc/platforms/chrp/setup.c
+++ b/trunk/arch/powerpc/platforms/chrp/setup.c
@@ -477,8 +477,10 @@ static void __init chrp_find_8259(void)
 		       " address, polling\n");
 
 	i8259_init(pic, chrp_int_ack);
-	if (ppc_md.get_irq == NULL)
+	if (ppc_md.get_irq == NULL) {
 		ppc_md.get_irq = i8259_irq;
+		irq_set_default_host(i8259_get_host());
+	}
 	if (chrp_mpic != NULL) {
 		cascade_irq = irq_of_parse_and_map(pic, 0);
 		if (cascade_irq == NO_IRQ)
diff --git a/trunk/arch/powerpc/sysdev/i8259.c b/trunk/arch/powerpc/sysdev/i8259.c
index 0450265d73bb..ad87adc975bc 100644
--- a/trunk/arch/powerpc/sysdev/i8259.c
+++ b/trunk/arch/powerpc/sysdev/i8259.c
@@ -224,6 +224,11 @@ static struct irq_host_ops i8259_host_ops = {
 	.xlate = i8259_host_xlate,
 };
 
+struct irq_host *i8259_get_host(void)
+{
+	return i8259_host;
+}
+
 /**
  * i8259_init - Initialize the legacy controller
  * @node: device node of the legacy PIC (can be NULL, but then, it will match
diff --git a/trunk/include/asm-powerpc/i8259.h b/trunk/include/asm-powerpc/i8259.h
index 78489fb8d140..db1362f8c603 100644
--- a/trunk/include/asm-powerpc/i8259.h
+++ b/trunk/include/asm-powerpc/i8259.h
@@ -7,6 +7,7 @@
 #ifdef CONFIG_PPC_MERGE
 extern void i8259_init(struct device_node *node, unsigned long intack_addr);
 extern unsigned int i8259_irq(void);
+extern struct irq_host *i8259_get_host(void);
 #else
 extern void i8259_init(unsigned long intack_addr, int offset);
 extern int i8259_irq(void);