projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: bnx2x: avoid macro redefinition
[firefly-linux-kernel-4.4.55.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 747ecc4c0a1936494fc2401a90fbc3e09a31148d..61b993767db53e8401dc1223fa6e028f7edafd74 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-79,6
+79,7
@@
#include <linux/random.h>
#include <linux/list.h>
#include <linux/integrity.h>
#include <linux/random.h>
#include <linux/list.h>
#include <linux/integrity.h>
+#include <linux/proc_ns.h>
#include <asm/io.h>
#include <asm/bugs.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@
-665,6
+666,7
@@
asmlinkage __visible void __init start_kernel(void)
/* rootfs populating might need page-writeback */
page_writeback_init();
proc_root_init();
/* rootfs populating might need page-writeback */
page_writeback_init();
proc_root_init();
+ nsfs_init();
cgroup_init();
cpuset_init();
taskstats_init_early();
cgroup_init();
cpuset_init();
taskstats_init_early();