| Message ID | 1372445527-24414-96-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 28, 2013 at 07:51:57PM +0100, Kamal Mostafa wrote: > 3.8.13.4 -stable review patch. If anyone has any objections, please let me know. Owing to dependencies on other patches getting upstreamed but not necessarily backported to stable, waiting for a decision on how to solve dependencies to be made asap, please drop this patch from the queue since it can trigger regressions. Thanks and apologies, Lorenzo > > ------------------ > > From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > commit 1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9 upstream. > > 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. > > 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> > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > arch/arm/kernel/devtree.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c > index 70f1bde..93fde23 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" > -- > 1.8.1.2 > >
On Sat, 2013-06-29 at 00:53 +0100, Lorenzo Pieralisi wrote: > On Fri, Jun 28, 2013 at 07:51:57PM +0100, Kamal Mostafa wrote: > > 3.8.13.4 -stable review patch. If anyone has any objections, please let me know. > > Owing to dependencies on other patches getting upstreamed but not > necessarily backported to stable, waiting for a decision on how to solve > dependencies to be made asap, please drop this patch from the queue since > it can trigger regressions. > > Thanks and apologies, > Lorenzo Dropped from the 3.8.y queue. Thanks Lorenzo. -Kamal > > > > ------------------ > > > > From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > > > commit 1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9 upstream. > > > > 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. > > > > 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> > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > > --- > > arch/arm/kernel/devtree.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c > > index 70f1bde..93fde23 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" > > -- > > 1.8.1.2 > > > > >
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 70f1bde..93fde23 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"