diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 13:44:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 13:44:54 -0700 |
| commit | 954e6e03c61d233eae810f8da65270c224fe2fa4 (patch) | |
| tree | bed7e17c864e84eb28a5ae4fa1ee809f4c2de783 /Documentation/core-api | |
| parent | 80fc62380995b02492245a9971944e4713a5eb63 (diff) | |
| parent | 51e988f4092428e3d2c9f141fba9f86583bc82f3 (diff) | |
Merge tag '4.13-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"A set of fixes for various warnings, including the one caused by the
removal of kernel/rcu/srcu.c. Also correct a stray pointer in
memory-barriers.txt"
* tag '4.13-fixes' of git://git.lwn.net/linux:
kokr/memory-barriers.txt: Fix obsolete link to atomic_ops.txt
memory-barriers.txt: Fix broken link to atomic_ops.txt
docs: Turn off section numbering for the input docs
docs: Include uaccess docs from the right file
docs: Do not include from kernel/rcu/srcu.c
Diffstat (limited to 'Documentation/core-api')
| -rw-r--r-- | Documentation/core-api/kernel-api.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst index 9ec8488319dc..17b00914c6ab 100644 --- a/Documentation/core-api/kernel-api.rst +++ b/Documentation/core-api/kernel-api.rst @@ -114,7 +114,7 @@ The Slab Cache User Space Memory Access ------------------------ -.. kernel-doc:: arch/x86/include/asm/uaccess_32.h +.. kernel-doc:: arch/x86/include/asm/uaccess.h :internal: .. kernel-doc:: arch/x86/lib/usercopy_32.c |