Merge tag 'staging-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / mm / ksm.c

diff --git a/mm/ksm.c b/mm/ksm.c
index 80c29b1b2b8af3b631dfb30954794560394f1af0..ca6d2a06a6157fabdc01aafa06b797320364a87c 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1013,6 +1013,12 @@ static int try_to_merge_one_page(struct vm_area_struct *vma,
                         */
                        set_page_stable_node(page, NULL);
                        mark_page_accessed(page);
+                       /*
+                        * Page reclaim just frees a clean page with no dirty
+                        * ptes: make sure that the ksm page would be swapped.
+                        */
+                       if (!PageDirty(page))
+                               SetPageDirty(page);
                        err = 0;
                } else if (pages_identical(page, kpage))
                        err = replace_page(vma, page, kpage, orig_pte);