diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 17084ea017f9..77e8170b9d00 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7322,6 +7322,9 @@ void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages)
 	struct mem_cgroup *memcg;
 	unsigned short id;
 
+	if (mem_cgroup_disabled())
+		return;
+
 	id = swap_cgroup_record(entry, 0, nr_pages);
 	rcu_read_lock();
 	memcg = mem_cgroup_from_id(id);
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 1d1e1c25aa8e..143e709f946d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3818,6 +3818,9 @@ void cgroup_throttle_swaprate(struct page *page, gfp_t gfp_mask)
 	struct swap_info_struct *si, *next;
 	int nid = page_to_nid(page);
 
+	if (mem_cgroup_disabled())
+		return;
+
 	if (!(gfp_mask & __GFP_IO))
 		return;
 
diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 26d6577d0a55..632b88e9d49b 100644
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -242,9 +242,14 @@ static void vmpressure_work_fn(struct work_struct *work)
 void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
 		unsigned long scanned, unsigned long reclaimed)
 {
-	struct vmpressure *vmpr = memcg_to_vmpressure(memcg);
+	struct vmpressure *vmpr;
 	bool bypass = false;
 
+	if (mem_cgroup_disabled())
+		return;
+
+	vmpr = memcg_to_vmpressure(memcg);
+
 	trace_android_vh_vmpressure(memcg, &bypass);
 	if (unlikely(bypass))
 		return;