diff --git a/[refs] b/[refs] index a1cbfd52cc3d..b44057cf7e9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93fac7041f082297b93655a0e49f659cd7520e40 +refs/heads/master: d6692183ac1d8f4a4e4015f9ce9acc2514618e0b diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index ebad6bbb3501..d87885eb4acc 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -697,9 +697,10 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, pfn_offset = (vaddr & ~HPAGE_MASK) >> PAGE_SHIFT; page = pte_page(*pte); same_page: - get_page(page); - if (pages) + if (pages) { + get_page(page); pages[i] = page + pfn_offset; + } if (vmas) vmas[i] = vma;