X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=341bf86d26c258ddb77717b0e1514e3d05c1eb10;hb=b6ecd2dea4435a771a99c497a6ac5df6d3618c5a;hp=28d1b1e9d4fb78e63f99074359b4fcc57cf4604c;hpb=0fc9f58a90a5012942abf0ae98cfc852afebc0a6;p=deliverable%2Flinux.git

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 28d1b1e9d4fb..341bf86d26c2 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2346,7 +2346,7 @@ int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order)
 	int ret = 0;
 
 	memcg = get_mem_cgroup_from_mm(current->mm);
-	if (memcg_kmem_online(memcg))
+	if (!mem_cgroup_is_root(memcg))
 		ret = __memcg_kmem_charge_memcg(page, gfp, order, memcg);
 	css_put(&memcg->css);
 	return ret;