diff options
| author | Elliott Hughes <enh@google.com> | 2021-02-06 00:52:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-06 00:52:19 +0000 |
| commit | ea4b2c67a2f17a56af6e94e25c0016b12f76fd16 (patch) | |
| tree | a41fd6c180ae0e4a41f15086311eeaa5b50b5698 /init/init.cpp | |
| parent | 04512166f8d9abb874dd8e10fbb9f3eb01371b32 (diff) | |
| parent | f204f6f0c04d349c9469352ebeb6517f0c2870cb (diff) | |
Merge "Let the kernel hwrng thread manage hw_random mixing."
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/init/init.cpp b/init/init.cpp index ca2d5dad57..0c752a92b7 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -902,7 +902,6 @@ int SecondStageMain(int argc, char** argv) { am.QueueBuiltinAction(wait_for_coldboot_done_action, "wait_for_coldboot_done"); am.QueueBuiltinAction(TransitionSnapuserdAction, "TransitionSnapuserd"); // ... so that we can start queuing up actions that require stuff from /dev. - am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng"); am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits"); Keychords keychords; am.QueueBuiltinAction( @@ -918,10 +917,6 @@ int SecondStageMain(int argc, char** argv) { // Trigger all the boot actions to get us started. am.QueueEventTrigger("init"); - // Repeat mix_hwrng_into_linux_rng in case /dev/hw_random or /dev/random - // wasn't ready immediately after wait_for_coldboot_done - am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng"); - // Don't mount filesystems or start core system services in charger mode. std::string bootmode = GetProperty("ro.bootmode", ""); if (bootmode == "charger") { |