CIFS: Clarify SMB1 code for POSIX Lock

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

diff --git a/mm/ksm.c b/mm/ksm.c
index 2f3aaeb..3fa9bc8 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -521,10 +521,8 @@ static struct vm_area_struct *find_mergeable_vma(struct mm_struct *mm,
        struct vm_area_struct *vma;
        if (ksm_test_exit(mm))
                return NULL;
-       vma = find_vma(mm, addr);
-       if (!vma || vma->vm_start > addr)
-               return NULL;
-       if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+       vma = vma_lookup(mm, addr);
+       if (!vma || !(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
                return NULL;
        return vma;
 }