From d69355e6ce87c10374edeb2a3166a8d1b80b221c Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Wed, 10 Oct 2007 10:38:24 +1000
Subject: [PATCH] --- yaml --- r: 67551 b: refs/heads/master c:
 64f2758514e3bad19cab03d22851ab37654399a4 h: refs/heads/master i:   67549:
 6dc44ea7fb1a811470053caf240d87ab161693bd   67547:
 c2111706f4c4341614f016ed0f499405bcd373c7   67543:
 6f1a51d890749c78c36a5c9e1eeb28d1cef6c34e   67535:
 a7587d744c4f3d96f4e561bbb1bb5aac52e2a007   67519:
 74b5d4fd3f490132a933b5f253f797b195e4829c v: v3

---
 [refs]                                             |  2 +-
 trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 438a4cec6acf..ccb5788fae6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84dd4676f5519b86aee3bfaf1b230be2cb43f69b
+refs/heads/master: 64f2758514e3bad19cab03d22851ab37654399a4
diff --git a/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c b/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 9711eb0d5496..fc48b96c81bf 100644
--- a/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -252,6 +252,20 @@ static struct notifier_block pseries_smp_nb = {
 
 static int __init pseries_cpu_hotplug_init(void)
 {
+	struct device_node *np;
+	const char *typep;
+
+	for_each_node_by_name(np, "interrupt-controller") {
+		typep = of_get_property(np, "compatible", NULL);
+		if (strstr(typep, "open-pic")) {
+			of_node_put(np);
+
+			printk(KERN_INFO "CPU Hotplug not supported on "
+				"systems using MPIC\n");
+			return 0;
+		}
+	}
+
 	rtas_stop_self_args.token = rtas_token("stop-self");
 	qcss_tok = rtas_token("query-cpu-stopped-state");