From: Paul Mackerras <paulus@samba.org>
Date: Thu, 27 Oct 2005 12:45:33 +0000 (+1000)
Subject: powerpc: Fix new-world powermac detection
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bfab1019b7e8b499dfc471a0dfc98b587420dda9;p=deliverable%2Flinux.git

powerpc: Fix new-world powermac detection

My G5 was being reported as an OldWorld in /proc/cpuinfo, which is
obviously not right... :)

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 72cd503d3d33..6f62af597291 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -317,7 +317,9 @@ void __init pmac_setup_arch(void)
 	}
 
 	/* See if newworld or oldworld */
-	ic = of_find_node_by_name(NULL, "interrupt-controller");
+	for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
+		if (get_property(ic, "interrupt-controller", NULL))
+			break;
 	pmac_newworld = (ic != NULL);
 	if (ic)
 		of_node_put(ic);