summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-09-10 10:52:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-18 07:45:44 -0700
commitb7a52f5111bc53ffbfff96330621cbde80df6ba4 (patch)
tree5803dc3d00ec53182870e4e3408388da497dd5e8 /init
parent09c517435dd6f29c29822b627f653259e97e7294 (diff)
downloadlinux-3.10-b7a52f5111bc53ffbfff96330621cbde80df6ba4.tar.gz
linux-3.10-b7a52f5111bc53ffbfff96330621cbde80df6ba4.tar.bz2
linux-3.10-b7a52f5111bc53ffbfff96330621cbde80df6ba4.zip
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 9484f4ba88d..e83ac04fda9 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)