diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 178e9dee217a6d1b9941b75d54a16ff941a01edb..fcfa9a75c18e4075c53bb9036c83fbdc6074dfe1 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -453,7 +453,7 @@ struct mm_struct {
 		spinlock_t			ioctx_lock;
 		struct kioctx_table __rcu	*ioctx_table;
 #endif
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MM_OWNER
 		/*
 		 * "owner" points to a task that is regarded as the canonical
 		 * user/owner of this mm. All of the following must be true in
diff --git a/init/Kconfig b/init/Kconfig
index d1427ae4de9e960e87ffe6b043df0c18d9fd8669..6880b55901bbff867dc02613e4b90756afc60a7e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -705,6 +705,7 @@ config MEMCG
 	bool "Memory controller"
 	select PAGE_COUNTER
 	select EVENTFD
+	select MM_OWNER
 	help
 	  Provides control over the memory footprint of tasks in a cgroup.
 
diff --git a/kernel/exit.c b/kernel/exit.c
index 891d65e3ffd514011912d104e47e709fafdda3eb..4d6f941712b60274a31d03cf80a07eaf19aac0b9 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -392,7 +392,7 @@ kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent)
 	}
 }
 
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MM_OWNER
 /*
  * A task is exiting.   If it owned this mm, find a new owner for the mm.
  */
@@ -478,7 +478,7 @@ void mm_update_next_owner(struct mm_struct *mm)
 	task_unlock(c);
 	put_task_struct(c);
 }
-#endif /* CONFIG_MEMCG */
+#endif /* CONFIG_MM_OWNER */
 
 /*
  * Turn us into a lazy TLB process if we
diff --git a/kernel/fork.c b/kernel/fork.c
index 768fe41a7ee3e3be7849e1a1ac36cc2bc8d24619..1ac49d1852cf1d5d7ef2fc212f763a31307e0e09 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -958,7 +958,7 @@ static void mm_init_aio(struct mm_struct *mm)
 static __always_inline void mm_clear_owner(struct mm_struct *mm,
 					   struct task_struct *p)
 {
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MM_OWNER
 	if (mm->owner == p)
 		WRITE_ONCE(mm->owner, NULL);
 #endif
@@ -966,7 +966,7 @@ static __always_inline void mm_clear_owner(struct mm_struct *mm,
 
 static void mm_init_owner(struct mm_struct *mm, struct task_struct *p)
 {
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MM_OWNER
 	mm->owner = p;
 #endif
 }
diff --git a/mm/Kconfig b/mm/Kconfig
index dddeb30d645e31fe02a255315ff2cdb62af51e6f..76c2197a3f99cba91db6d35648fc613365dda0f8 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -299,6 +299,10 @@ config VIRT_TO_BUS
 	  deprecated interface virt_to_bus().  All new architectures
 	  should probably not select this.
 
+config MM_OWNER
+	bool "Enable the ownership the mm owner"
+	help
+	  This option enables mm_struct's to have an owner.
 
 config MMU_NOTIFIER
 	bool
diff --git a/mm/debug.c b/mm/debug.c
index 362ce581671e7551c32b6bc1d93e06bebcf41ec5..2da184b16bce0f088cef07c02b0ce640c8cc9c7d 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -129,7 +129,7 @@ void dump_mm(const struct mm_struct *mm)
 #ifdef CONFIG_AIO
 		"ioctx_table %px\n"
 #endif
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MM_OWNER
 		"owner %px "
 #endif
 		"exe_file %px\n"