From 59abce5b0ad1da8903541343c45153d1d18effae Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Tue, 29 May 2012 15:06:52 -0700
Subject: [PATCH] --- yaml --- r: 308893 b: refs/heads/master c:
 86493009d3b7e51eee38575f9537b754f5b6c536 h: refs/heads/master i:   308891:
 e11c72aa3a3683f7f2afc11613d7579dbe5add78 v: v3

---
 [refs]                |  2 +-
 trunk/mm/memcontrol.c | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 6a2157f836ed..325399fc466d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e91cbb42531626cd4fd0673ca01daf53e338d8f9
+refs/heads/master: 86493009d3b7e51eee38575f9537b754f5b6c536
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index d5ba631e0ec7..30f938c86453 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2855,24 +2855,7 @@ __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,
 	 */
 	if (do_swap_account && PageSwapCache(page)) {
 		swp_entry_t ent = {.val = page_private(page)};
-		struct mem_cgroup *swap_memcg;
-		unsigned short id;
-
-		id = swap_cgroup_record(ent, 0);
-		rcu_read_lock();
-		swap_memcg = mem_cgroup_lookup(id);
-		if (swap_memcg) {
-			/*
-			 * This recorded memcg can be obsolete one. So, avoid
-			 * calling css_tryget
-			 */
-			if (!mem_cgroup_is_root(swap_memcg))
-				res_counter_uncharge(&swap_memcg->memsw,
-						     PAGE_SIZE);
-			mem_cgroup_swap_statistics(swap_memcg, false);
-			mem_cgroup_put(swap_memcg);
-		}
-		rcu_read_unlock();
+		mem_cgroup_uncharge_swap(ent);
 	}
 	/*
 	 * At swapin, we may charge account against cgroup which has no tasks.