1 files changed, 3 insertions, 2 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d888956a2cfc..9f8ad77f091b 100644
--- a/mm/memcontrol.c
+++ b/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