From ff1061aec1c42b4697b8807b6360b74ca47eb90f Mon Sep 17 00:00:00 2001
From: Huang Shijie <shijie8@gmail.com>
Date: Sun, 8 Aug 2010 14:39:07 +0200
Subject: [PATCH] --- yaml --- r: 210286 b: refs/heads/master c:
 a002d148426f40bc2b7dc066982eb177cdebeaaa h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/percpu.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b33255a57923..1f47b05d46c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94cb121c9483f1ec9b1ef0c249fbfc49c628fa6b
+refs/heads/master: a002d148426f40bc2b7dc066982eb177cdebeaaa
diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c
index e61dc2cc5873..a1830d8e3318 100644
--- a/trunk/mm/percpu.c
+++ b/trunk/mm/percpu.c
@@ -393,7 +393,9 @@ static int pcpu_extend_area_map(struct pcpu_chunk *chunk, int new_alloc)
 		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);
 
 	chunk->map_alloc = new_alloc;
 	chunk->map = new;