diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:36:07 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:36:07 +1100 |
| commit | a6aacbde406eeb6f8fc218b2c6172825f5e73fcf (patch) | |
| tree | b79e1a17c38090915085f0dbb501a0970cb79b28 /init/main.c | |
| parent | b10778a00d40b3d9fdaaf5891e802794781ff71c (diff) | |
| parent | 6fb5032ebb1c5b852461d64ee33829081de8ca61 (diff) | |
| download | linux-a6aacbde406eeb6f8fc218b2c6172825f5e73fcf.tar.bz2 | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
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(); } |