Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[sfrench/cifs-2.6.git] / arch / arm / kernel / devtree.c

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index ecaa68dd1af52c9e1afd994978d70ddad7400b75..e3057c1b55b9643c449d78c599096baba91b6de0 100644 (file)
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -12,7 +12,6 @@
 #include <linux/export.h>
 #include <linux/errno.h>
 #include <linux/types.h>
-#include <linux/bootmem.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
@@ -87,14 +86,11 @@ void __init arm_dt_init_cpu_maps(void)
        if (!cpus)
                return;
 
-       for_each_child_of_node(cpus, cpu) {
+       for_each_of_cpu_node(cpu) {
                const __be32 *cell;
                int prop_bytes;
                u32 hwid;
 
-               if (of_node_cmp(cpu->type, "cpu"))
-                       continue;
-
                pr_debug(" * %pOF...\n", cpu);
                /*
                 * A device tree containing CPU nodes with missing "reg"