summaryrefslogtreecommitdiffstats
path: root/mm/ksm.c
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2011-01-13 15:46:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 17:32:38 -0800
commitae52a2adb5afa5ac5ec5fb5c7b24777f84b6c926 (patch)
treefb02d8fb1699c85cc278e2333ce25916835bf341 /mm/ksm.c
parent240c879f20a605346705be24253bc9fc6fa8a106 (diff)
downloadop-kernel-dev-ae52a2adb5afa5ac5ec5fb5c7b24777f84b6c926.zip
op-kernel-dev-ae52a2adb5afa5ac5ec5fb5c7b24777f84b6c926.tar.gz
thp: ksm: free swap when swapcache page is replaced
When a swapcache page is replaced by a ksm page, it's best to free that swap immediately. Reported-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/ksm.c')
-rw-r--r--mm/ksm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/ksm.c b/mm/ksm.c
index 43bc893..b5b907c 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -800,6 +800,8 @@ static int replace_page(struct vm_area_struct *vma, struct page *page,
set_pte_at_notify(mm, addr, ptep, mk_pte(kpage, vma->vm_page_prot));
page_remove_rmap(page);
+ if (!page_mapped(page))
+ try_to_free_swap(page);
put_page(page);
pte_unmap_unlock(ptep, ptl);
OpenPOWER on IntegriCloud