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

diff --git a/init/main.c b/init/main.c
index ed7e7ad5fee0..61b993767db5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -78,6 +78,8 @@
 #include <linux/context_tracking.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>
@@ -577,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() */
@@ -660,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();
@@ -1031,8 +1038,11 @@ static noinline void __init kernel_init_freeable(void)
 	 * Ok, we have completed the initial bootup, and
 	 * we're essentially up and running. Get rid of the
 	 * initmem segments and start the user-mode stuff..
+	 *
+	 * rootfs is available now, try loading the public keys
+	 * and default modules
 	 */
 
-	/* rootfs is available now, try loading default modules */
+	integrity_load_keys();
 	load_default_modules();
 }