diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 12:31:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 12:31:43 -0700 |
| commit | f715729ee4cb666f51749f6cd86d06fff1e6e17b (patch) | |
| tree | cf8f2c6c2d90441d6a978915b5d7eb0b19981f44 /init/main.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | random: allow architectures to optionally define random_get_entropy() (diff) | |
| download | linux-dev-f715729ee4cb666f51749f6cd86d06fff1e6e17b.tar.xz linux-dev-f715729ee4cb666f51749f6cd86d06fff1e6e17b.zip | |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull /dev/random changes from Ted Ts'o:
"These patches are designed to enable improvements to /dev/random for
non-x86 platforms, in particular MIPS and ARM"
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
random: allow architectures to optionally define random_get_entropy()
random: run random_int_secret_init() run after all late_initcalls
Diffstat (limited to 'init/main.c')
| -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 af310afbef28..63d3e8f2970c 100644 --- a/init/main.c +++ b/init/main.c @@ -76,6 +76,7 @@ #include <linux/elevator.h> #include <linux/sched_clock.h> #include <linux/context_tracking.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/bugs.h> @@ -780,6 +781,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) |