From: Greg Kroah-Hartman Date: Fri, 17 Sep 2010 16:36:48 +0000 (-0700) Subject: delete percpu patch that shouldn't have been in the queue X-Git-Tag: v2.6.27.54~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7def5a411ed12e6b3bd3e93e977e88f2f374095;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 890944c9dce..00000000000 --- 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 -Date: Sun, 8 Aug 2010 14:39:07 +0200 -Subject: percpu: fix a memory leak in pcpu_extend_area_map() - -From: Huang Shijie - -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 -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman - ---- - 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 da0d77b7fe0..58ea8fddf28 100644 --- 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 index 88f8b81413f..00000000000 --- 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 -Date: Sun, 8 Aug 2010 14:39:07 +0200 -Subject: percpu: fix a memory leak in pcpu_extend_area_map() - -From: Huang Shijie - -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 -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman - ---- - 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 b31acd168d8..ac8de71230c 100644 --- 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