aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-05 13:25:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:39:50 -0400
commit038c7aa16a38059ac23dfe9caa6954226ea20728 (patch)
treeb851af73694ff7e0cd69ce90c7506c82122215c1 /mm/memory.c
parentc16fa4f2ad19908a47c63d8fa436a1178438c7e7 (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>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c15
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,
1282 return addr; 1282 return addr;
1283} 1283}
1284 1284
1285static unsigned long unmap_page_range(struct mmu_gather *tlb, 1285static void unmap_page_range(struct mmu_gather *tlb,
1286 struct vm_area_struct *vma, 1286 struct vm_area_struct *vma,
1287 unsigned long addr, unsigned long end, 1287 unsigned long addr, unsigned long end,
1288 struct zap_details *details) 1288 struct zap_details *details)
1289{ 1289{
1290 pgd_t *pgd; 1290 pgd_t *pgd;
1291 unsigned long next; 1291 unsigned long next;
@@ -1305,8 +1305,6 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb,
1305 } while (pgd++, addr = next, addr != end); 1305 } while (pgd++, addr = next, addr != end);
1306 tlb_end_vma(tlb, vma); 1306 tlb_end_vma(tlb, vma);
1307 mem_cgroup_uncharge_end(); 1307 mem_cgroup_uncharge_end();
1308
1309 return addr;
1310} 1308}
1311 1309
1312/** 1310/**
@@ -1371,10 +1369,9 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
1371 */ 1369 */
1372 if (vma->vm_file) 1370 if (vma->vm_file)
1373 unmap_hugepage_range(vma, start, end, NULL); 1371 unmap_hugepage_range(vma, start, end, NULL);
1374
1375 start = end;
1376 } else 1372 } else
1377 start = unmap_page_range(tlb, vma, start, end, details); 1373 unmap_page_range(tlb, vma, start, end, details);
1374 start = end;
1378 } 1375 }
1379 } 1376 }
1380 1377