tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Only skip _16k/_64k kernel modules dirs on 4K builds" into main am: 73fcd754ee am: 6b38c7ed6f am: fe743c5704 am: da860a02ed am: 38e5d473bb

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

Change-Id: I6b0bb74bf7f15a2cd1c5872076eaa292150373ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-23 02:18:57 +00:00 committed by Automerger Merge Worker
commit cad272e1e4
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);
break;
}
// Ignore _16k/_64k module dirs on 4K kernels
if (GetPageSizeSuffix(entry->d_name) != page_size_suffix) {
// Is a directory does not have page size suffix, it does not mean this directory is for 4K
// 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;
}
int dir_major = 0, dir_minor = 0;