aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-05 13:38:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:39:50 -0400
commit14f5ff5df37a8fabe2d25b1e64df7e010cc87db9 (patch)
tree10f46ad8429790de35ebad33631d435f74aaff0e
parent8b2a12382ccc9df31b27dac37fe04dffe088b57c (diff)
VM: make zap_page_range() return void
... since all callers ignore its return value and it's been useless since commit 97a894136f29802da19a15541de3c019e1ca147e (mm: Remove i_mmap_lock lockbreak) anyway. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/mm.h2
-rw-r--r--mm/memory.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 17b27cd269c4..6c65d24852e5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -893,7 +893,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
893 893
894int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, 894int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
895 unsigned long size); 895 unsigned long size);
896unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address, 896void zap_page_range(struct vm_area_struct *vma, unsigned long address,
897 unsigned long size, struct zap_details *); 897 unsigned long size, struct zap_details *);
898unsigned long unmap_vmas(struct mmu_gather *tlb, 898unsigned long unmap_vmas(struct mmu_gather *tlb,
899 struct vm_area_struct *start_vma, unsigned long start_addr, 899 struct vm_area_struct *start_vma, unsigned long start_addr,
diff --git a/mm/memory.c b/mm/memory.c
index f2317c85704e..cfb57b007a6c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1386,7 +1386,7 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
1386 * @size: number of bytes to zap 1386 * @size: number of bytes to zap
1387 * @details: details of nonlinear truncation or shared cache invalidation 1387 * @details: details of nonlinear truncation or shared cache invalidation
1388 */ 1388 */
1389unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address, 1389void zap_page_range(struct vm_area_struct *vma, unsigned long address,
1390 unsigned long size, struct zap_details *details) 1390 unsigned long size, struct zap_details *details)
1391{ 1391{
1392 struct mm_struct *mm = vma->vm_mm; 1392 struct mm_struct *mm = vma->vm_mm;
@@ -1397,9 +1397,8 @@ unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,
1397 lru_add_drain(); 1397 lru_add_drain();
1398 tlb_gather_mmu(&tlb, mm, 0); 1398 tlb_gather_mmu(&tlb, mm, 0);
1399 update_hiwater_rss(mm); 1399 update_hiwater_rss(mm);
1400 end = unmap_vmas(&tlb, vma, address, end, &nr_accounted, details); 1400 unmap_vmas(&tlb, vma, address, end, &nr_accounted, details);
1401 tlb_finish_mmu(&tlb, address, end); 1401 tlb_finish_mmu(&tlb, address, end);
1402 return end;
1403} 1402}
1404 1403
1405/** 1404/**