Merge tag 'mm-stable-2022-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 8c06271..db5de5f 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1158,8 +1158,12 @@
        nopku           [X86] Disable Memory Protection Keys CPU feature found
                        in some Intel CPUs.
 
-       <module>.async_probe [KNL]
-                       Enable asynchronous probe on this module.
+       <module>.async_probe[=<bool>] [KNL]
+                       If no <bool> value is specified or if the value
+                       specified is not a valid <bool>, enable asynchronous
+                       probe on this module.  Otherwise, enable/disable
+                       asynchronous probe on this module as indicated by the
+                       <bool> value. See also: module.async_probe
 
        early_ioremap_debug [KNL]
                        Enable debug messages in early_ioremap support. This
@@ -3278,6 +3282,15 @@
                        For details see:
                        Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
 
+       module.async_probe=<bool>
+                       [KNL] When set to true, modules will use async probing
+                       by default. To enable/disable async probing for a
+                       specific module, use the module specific control that
+                       is documented under <module>.async_probe. When both
+                       module.async_probe and <module>.async_probe are
+                       specified, <module>.async_probe takes precedence for
+                       the specific module.
+
        module.sig_enforce
                        [KNL] When CONFIG_MODULE_SIG is set, this means that
                        modules without (valid) signatures will fail to load.