Commit 14f5ff5d authored by Al Viro's avatar Al Viro
Browse files

VM: make zap_page_range() return void 



... since all callers ignore its return value and it's been
useless since commit 97a89413
(mm: Remove i_mmap_lock lockbreak) anyway.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8b2a1238

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, 


int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,

		unsigned long size);

unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,

void zap_page_range(struct vm_area_struct *vma, unsigned long address,

		unsigned long size, struct zap_details *);

unsigned long unmap_vmas(struct mmu_gather *tlb,

		struct vm_area_struct *start_vma, unsigned long start_addr,

mm/memory.c

+2 −3
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ unsigned long unmap_vmas(struct mmu_gather *tlb, 
 * @size: number of bytes to zap

 * @details: details of nonlinear truncation or shared cache invalidation

 */

unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,

void zap_page_range(struct vm_area_struct *vma, unsigned long address,

		unsigned long size, struct zap_details *details)

{

	struct mm_struct *mm = vma->vm_mm;
@@ -1397,9 +1397,8 @@ unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address, 
	lru_add_drain();

	tlb_gather_mmu(&tlb, mm, 0);

	update_hiwater_rss(mm);

	end = unmap_vmas(&tlb, vma, address, end, &nr_accounted, details);

	unmap_vmas(&tlb, vma, address, end, &nr_accounted, details);

	tlb_finish_mmu(&tlb, address, end);

	return end;

}



/**