5 files changed, 19 insertions, 16 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index ba2453f9483d..b4979d423d2b 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -952,7 +952,8 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
                                 goto out;
 
                         pm[i].node = node;
-                }
+                } else
+                        pm[i].node = 0; /* anything to not match MAX_NUMNODES */
         }
         /* End marker */
         pm[nr_pages].node = MAX_NUMNODES;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b55bb358b832..bf2f6cff1d6a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -853,7 +853,7 @@ again:
                 pcp = &zone_pcp(zone, cpu)->pcp[cold];
                 local_irq_save(flags);
                 if (!pcp->count) {
-                        pcp->count += rmqueue_bulk(zone, 0,
+                        pcp->count = rmqueue_bulk(zone, 0,
                                                 pcp->batch, &pcp->list);
                         if (unlikely(!pcp->count))
                                 goto failed;
diff --git a/mm/readahead.c b/mm/readahead.c
index 1ba736ac0367..23cb61a01c6e 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -173,6 +173,8 @@ static int read_pages(struct address_space *mapping, struct file *filp,
 
         if (mapping->a_ops->readpages) {
                 ret = mapping->a_ops->readpages(filp, mapping, pages, nr_pages);
+                /* Clean up the remaining pages */
+                put_pages_list(pages);
                 goto out;
         }
 
diff --git a/mm/slab.c b/mm/slab.c
index 84c631f30741..3c4a7e34eddc 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -883,7 +883,7 @@ static void init_reap_node(int cpu)
         if (node == MAX_NUMNODES)
                 node = first_node(node_online_map);
 
-        __get_cpu_var(reap_node) = node;
+        per_cpu(reap_node, cpu) = node;
 }
 
 static void next_reap_node(void)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 46606c133e82..7dc6aa745166 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -186,10 +186,8 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
         if (unlikely(!area))
                 return NULL;
 
-        if (unlikely(!size)) {
-                kfree (area);
+        if (unlikely(!size))
                 return NULL;
-        }
 
         /*
          * We always allocate a guard page.
@@ -532,11 +530,12 @@ void *vmalloc_user(unsigned long size)
         void *ret;
 
         ret = __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
-        write_lock(&vmlist_lock);
-        area = __find_vm_area(ret);
-        area->flags |= VM_USERMAP;
-        write_unlock(&vmlist_lock);
-
+        if (ret) {
+                write_lock(&vmlist_lock);
+                area = __find_vm_area(ret);
+                area->flags |= VM_USERMAP;
+                write_unlock(&vmlist_lock);
+        }
         return ret;
 }
 EXPORT_SYMBOL(vmalloc_user);
@@ -605,11 +604,12 @@ void *vmalloc_32_user(unsigned long size)
         void *ret;
 
         ret = __vmalloc(size, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);
-        write_lock(&vmlist_lock);
-        area = __find_vm_area(ret);
-        area->flags |= VM_USERMAP;
-        write_unlock(&vmlist_lock);
-
+        if (ret) {
+                write_lock(&vmlist_lock);
+                area = __find_vm_area(ret);
+                area->flags |= VM_USERMAP;
+                write_unlock(&vmlist_lock);
+        }
         return ret;
 }
 EXPORT_SYMBOL(vmalloc_32_user);