Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 038c7aa1 authored by Al Viro's avatar Al Viro
Browse files

VM: unmap_page_range() can return void 



return value is always the 4th ('end') argument.

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

mm/memory.c

+6 −9
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ static inline unsigned long zap_pud_range(struct mmu_gather *tlb, 
	return addr;

}



static unsigned long unmap_page_range(struct mmu_gather *tlb,

static void unmap_page_range(struct mmu_gather *tlb,

			     struct vm_area_struct *vma,

			     unsigned long addr, unsigned long end,

			     struct zap_details *details)
@@ -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;

		}

	}