On Fri, Nov 19, 2010 at 01:39:57AM +0100, David Sterba wrote: > Commit d33b9f45 introduces a check if a vma is a hugetlbfs one and > later in 5dc37642 is moved under #ifdef CONFIG_HUGETLB_PAGE but > a needless find_vma call is left behind and it's result not used > anywhere else in the function. > > The sideefect of caching vma for @addr inside walk->mm is neither > utilized in walk_page_range() nor in called functions. > > Signed-off-by: David Sterba <dsterba@xxxxxxx> > Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> > Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> > Cc: Andy Whitcroft <apw@xxxxxxxxxxxxx> > Cc: David Rientjes <rientjes@xxxxxxxxxx> > Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx> > Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx> > Cc: Matt Mackall <mpm@xxxxxxxxxxx> > Cc: Mel Gorman <mel@xxxxxxxxx> > Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx> > --- > mm/pagewalk.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/mm/pagewalk.c b/mm/pagewalk.c > index 8b1a2ce..38cc58b 100644 > --- a/mm/pagewalk.c > +++ b/mm/pagewalk.c > @@ -139,7 +139,6 @@ int walk_page_range(unsigned long addr, unsigned long end, > pgd_t *pgd; > unsigned long next; > int err = 0; > - struct vm_area_struct *vma; > > if (addr >= end) > return err; > @@ -149,15 +148,17 @@ int walk_page_range(unsigned long addr, unsigned long end, > > pgd = pgd_offset(walk->mm, addr); > do { > + struct vm_area_struct *uninitialized_var(vma); > + > next = pgd_addr_end(addr, end); > > +#ifdef CONFIG_HUGETLB_PAGE > /* > * handle hugetlb vma individually because pagetable walk for > * the hugetlb page is dependent on the architecture and > * we can't handled it in the same manner as non-huge pages. > */ > vma = find_vma(walk->mm, addr); > -#ifdef CONFIG_HUGETLB_PAGE > if (vma && is_vm_hugetlb_page(vma)) { > if (vma->vm_end < next) > next = vma->vm_end; Looks good to me. Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Thanks, Naoya Horiguchi -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>