X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Fksm.c;fp=mm%2Fksm.c;h=01830839d6e1c393fad015d05f8c666052b0b39f;hb=85c6e8dd23c6aa9ff299bf5256fe5f0a6c44f100;hp=d4ee1591520b2d8cf4867eea3f64a472535cfae3;hpb=98666f8a2576b12f5f3ebcef61a8cdbefede1be3;p=cascardo%2Flinux.git

diff --git a/mm/ksm.c b/mm/ksm.c
index d4ee1591520b..01830839d6e1 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1021,8 +1021,6 @@ static int try_to_merge_one_page(struct vm_area_struct *vma,
 	if (page == kpage)			/* ksm page forked */
 		return 0;
 
-	if (!(vma->vm_flags & VM_MERGEABLE))
-		goto out;
 	if (PageTransCompound(page) && page_trans_compound_anon_split(page))
 		goto out;
 	BUG_ON(PageTransCompound(page));
@@ -1087,10 +1085,8 @@ static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item,
 	int err = -EFAULT;
 
 	down_read(&mm->mmap_sem);
-	if (ksm_test_exit(mm))
-		goto out;
-	vma = find_vma(mm, rmap_item->address);
-	if (!vma || vma->vm_start > rmap_item->address)
+	vma = find_mergeable_vma(mm, rmap_item->address);
+	if (!vma)
 		goto out;
 
 	err = try_to_merge_one_page(vma, page, kpage);