Commit 90280eaa authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'docs-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A handful of fixes for reasonably obnoxious documentation issues"

* tag 'docs-fixes' of git://git.lwn.net/linux:
  scripts: documentation-file-ref-check: Add line break before exit
  scripts/kernel-doc: Add missing close-paren in c:function directives
  docs: admin-guide: merge sections for the kernel.modprobe sysctl
  docs: timekeeping: Use correct prototype for deprecated functions
parents 5d286d5e d98dbbe0
...@@ -390,9 +390,17 @@ When ``kptr_restrict`` is set to 2, kernel pointers printed using ...@@ -390,9 +390,17 @@ When ``kptr_restrict`` is set to 2, kernel pointers printed using
modprobe modprobe
======== ========
This gives the full path of the modprobe command which the kernel will The full path to the usermode helper for autoloading kernel modules,
use to load modules. This can be used to debug module loading by default "/sbin/modprobe". This binary is executed when the kernel
requests:: 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
ability to explicitly insert modules.
This sysctl can be used to debug module loading requests::
echo '#! /bin/sh' > /tmp/modprobe echo '#! /bin/sh' > /tmp/modprobe
echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
...@@ -400,10 +408,15 @@ requests:: ...@@ -400,10 +408,15 @@ requests::
chmod a+x /tmp/modprobe chmod a+x /tmp/modprobe
echo /tmp/modprobe > /proc/sys/kernel/modprobe echo /tmp/modprobe > /proc/sys/kernel/modprobe
This only applies when the *kernel* is requesting that the module be Alternatively, if this sysctl is set to the empty string, then module
loaded; it won't have any effect if the module is being loaded autoloading is completely disabled. The kernel will not try to
explicitly using ``modprobe`` from userspace. execute a usermode helper at all, nor will it call the
kernel_module_request LSM hook.
If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,
then the configured static usermode helper overrides this sysctl,
except that the empty string is still accepted to completely disable
module autoloading as described above.
modules_disabled modules_disabled
================ ================
...@@ -446,28 +459,6 @@ Notes: ...@@ -446,28 +459,6 @@ Notes:
successful IPC object allocation. If an IPC object allocation syscall successful IPC object allocation. If an IPC object allocation syscall
fails, it is undefined if the value remains unmodified or is reset to -1. fails, it is undefined if the value remains unmodified or is reset to -1.
modprobe:
=========
The 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.
This usermode helper should insert the needed module into the kernel.
This sysctl only affects module autoloading. It has no effect on the
ability to explicitly insert modules.
If this sysctl is set to the empty string, then module autoloading is
completely disabled. The kernel will not try to execute a usermode
helper at all, nor will it call the kernel_module_request LSM hook.
If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,
then the configured static usermode helper overrides this sysctl,
except that the empty string is still accepted to completely disable
module autoloading as described above.
nmi_watchdog nmi_watchdog
============ ============
......
...@@ -154,9 +154,9 @@ architectures. These are the recommended replacements: ...@@ -154,9 +154,9 @@ architectures. These are the recommended replacements:
Use ktime_get() or ktime_get_ts64() instead. Use ktime_get() or ktime_get_ts64() instead.
.. c:function:: struct timeval do_gettimeofday( void ) .. c:function:: void do_gettimeofday( struct timeval * )
struct timespec getnstimeofday( void ) void getnstimeofday( struct timespec * )
struct timespec64 getnstimeofday64( void ) void getnstimeofday64( struct timespec64 * )
void ktime_get_real_ts( struct timespec * ) void ktime_get_real_ts( struct timespec * )
ktime_get_real_ts64() is a direct replacement, but consider using ktime_get_real_ts64() is a direct replacement, but consider using
......
...@@ -25,7 +25,7 @@ my $fix = 0; ...@@ -25,7 +25,7 @@ my $fix = 0;
my $warn = 0; my $warn = 0;
if (! -d ".git") { if (! -d ".git") {
printf "Warning: can't check if file exists, as this is not a git tree"; printf "Warning: can't check if file exists, as this is not a git tree\n";
exit 0; exit 0;
} }
......
...@@ -853,7 +853,7 @@ sub output_function_rst(%) { ...@@ -853,7 +853,7 @@ sub output_function_rst(%) {
if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
# pointer-to-function # pointer-to-function
print $1 . $parameter . ") (" . $2; print $1 . $parameter . ") (" . $2 . ")";
} else { } else {
print $type . " " . $parameter; print $type . " " . $parameter;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment