delete percpu patch that shouldn't have been in the queue

diff --git a/queue-2.6.32/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch b/queue-2.6.32/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
deleted file mode 100644 (file)
index 890944c..0000000
--- a/queue-2.6.32/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a002d148426f40bc2b7dc066982eb177cdebeaaa Mon Sep 17 00:00:00 2001
-From: Huang Shijie <shijie8@gmail.com>
-Date: Sun, 8 Aug 2010 14:39:07 +0200
-Subject: percpu: fix a memory leak in pcpu_extend_area_map()
-
-From: Huang Shijie <shijie8@gmail.com>
-
-commit a002d148426f40bc2b7dc066982eb177cdebeaaa upstream.
-
-The original code did not free the old map.  This patch fixes it.
-
-tj: use @old as memcpy source instead of @chunk->map, and indentation
-    and description update
-
-Signed-off-by: Huang Shijie <shijie8@gmail.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- mm/percpu.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/mm/percpu.c
-+++ b/mm/percpu.c
-@@ -412,7 +412,9 @@ static int pcpu_extend_area_map(struct p
-               goto out_unlock;
- 
-       old_size = chunk->map_alloc * sizeof(chunk->map[0]);
--      memcpy(new, chunk->map, old_size);
-+      old = chunk->map;
-+
-+      memcpy(new, old, old_size);
- 
-       /*
-        * map_alloc < PCPU_DFL_MAP_ALLOC indicates that the chunk is

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index da0d77b7fe0a177852fc9f7645403616049603a2..58ea8fddf282575ed942183597776d98c4a7bf24 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -56,7 +56,6 @@ memory-hotplug-fix-next-block-calculation-in-is_removable.patch
 perf-initialize-callchains-roots-s-childen-hits.patch
 p54-fix-tx-feedback-status-flag-check.patch
 ath5k-check-return-value-of-ieee80211_get_tx_rate.patch
-percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
 wireless-extensions-fix-kernel-heap-content-leak.patch
 x86-tsc-fix-a-preemption-leak-in-restore_sched_clock_state.patch
 x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch

diff --git a/queue-2.6.35/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch b/queue-2.6.35/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
deleted file mode 100644 (file)
index 88f8b81..0000000
--- a/queue-2.6.35/percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a002d148426f40bc2b7dc066982eb177cdebeaaa Mon Sep 17 00:00:00 2001
-From: Huang Shijie <shijie8@gmail.com>
-Date: Sun, 8 Aug 2010 14:39:07 +0200
-Subject: percpu: fix a memory leak in pcpu_extend_area_map()
-
-From: Huang Shijie <shijie8@gmail.com>
-
-commit a002d148426f40bc2b7dc066982eb177cdebeaaa upstream.
-
-The original code did not free the old map.  This patch fixes it.
-
-tj: use @old as memcpy source instead of @chunk->map, and indentation
-    and description update
-
-Signed-off-by: Huang Shijie <shijie8@gmail.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- mm/percpu.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/mm/percpu.c
-+++ b/mm/percpu.c
-@@ -390,7 +390,9 @@ static int pcpu_extend_area_map(struct p
-               goto out_unlock;
- 
-       old_size = chunk->map_alloc * sizeof(chunk->map[0]);
--      memcpy(new, chunk->map, old_size);
-+      old = chunk->map;
-+
-+      memcpy(new, old, old_size);
- 
-       /*
-        * map_alloc < PCPU_DFL_MAP_ALLOC indicates that the chunk is

diff --git a/queue-2.6.35/series b/queue-2.6.35/series
index b31acd168d8ff2dfafcd1b38f2b094df5be599c3..ac8de71230c9f2915d8ab5eaeb2300300dd8151c 100644 (file)
--- a/queue-2.6.35/series
+++ b/queue-2.6.35/series
@@ -94,7 +94,6 @@ perf-initialize-callchains-roots-s-childen-hits.patch
 powerpc-perf_event-reduce-latency-of-calling-perf_event_do_pending.patch
 p54-fix-tx-feedback-status-flag-check.patch
 ath5k-check-return-value-of-ieee80211_get_tx_rate.patch
-percpu-fix-a-memory-leak-in-pcpu_extend_area_map.patch
 wireless-extensions-fix-kernel-heap-content-leak.patch
 rdma-cxgb3-don-t-exceed-the-max-hw-cq-depth.patch
 x86-tsc-fix-a-preemption-leak-in-restore_sched_clock_state.patch