X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=init%2Fmain.c;h=9fc795fe4b3bcd2b6767773f9ebb698b9fc75802;hb=a6aacbde406eeb6f8fc218b2c6172825f5e73fcf;hp=bb1aed928f21391b63493112c6bb1a1eae39077f;hpb=2136edf3bf5ee6dfda9ac7abe272a080c35dc811;p=cascardo%2Flinux.git

diff --git a/init/main.c b/init/main.c
index bb1aed928f21..9fc795fe4b3b 100644
--- 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/integrity.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -1027,8 +1028,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();
 }