diff options
author | Theodore Ts'o <tytso@mit.edu> | 2013-09-10 10:52:35 -0400 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-11-28 14:02:00 +0000 |
commit | 5005abcbe8ff0d235cf9cee5e520e3cf551eab10 (patch) | |
tree | 146a3001e306672583f9bb16d3491f0665d6b0ad /init | |
parent | 8ce33654079ba5d5b55523b7ac317099c609cd02 (diff) |
random: run random_int_secret_init() run after all late_initcalls
commit 47d06e532e95b71c0db3839ebdef3fe8812fca2c upstream.
The some platforms (e.g., ARM) initializes their clocks as
late_initcalls for some unknown reason. So make sure
random_int_secret_init() is run after all of the late_initcalls are
run.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 5d0eb1d2af8f..7474450c4503 100644 --- a/init/main.c +++ b/init/main.c @@ -68,6 +68,7 @@ #include <linux/shmem_fs.h> #include <linux/slab.h> #include <linux/perf_event.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/bugs.h> @@ -732,6 +733,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) |