X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=e0c2066495e3fd4adf19254266df619048546cdb;hb=1668bfd5be9d8a52536c4865000fbbe065a3613b;hp=c31a310aa146213d822060ad716a7d94b65a349f;hpb=af901ca181d92aac3a7dc265144a9081a86d8f39;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c31a310..e0c2066 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1737,11 +1737,12 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
 		goto charge_cur_mm;
 	/*
 	 * A racing thread's fault, or swapoff, may have already updated
-	 * the pte, and even removed page from swap cache: return success
-	 * to go on to do_swap_page()'s pte_same() test, which should fail.
+	 * the pte, and even removed page from swap cache: in those cases
+	 * do_swap_page()'s pte_same() test will fail; but there's also a
+	 * KSM case which does need to charge the page.
 	 */
 	if (!PageSwapCache(page))
-		return 0;
+		goto charge_cur_mm;
 	mem = try_get_mem_cgroup_from_swapcache(page);
 	if (!mem)
 		goto charge_cur_mm;