Browse Source

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>
Paul Mackerras 19 years ago
parent
commit
bfab1019b7
1 changed files with 3 additions and 1 deletions
  1. 3 1
      arch/powerpc/platforms/powermac/setup.c

+ 3 - 1
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);