author: Jason A. Donenfeld <Jason@zx2c4.com> 2022-05-05 02:20:22 +0200
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2022-05-30 09:27:13 +0200
commit: 12ea8541661042ddafbc6ab742d28924b8202fdb
parent: 80f5814079f40a8cb7154f4e62d5e9947b7295e2
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 1 deletion
diff --git a/init/main.c b/init/main.c
index 9a5097b2251a..b18aa5d19038 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1035,11 +1035,13 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
softirq_init();
timekeeping_init();
kfence_init();
+ time_init();
/*
* For best initial stack canary entropy, prepare it after:
* - setup_arch() for any UEFI RNG entropy and boot cmdline access
* - timekeeping_init() for ktime entropy used in rand_initialize()
+ * - time_init() for making random_get_entropy() work on some platforms
* - rand_initialize() to get any arch-specific entropy like RDRAND
* - add_latent_entropy() to get any latent entropy
* - adding command line entropy
@@ -1049,7 +1051,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
add_device_randomness(command_line, strlen(command_line));
boot_init_stack_canary();
- time_init();
perf_event_init();
profile_init();
call_function_init();