diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-05 10:38:03 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-05 10:38:03 -0600 |
| commit | 2370f2741fde8e01f9f7b88edb59b9e65934a3dc (patch) | |
| tree | 4cfbdff6a9ead30feeec501899a48c27055b52ec /init | |
| parent | b7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (diff) | |
| parent | 14e9c7db465387ede7f019c42f28c90f99fc2793 (diff) | |
Merge tag 'v3.10.17' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lng
This is the 3.10.17 stable release
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 9484f4ba88d0..e83ac04fda97 100644 --- a/init/main.c +++ b/init/main.c @@ -74,6 +74,7 @@ #include <linux/ptrace.h> #include <linux/blkdev.h> #include <linux/elevator.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/bugs.h> @@ -777,6 +778,7 @@ static void __init do_basic_setup(void) do_ctors(); usermodehelper_enable(); do_initcalls(); + random_int_secret_init(); } static void __init do_pre_smp_initcalls(void) |