---

yaml --- r: 230835 b: refs/heads/master c: f3e8eb7 h: refs/heads/master i: 230833: 38a71ec 230831: 29d3619 v: v3
git-mirror · Jan 14, 2011 · aff16e7 · aff16e7
1 parent be3cf8d
commit aff16e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbd4ea78f002df283c95d9774837041735fa1bf9
+refs/heads/master: f3e8eb70b1807d1b30aa6972af0cf30077c40112
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1312,8 +1312,9 @@ u64 mem_cgroup_get_limit(struct mem_cgroup *memcg)
 	u64 limit;
 	u64 memsw;
 
-	limit = res_counter_read_u64(&memcg->res, RES_LIMIT) +
-			total_swap_pages;
+	limit = res_counter_read_u64(&memcg->res, RES_LIMIT);
+	limit += total_swap_pages << PAGE_SHIFT;
+
 	memsw = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
 	/*
 	 * If memsw is finite and limits the amount of swap space available