Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 4 insertions, 2 deletions

diff --git a/mm/percpu.c b/mm/percpu.c
index e61dc2cc587..58c572b18b0 100644
--- a/mm/percpu.c
+++ b/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;
@@ -1162,7 +1164,7 @@ static struct pcpu_alloc_info * __init pcpu_build_alloc_info(
                 }
 
                 /*
-                 * Don't accept if wastage is over 25%.  The
+                 * Don't accept if wastage is over 1/3.  The
                  * greater-than comparison ensures upa==1 always
                  * passes the following check.
                  */