6 files changed, 11 insertions, 20 deletions

diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index 4918d91bc3a6..d19b13e3a59f 100644
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)
         area->nr_pages = npages;
         area->pages = pages;
 
-        if (map_vm_area(area, prot_rwx, &pages)) {
+        if (map_vm_area(area, prot_rwx, pages)) {
                 vunmap(area->addr);
                 goto error;
         }
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 0bf1e4edf04d..6590558d1d31 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -42,7 +42,6 @@ DEFINE_MUTEX(lguest_lock);
 static __init int map_switcher(void)
 {
         int i, err;
-        struct page **pagep;
 
         /*
          * Map the Switcher in to high memory.
@@ -110,11 +109,9 @@ static __init int map_switcher(void)
          * This code actually sets up the pages we've allocated to appear at
          * switcher_addr.  map_vm_area() takes the vma we allocated above, the
          * kind of pages we're mapping (kernel pages), and a pointer to our
-         * array of struct pages.  It increments that pointer, but we don't
-         * care.
+         * array of struct pages.
          */
-        pagep = lg_switcher_pages;
-        err = map_vm_area(switcher_vma, PAGE_KERNEL_EXEC, &pagep);
+        err = map_vm_area(switcher_vma, PAGE_KERNEL_EXEC, lg_switcher_pages);
         if (err) {
                 printk("lguest: map_vm_area failed: %i\n", err);
                 goto free_vma;
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 02b0379ae550..4f34dc0095b5 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -585,7 +585,6 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
 
         for (page_addr = start; page_addr < end; page_addr += PAGE_SIZE) {
                 int ret;
-                struct page **page_array_ptr;
 
                 page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
 
@@ -598,8 +597,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                 }
                 tmp_area.addr = page_addr;
                 tmp_area.size = PAGE_SIZE + PAGE_SIZE /* guard page? */;
-                page_array_ptr = page;
-                ret = map_vm_area(&tmp_area, PAGE_KERNEL, &page_array_ptr);
+                ret = map_vm_area(&tmp_area, PAGE_KERNEL, page);
                 if (ret) {
                         pr_err("%d: binder_alloc_buf failed to map page at %p in kernel\n",
                                proc->pid, page_addr);
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 4b8a89189a29..b87696fdf06a 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -113,7 +113,7 @@ extern struct vm_struct *remove_vm_area(const void *addr);
 extern struct vm_struct *find_vm_area(const void *addr);
 
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
-                        struct page ***pages);
+                        struct page **pages);
 #ifdef CONFIG_MMU
 extern int map_kernel_range_noflush(unsigned long start, unsigned long size,
                                     pgprot_t prot, struct page **pages);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 9ec4173f48a8..2b0aa5486092 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1270,19 +1270,15 @@ void unmap_kernel_range(unsigned long addr, unsigned long size)
 }
 EXPORT_SYMBOL_GPL(unmap_kernel_range);
 
-int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
+int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page **pages)
 {
         unsigned long addr = (unsigned long)area->addr;
         unsigned long end = addr + get_vm_area_size(area);
         int err;
 
-        err = vmap_page_range(addr, end, prot, *pages);
-        if (err > 0) {
-                *pages += err;
-                err = 0;
-        }
+        err = vmap_page_range(addr, end, prot, pages);
 
-        return err;
+        return err > 0 ? 0 : err;
 }
 EXPORT_SYMBOL_GPL(map_vm_area);
 
@@ -1548,7 +1544,7 @@ void *vmap(struct page **pages, unsigned int count,
         if (!area)
                 return NULL;
 
-        if (map_vm_area(area, prot, &pages)) {
+        if (map_vm_area(area, prot, pages)) {
                 vunmap(area->addr);
                 return NULL;
         }
@@ -1606,7 +1602,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
                         cond_resched();
         }
 
-        if (map_vm_area(area, prot, &pages))
+        if (map_vm_area(area, prot, pages))
                 goto fail;
         return area->addr;
 
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index fe78189624cf..bb62a4adc328 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -690,7 +690,7 @@ static inline void __zs_cpu_down(struct mapping_area *area)
 static inline void *__zs_map_object(struct mapping_area *area,
                                 struct page *pages[2], int off, int size)
 {
-        BUG_ON(map_vm_area(area->vm, PAGE_KERNEL, &pages));
+        BUG_ON(map_vm_area(area->vm, PAGE_KERNEL, pages));
         area->vm_addr = area->vm->addr;
         return area->vm_addr + off;
 }