commit e3a1b984954503181b7b83c2071b220e95bc85d9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jun 12 15:13:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 12 15:13:02 2024 +0000
tree 0947bbcee69094f2a548d1ecdb693380be48279f
parent 59e49972802ec00258fee5d66cfd8be46e9b8186
parent 441f39230ee6ea15114e8b9d70343f0ad2cc62c8

Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main am: 441f39230e

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

Change-Id: I6a19514aa824ef775f03576a63b39790bca74451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

toolbox/modprobe.cpp

diff --git a/toolbox/modprobe.cpp b/toolbox/modprobe.cpp
index 7fde491..13026ac 100644
--- a/toolbox/modprobe.cpp
+++ b/toolbox/modprobe.cpp
@@ -245,8 +245,10 @@
         }
         free(kernel_dirs);
 
-        // Allow modules to be directly inside /lib/modules
-        mod_dirs.emplace_back(LIB_MODULES_PREFIX);
+        if (mod_dirs.empty() || getpagesize() == 4096) {
+            // Allow modules to be directly inside /lib/modules
+            mod_dirs.emplace_back(LIB_MODULES_PREFIX);
+        }
     }
 
     LOG(DEBUG) << "mode is " << mode;