Merge branch 'nsfs' into for-next

[firefly-linux-kernel-4.4.55.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 321d0ceb26d3782ed6871feef4c52090e9872b23..40240c8e31e804c1c6508545c998814d134c0636 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -78,6 +78,7 @@
 #include <linux/context_tracking.h>
 #include <linux/random.h>
 #include <linux/list.h>
+#include <linux/proc_ns.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -660,6 +661,7 @@ asmlinkage __visible void __init start_kernel(void)
        /* rootfs populating might need page-writeback */
        page_writeback_init();
        proc_root_init();
+       nsfs_init();
        cgroup_init();
        cpuset_init();
        taskstats_init_early();