aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-09-10 10:52:35 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-09-23 06:35:06 -0400
commit47d06e532e95b71c0db3839ebdef3fe8812fca2c (patch)
treef8d5c68cf8b0e4a8dcf107a41aa46f5aa82f7722 /init
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
random: run random_int_secret_init() run after all late_initcalls
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. Cc: stable@vger.kernel.org Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
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 d03d2ec2eacf..586cd3359c02 100644
--- a/init/main.c
+++ b/init/main.c
@@ -75,6 +75,7 @@
75#include <linux/blkdev.h> 75#include <linux/blkdev.h>
76#include <linux/elevator.h> 76#include <linux/elevator.h>
77#include <linux/sched_clock.h> 77#include <linux/sched_clock.h>
78#include <linux/random.h>
78 79
79#include <asm/io.h> 80#include <asm/io.h>
80#include <asm/bugs.h> 81#include <asm/bugs.h>
@@ -778,6 +779,7 @@ static void __init do_basic_setup(void)
778 do_ctors(); 779 do_ctors();
779 usermodehelper_enable(); 780 usermodehelper_enable();
780 do_initcalls(); 781 do_initcalls();
782 random_int_secret_init();
781} 783}
782 784
783static void __init do_pre_smp_initcalls(void) 785static void __init do_pre_smp_initcalls(void)