diff --git a/[refs] b/[refs] index 58571ae5c6a6..9f1f37812f03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 473b0ce4d13ee77925a7062e25dea0d16a91f654 +refs/heads/master: 26465d3ea5a62d59efb3796b9e0e2b0656d02cb1 diff --git a/trunk/mm/ksm.c b/trunk/mm/ksm.c index 9f8f0523562b..81f692e836db 100644 --- a/trunk/mm/ksm.c +++ b/trunk/mm/ksm.c @@ -1268,6 +1268,14 @@ static void ksm_do_scan(unsigned int scan_npages) return; if (!PageKsm(page) || !in_stable_tree(rmap_item)) cmp_and_merge_page(page, rmap_item); + else if (page_mapcount(page) == 1) { + /* + * Replace now-unshared ksm page by ordinary page. + */ + break_cow(rmap_item->mm, rmap_item->address); + remove_rmap_item_from_tree(rmap_item); + rmap_item->oldchecksum = calc_checksum(page); + } put_page(page); } }