summaryrefslogtreecommitdiffstats
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2021-05-24 19:43:56 +0200
committerTejun Heo <tj@kernel.org>2021-05-24 19:43:56 +0200
commitc2a11971549b16a24cce81250d84b63d53499fd0 (patch)
tree7bfa4b1c61ec5ad44834a3e38da3d4958517a00f /Documentation/admin-guide
parentcgroup: inline cgroup_task_freeze() (diff)
parentcgroup: fix spelling mistakes (diff)
downloadlinux-c2a11971549b16a24cce81250d84b63d53499fd0.tar.xz
linux-c2a11971549b16a24cce81250d84b63d53499fd0.zip
Merge branch 'for-5.13-fixes' into for-5.14
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/sysctl/kernel.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 1d56a6b73a4e..7ca8df5451d4 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -483,10 +483,11 @@ modprobe
========
The full path to the usermode helper for autoloading kernel modules,
-by default "/sbin/modprobe". This binary is executed when the kernel
-requests a module. For example, if userspace passes an unknown
-filesystem type to mount(), then the kernel will automatically request
-the corresponding filesystem module by executing this usermode helper.
+by default ``CONFIG_MODPROBE_PATH``, which in turn defaults to
+"/sbin/modprobe". This binary is executed when the kernel requests a
+module. For example, if userspace passes an unknown filesystem type
+to mount(), then the kernel will automatically request the
+corresponding filesystem module by executing this usermode helper.
This usermode helper should insert the needed module into the kernel.
This sysctl only affects module autoloading. It has no effect on the