Skip to content

Commit 14f5ff5

Browse files
author
Al Viro
committed
VM: make zap_page_range() return void
... since all callers ignore its return value and it's been useless since commit 97a8941 (mm: Remove i_mmap_lock lockbreak) anyway. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 8b2a123 commit 14f5ff5

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

include/linux/mm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
893893

894894
int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
895895
unsigned long size);
896-
unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,
896+
void zap_page_range(struct vm_area_struct *vma, unsigned long address,
897897
unsigned long size, struct zap_details *);
898898
unsigned long unmap_vmas(struct mmu_gather *tlb,
899899
struct vm_area_struct *start_vma, unsigned long start_addr,

mm/memory.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
13861386
* @size: number of bytes to zap
13871387
* @details: details of nonlinear truncation or shared cache invalidation
13881388
*/
1389-
unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,
1389+
void zap_page_range(struct vm_area_struct *vma, unsigned long address,
13901390
unsigned long size, struct zap_details *details)
13911391
{
13921392
struct mm_struct *mm = vma->vm_mm;
@@ -1397,9 +1397,8 @@ unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,
13971397
lru_add_drain();
13981398
tlb_gather_mmu(&tlb, mm, 0);
13991399
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);
14011401
tlb_finish_mmu(&tlb, address, end);
1402-
return end;
14031402
}
14041403

14051404
/**

0 commit comments

Comments
 (0)