diff --git a/[refs] b/[refs] index b045bf64fcf7..b8245654b5b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45ebb840257b060ec54416aebffd9747e210962c +refs/heads/master: 4b6ddbf7ed4ef2f40e0a27418146eedaa68953c6 diff --git a/trunk/mm/pagewalk.c b/trunk/mm/pagewalk.c index c3450d533611..606bbb4125d0 100644 --- a/trunk/mm/pagewalk.c +++ b/trunk/mm/pagewalk.c @@ -176,7 +176,7 @@ int walk_page_range(unsigned long addr, unsigned long end, * we can't handled it in the same manner as non-huge pages. */ vma = find_vma(walk->mm, addr); - if (vma && is_vm_hugetlb_page(vma)) { + if (vma && vma->vm_start <= addr && is_vm_hugetlb_page(vma)) { if (vma->vm_end < next) next = vma->vm_end; /*