Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61f2ae9d authored by Chung-Kai (Michael) Mei's avatar Chung-Kai (Michael) Mei Committed by Automerger Merge Worker
Browse files

Merge "libmodprobe: use ordered map for deterministic module loading" into main am: 3e464e6e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3206531



Change-Id: Ida50e64e4b31a2ad9f7b0cc16909222b525da235
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c42ad4a3 3e464e6e

libmodprobe/libmodprobe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ bool Modprobe::IsBlocklisted(const std::string& module_name) { 
// Softdeps are taken care in InsmodWithDeps().

bool Modprobe::LoadModulesParallel(int num_threads) {

    bool ret = true;

    std::unordered_map<std::string, std::vector<std::string>> mod_with_deps;

    std::map<std::string, std::vector<std::string>> mod_with_deps;



    // Get dependencies

    for (const auto& module : module_load_) {