path: root/arch/arm/kernel/devtree.c
diff options
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2013-06-19 10:36:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-24 14:25:42 +0100
commit1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9 (patch)
tree6d975c4d04a66923303971ad7fa6f59719c12c19 /arch/arm/kernel/devtree.c
parent8182a34d85698d2fb696bfdafa21140916fd5d47 (diff)
ARM: 7762/1: kernel: fix arm_dt_init_cpu_maps() to skip non-cpu nodes
The introduction of the cpu-map topology node in the cpus node implies that cpus node might have children that are not cpu nodes. The DT parsing code needs updating otherwise it would check for cpu nodes properties in nodes that are not required to contain them, resulting in warnings that have no bearing on bindings defined in the dts source file. Cc: <stable@vger.kernel.org> [3.8+] Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/devtree.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 5af04f6daa33..904cad5ec657 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -92,6 +92,9 @@ void __init arm_dt_init_cpu_maps(void)
for_each_child_of_node(cpus, cpu) {
u32 hwid;
+ if (of_node_cmp(cpu->type, "cpu"))
+ continue;
pr_debug(" * %s...\n", cpu->full_name);
* A device tree containing CPU nodes with missing "reg"