ixgbe: add support for 82599 KR device 0x1517

[karo-tx-linux.git] / mm / ksm.c

diff --git a/mm/ksm.c b/mm/ksm.c
index 5575f8628fef5306611055092e47ed9f472f4027..e9501f833374eb4227cb724c31dc04b2710eca4d 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -34,6 +34,7 @@
 #include <linux/ksm.h>
 
 #include <asm/tlbflush.h>
+#include "internal.h"
 
 /*
  * A few notes about the KSM scanning process,
@@ -767,15 +768,14 @@ static int try_to_merge_one_page(struct vm_area_struct *vma,
         * ptes are necessarily already write-protected.  But in either
         * case, we need to lock and check page_count is not raised.
         */
-       if (write_protect_page(vma, oldpage, &orig_pte)) {
-               unlock_page(oldpage);
-               goto out_putpage;
-       }
-       unlock_page(oldpage);
-
-       if (pages_identical(oldpage, newpage))
+       if (write_protect_page(vma, oldpage, &orig_pte) == 0 &&
+           pages_identical(oldpage, newpage))
                err = replace_page(vma, oldpage, newpage, orig_pte);
 
+       if ((vma->vm_flags & VM_LOCKED) && !err)
+               munlock_vma_page(oldpage);
+
+       unlock_page(oldpage);
 out_putpage:
        put_page(oldpage);
        put_page(newpage);