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

Commit 124e0b6d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Parallel module loading: Fix typo and simplify logic" into main

parents a47b636e 0455ecee

init/first_stage_init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ int FirstStageMain(int argc, char** argv) { 
    if (bootconfig.find("androidboot.load_modules_parallel = \"true\"")

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::NORMAL;

    else if (bootconfig.find("androidboot.load_modules_parallel_mode = \"performance\"")

    else if (bootconfig.find("androidboot.load_modules_parallel = \"performance\"")

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::PERFORMANCE;

    else if (bootconfig.find("androidboot.load_modules_parallel = \"conservative\"")

libmodprobe/libmodprobe.cpp

+1 −3
Original line number Diff line number Diff line
@@ -595,9 +595,7 @@ bool Modprobe::LoadModulesParallel(int num_threads, int mode) { 
                break;

            }



            if (mods_loading.find(cnd_last) == mods_loading.end()) {

                mods_loading.insert(cnd_last);



            if (mods_loading.insert(cnd_last).second) {

                if (IsLoadSequential(cnd_last))

                    sequential_modules.emplace_back(cnd_last);

                else