Skip to content

Commit

Permalink
VM: unmap_page_range() can return void
Browse files Browse the repository at this point in the history
return value is always the 4th ('end') argument.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 21, 2012
1 parent c16fa4f commit 038c7aa
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

/**
Expand Down Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 038c7aa

Please sign in to comment.