X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=init%2Fmain.c;h=61b993767db53e8401dc1223fa6e028f7edafd74;hb=b1e8bc617d30fc9360a58889f21a0d0ce982cf04;hp=8a914b758e5d9416ccfcffca4c1c9a3941142cf8;hpb=67e2c3883828b39548cee2091b36656787775d95;p=firefly-linux-kernel-4.4.55.git

diff --git a/init/main.c b/init/main.c
index 8a914b758e5d..61b993767db5 100644
--- 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/proc_ns.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -578,6 +579,10 @@ asmlinkage __visible void __init start_kernel(void)
 		local_irq_disable();
 	idr_init_cache();
 	rcu_init();
+
+	/* trace_printk() and trace points may be used after this */
+	trace_init();
+
 	context_tracking_init();
 	radix_tree_init();
 	/* init some links before init_ISA_irqs() */
@@ -661,6 +666,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();