diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-05 13:25:09 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:39:50 -0400 |
| commit | 038c7aa16a38059ac23dfe9caa6954226ea20728 (patch) | |
| tree | b851af73694ff7e0cd69ce90c7506c82122215c1 | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
VM: unmap_page_range() can return void
return value is always the 4th ('end') argument.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | mm/memory.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/mm/memory.c b/mm/memory.c index fa2f04e0337c..1b6712a9720d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1282,10 +1282,10 @@ static inline unsigned long zap_pud_range(struct mmu_gather *tlb, 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; @@ -1305,8 +1305,6 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb, } while (pgd++, addr = next, addr != end); tlb_end_vma(tlb, vma); mem_cgroup_uncharge_end(); - - return addr; } /** @@ -1371,10 +1369,9 @@ unsigned long unmap_vmas(struct mmu_gather *tlb, */ 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; } } |