diff --git a/[refs] b/[refs] index e819dc4e2532..85d381b21312 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9da61aef0fd5b17dd4bf4baf33db12c470def774 +refs/heads/master: 4866920b93fd7d5b520278c3c76e6f4d5a352d81 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index f6e3be9cbf5a..80c3fb370f91 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -285,7 +285,7 @@ void free_pgtables(struct mmu_gather **tlb, struct vm_area_struct *vma, * Optimization: gather nearby vmas into one call down */ while (next && next->vm_start <= vma->vm_end + PMD_SIZE - && !is_vm_hugetlb_page(vma)) { + && !is_vm_hugetlb_page(next)) { vma = next; next = vma->vm_next; anon_vma_unlink(vma);