return addr;
 }
 
-static unsigned long unmap_page_range(struct mmu_gather *tlb,
-                               struct vm_area_struct *vma,
-                               unsigned long addr, unsigned long end,
-                               struct zap_details *details)
+static void unmap_page_range(struct mmu_gather *tlb,
+                            struct vm_area_struct *vma,
+                            unsigned long addr, unsigned long end,
+                            struct zap_details *details)
 {
        pgd_t *pgd;
        unsigned long next;
        } while (pgd++, addr = next, addr != end);
        tlb_end_vma(tlb, vma);
        mem_cgroup_uncharge_end();
-
-       return addr;
 }
 
 /**
                                 */
                                if (vma->vm_file)
                                        unmap_hugepage_range(vma, start, end, NULL);
-
-                               start = end;
                        } else
-                               start = unmap_page_range(tlb, vma, start, end, details);
+                               unmap_page_range(tlb, vma, start, end, details);
+                       start = end;
                }
        }