commit 441f39230ee6ea15114e8b9d70343f0ad2cc62c8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jun 12 14:56:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 12 14:56:06 2024 +0000
tree 0947bbcee69094f2a548d1ecdb693380be48279f
parent 0b2f24ceb1a62500372604a3f35abec0b2f5fa98
parent 64776335c06af73b03c750c11fb486e182f45ef6

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

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;