diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9518aefd8cbb5b4f1a0c9ce464705d65118f642a..d5343ba6e677874ecf82916808e8879203ff546b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2631,7 +2631,7 @@ int memcg_kmem_charge(struct page *page, gfp_t gfp, int order)
 	struct mem_cgroup *memcg;
 	int ret = 0;
 
-	if (memcg_kmem_bypass())
+	if (mem_cgroup_disabled() || memcg_kmem_bypass())
 		return 0;
 
 	memcg = get_mem_cgroup_from_current();