diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 09ab0679ab338a657ce4c120de0052b3c6c37973..b17ac832c964ebf85a0fead22c1bc80796156266 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -481,6 +481,7 @@ static inline int inode_congested(struct inode *inode, int cong_bits)
 	return wb_congested(&inode_to_bdi(inode)->wb, cong_bits);
 }
 
+#ifdef CONFIG_CGROUPS
 static inline void insert_memcg_blkcg_link(struct cgroup_subsys *ss,
 					   struct list_head *tmp_links,
 					   struct css_set *cset)
@@ -500,6 +501,7 @@ static inline void delete_memcg_blkcg_link(struct cgroup_subsys *ss,
 					   struct cgroup_subsys_state *css)
 {
 }
+#endif
 
 #endif	/* CONFIG_CGROUP_WRITEBACK */
 
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 6fdf7eb33a11900ebd7ba50d679f938b7f372d76..100715d874c7d96f42764483111e7e5d3a79ee0d 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -303,6 +303,7 @@ TRACE_EVENT(writeback_bdi_register,
 	)
 );
 
+#ifdef CONFIG_CGROUP_WRITEBACK
 TRACE_EVENT(insert_memcg_blkcg_link,
 	TP_PROTO(struct cgroup_subsys_state *memcg_css,
 		 struct cgroup_subsys_state *blkcg_css,
@@ -323,6 +324,7 @@ TRACE_EVENT(insert_memcg_blkcg_link,
 		  __entry->memcg_ino, __entry->blkcg_ino, __entry->old_blkcg_ino
 	)
 );
+#endif
 
 DECLARE_EVENT_CLASS(wbc_class,
 	TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index dfe15f48ac38936603fa604bb8c827df1cb4e2e1..5ae466e163b17e61b7b48177f24fb764a3563c09 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -468,8 +468,12 @@ struct cgroup_subsys_state *mem_cgroup_css_from_page(struct page *page)
 
 	memcg = page->mem_cgroup;
 
+#ifdef CONFIG_CGROUP_WRITEBACK
 	if (!memcg ||
-	   (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgwb_v1))
+	    (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgwb_v1))
+#else
+	if (!memcg || !cgroup_subsys_on_dfl(memory_cgrp_subsys))
+#endif
 		memcg = root_mem_cgroup;
 
 	return &memcg->css;
@@ -6399,6 +6403,7 @@ static int __init cgroup_memory(char *s)
 }
 __setup("cgroup.memory=", cgroup_memory);
 
+#ifdef CONFIG_CGROUP_WRITEBACK
 bool cgwb_v1 = false;
 
 static int __init enable_cgroup_writeback_v1(char *s)
@@ -6408,6 +6413,7 @@ static int __init enable_cgroup_writeback_v1(char *s)
 	return 0;
 }
 __setup("cgwb_v1", enable_cgroup_writeback_v1);
+#endif
 
 /*
  * subsys_initcall() for memory controller.