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>
This commit is contained in:
parent
c16fa4f2ad
commit
038c7aa16a
15
mm/memory.c
15
mm/memory.c
|
@ -1282,10 +1282,10 @@ static inline unsigned long zap_pud_range(struct mmu_gather *tlb,
|
|||
return addr;
|
||||
}
|
||||
|
||||
static unsigned long unmap_page_range(struct mmu_gather *tlb,
|
||||
struct vm_area_struct *vma,
|
||||
unsigned long addr, unsigned long end,
|
||||
struct zap_details *details)
|
||||
static void unmap_page_range(struct mmu_gather *tlb,
|
||||
struct vm_area_struct *vma,
|
||||
unsigned long addr, unsigned long end,
|
||||
struct zap_details *details)
|
||||
{
|
||||
pgd_t *pgd;
|
||||
unsigned long next;
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue