aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-27 22:45:33 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-27 22:45:33 +1000
commitbfab1019b7e8b499dfc471a0dfc98b587420dda9 (patch)
tree79e80b9a77815fc7f4a70445276b99183b75e0fe
parent6316222ea050d469c3155881d9dee2c7671d9fef (diff)
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>
-rw-r--r--arch/powerpc/platforms/powermac/setup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 72cd503d3d3..6f62af59729 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);