diff options
author | Theodore Ts'o <tytso@mit.edu> | 2013-09-10 10:52:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-18 10:45:44 -0400 |
commit | b7a52f5111bc53ffbfff96330621cbde80df6ba4 (patch) | |
tree | 5803dc3d00ec53182870e4e3408388da497dd5e8 /init | |
parent | 09c517435dd6f29c29822b627f653259e97e7294 (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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 @@ | |||
74 | #include <linux/ptrace.h> | 74 | #include <linux/ptrace.h> |
75 | #include <linux/blkdev.h> | 75 | #include <linux/blkdev.h> |
76 | #include <linux/elevator.h> | 76 | #include <linux/elevator.h> |
77 | #include <linux/random.h> | ||
77 | 78 | ||
78 | #include <asm/io.h> | 79 | #include <asm/io.h> |
79 | #include <asm/bugs.h> | 80 | #include <asm/bugs.h> |
@@ -777,6 +778,7 @@ static void __init do_basic_setup(void) | |||
777 | do_ctors(); | 778 | do_ctors(); |
778 | usermodehelper_enable(); | 779 | usermodehelper_enable(); |
779 | do_initcalls(); | 780 | do_initcalls(); |
781 | random_int_secret_init(); | ||
780 | } | 782 | } |
781 | 783 | ||
782 | static void __init do_pre_smp_initcalls(void) | 784 | static void __init do_pre_smp_initcalls(void) |