From aff16e7b1f0d9d8832222492c5f3d36aae7bbfbd Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Thu, 13 Jan 2011 15:47:39 -0800 Subject: [PATCH] --- yaml --- r: 230835 b: refs/heads/master c: f3e8eb70b1807d1b30aa6972af0cf30077c40112 h: refs/heads/master i: 230833: 38a71ec5ef3e688200c3e0d5aaf521245a7e96cc 230831: 29d3619d6c2c4243aebf0692a0ec8e7612e6d61e v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3b59835b2894..a4e0222b7f12 100644 --- 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 index d888956a2cfc..9f8ad77f091b 100644 --- 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