ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-09-22 21:55:11 +00:00 • committed by Gerrit Code Review
commit 73fcd754ee
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/first_stage_init.cpp
View file

@ -239,8 +239,12 @@ bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel
module_dirs.emplace_back(entry->d_name); module_dirs.emplace_back(entry->d_name);
break; break;
} }
// Ignore _16k/_64k module dirs on 4K kernels // Is a directory does not have page size suffix, it does not mean this directory is for 4K
if (GetPageSizeSuffix(entry->d_name) != page_size_suffix) { // kernels. Certain 16K kernel builds put all modules in /lib/modules/`uname -r` without any
// suffix. Therefore, only ignore a directory if it has _16k/_64k suffix and the suffix does
// not match system page size.
const auto dir_page_size_suffix = GetPageSizeSuffix(entry->d_name);
if (!dir_page_size_suffix.empty() && dir_page_size_suffix != page_size_suffix) {
continue; continue;
} }
int dir_major = 0, dir_minor = 0; int dir_major = 0, dir_minor = 0;