From a1c0c249a9937d9328c0a33cda1d1da6f1467646 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Fri, 23 Sep 2005 14:43:22 +1000
Subject: [PATCH] --- yaml --- r: 11462 b: refs/heads/master c:
 ba293fff085fde5b9f1b5a57c8abb1a8098d0c59 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/ppc64/kernel/iSeries_irq.c   | 13 +++++++++++++
 trunk/arch/ppc64/kernel/iSeries_setup.c |  2 ++
 trunk/include/asm-ppc64/processor.h     |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d525da24c317..04f1c047b1e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f497581fda5fd804e9ebd7d8f6d80c3a0e9f883
+refs/heads/master: ba293fff085fde5b9f1b5a57c8abb1a8098d0c59
diff --git a/trunk/arch/ppc64/kernel/iSeries_irq.c b/trunk/arch/ppc64/kernel/iSeries_irq.c
index 77376c1bd611..0170682a8ca5 100644
--- a/trunk/arch/ppc64/kernel/iSeries_irq.c
+++ b/trunk/arch/ppc64/kernel/iSeries_irq.c
@@ -351,3 +351,16 @@ int __init iSeries_allocate_IRQ(HvBusNumber busNumber,
 	irq_desc[virtirq].handler = &iSeries_IRQ_handler;
 	return virtirq;
 }
+
+int virt_irq_create_mapping(unsigned int real_irq)
+{
+	BUG(); /* Don't call this on iSeries, yet */
+
+	return 0;
+}
+
+void virt_irq_init(void)
+{
+	return;
+}
+
diff --git a/trunk/arch/ppc64/kernel/iSeries_setup.c b/trunk/arch/ppc64/kernel/iSeries_setup.c
index b5dcb08547bd..75d8db4eaac6 100644
--- a/trunk/arch/ppc64/kernel/iSeries_setup.c
+++ b/trunk/arch/ppc64/kernel/iSeries_setup.c
@@ -321,6 +321,8 @@ static void __init iSeries_init_early(void)
 
 	ppcdbg_initialize();
 
+	ppc64_interrupt_controller = IC_ISERIES;
+
 #if defined(CONFIG_BLK_DEV_INITRD)
 	/*
 	 * If the init RAM disk has been configured and there is
diff --git a/trunk/include/asm-ppc64/processor.h b/trunk/include/asm-ppc64/processor.h
index 4146189006e3..fe5cd2f5868a 100644
--- a/trunk/include/asm-ppc64/processor.h
+++ b/trunk/include/asm-ppc64/processor.h
@@ -291,6 +291,7 @@
 #define IC_OPEN_PIC   1
 #define IC_PPC_XIC    2
 #define IC_BPA_IIC    3
+#define IC_ISERIES    4
 
 #define XGLUE(a,b) a##b
 #define GLUE(a,b) XGLUE(a,b)