Merge branch 'ptp-virtual-clocks-and-timestamping'

[linux-2.6-microblaze.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 47c255b..a369a61 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -634,10 +634,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
        unsigned long *p)
 {
        struct mm_struct *mm = current->mm;
-       struct vm_area_struct *vma = find_vma(mm, addr);
+       struct vm_area_struct *vma;
        unsigned long pgoff;
 
-       if (!vma || vma->vm_start > addr)
+       vma = vma_lookup(mm, addr);
+       if (!vma)
                return ERR_PTR(-EFAULT);
 
        /*