---

yaml --- r: 176297 b: refs/heads/master c: 407f9c8 h: refs/heads/master i: 176295: e6da40c v: v3
git-mirror · Dec 15, 2009 · b12f414 · b12f414
1 parent 9dfea65
commit b12f414
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80e148226028257ec0a1909d99b2c40d0ffe17f2
+refs/heads/master: 407f9c8b0889ced1dbe2f9157e4e60c61329d5c9
diff --git a/trunk/mm/memcontrol.c b/trunk/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;