2 files changed, 8 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a3457926342a..98fa96eac415 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -378,9 +378,13 @@ config RESOURCE_COUNTERS
           infrastructure that works with cgroups
         depends on CGROUPS
 
+config MM_OWNER
+        bool
+
 config CGROUP_MEM_RES_CTLR
         bool "Memory Resource Controller for Control Groups"
         depends on CGROUPS && RESOURCE_COUNTERS
+        select MM_OWNER
         help
           Provides a memory resource controller that manages both page cache and
           RSS memory.
@@ -393,6 +397,9 @@ config CGROUP_MEM_RES_CTLR
           Only enable when you're ok with these trade offs and really
           sure you need the memory resource controller.
 
+          This config option also selects MM_OWNER config option, which
+          could in turn add some fork/exit overhead.
+
 config SYSFS_DEPRECATED
         bool
 
diff --git a/init/main.c b/init/main.c
index 1116d2f40cc1..c62c98f381f2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -559,6 +559,7 @@ asmlinkage void __init start_kernel(void)
         printk(KERN_NOTICE);
         printk(linux_banner);
         setup_arch(&command_line);
+        mm_init_owner(&init_mm, &init_task);
         setup_command_line(command_line);
         unwind_setup();
         setup_per_cpu_areas();