PERFORCE change 111830 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=111830

Change 111830 by marcel at marcel_nfs on 2006/12/17 02:17:28

	The cpu nodes are under the cpus node, not the root node.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#6 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#6 (text+ko) ====

@@ -51,12 +51,18 @@
 	 * device tree.
 	 */
 	root = OF_peer(0);
-	for (dev = OF_child(root); dev != 0; dev = OF_peer(dev)) {
-		res = OF_getprop(dev, "device_type", buf, sizeof(buf));
-		if (res < 0)
+	dev = OF_child(root);
+	while (dev != 0) {
+		res = OF_getprop(dev, "name", buf, sizeof(buf));
+		if (res < 0 || strcmp(buf, "cpus") != 0) {
+			dev = OF_peer(dev);
 			continue;
-		if (strcmp(buf, "cpu") == 0)
-			mp_ncpus++;
+		}
+		for (dev = OF_child(dev); dev != 0; dev = OF_peer(dev)) {
+			res = OF_getprop(dev, "device_type", buf, sizeof(buf));
+			if (res > 0 && strcmp(buf, "cpu") == 0)
+				mp_ncpus++;
+		}
 	}
 	/* Sanity. */
 	if (mp_ncpus == 0)