---

yaml --- r: 67551 b: refs/heads/master c: 64f2758 h: refs/heads/master i: 67549: 6dc44ea 67547: c211170 67543: 6f1a51d 67535: a7587d7 67519: 74b5d4f v: v3
git-mirror · Oct 11, 2007 · d69355e · d69355e
1 parent 144c4b3
commit d69355e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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");