delete queue-3.9/arm-7762-1-kernel-fix-arm_dt_init_cpu_maps-to-skip-non-cpu-nodes...

diff --git a/queue-3.9/arm-7762-1-kernel-fix-arm_dt_init_cpu_maps-to-skip-non-cpu-nodes.patch b/queue-3.9/arm-7762-1-kernel-fix-arm_dt_init_cpu_maps-to-skip-non-cpu-nodes.patch
deleted file mode 100644 (file)
index fbc5abf..0000000
--- a/queue-3.9/arm-7762-1-kernel-fix-arm_dt_init_cpu_maps-to-skip-non-cpu-nodes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9 Mon Sep 17 00:00:00 2001
-From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-Date: Wed, 19 Jun 2013 10:36:26 +0100
-Subject: ARM: 7762/1: kernel: fix arm_dt_init_cpu_maps() to skip non-cpu nodes
-
-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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/kernel/devtree.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- 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"

diff --git a/queue-3.9/series b/queue-3.9/series
index 30152e007d741f106c4efe88bd4d33e6699e8d64..0eb05d4a4ee1f12276516f09fd9ceb88098f8107 100644 (file)
--- a/queue-3.9/series
+++ b/queue-3.9/series
@@ -1,5 +1,4 @@
 s390-ipl-fix-fcp-wwpn-and-lun-format-strings-for-read.patch
-arm-7762-1-kernel-fix-arm_dt_init_cpu_maps-to-skip-non-cpu-nodes.patch
 arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
 arm-7772-1-fix-missing-flush_kernel_dcache_page-for-nommu.patch
 bluetooth-fix-crash-in-l2cap_build_cmd-with-small-mtu.patch