Skip to content

Commit 246e179

Browse files
committed
Merge tag 'docs-5.17-3' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A few documentation fixes for 5.17" * tag 'docs-5.17-3' of git://git.lwn.net/linux: docs/vm: Fix typo in *harden* Documentation: arm: marvell: Extend Avanta list docs: fix typo in Documentation/kernel-hacking/locking.rst docs: Hook the RTLA documents into the kernel docs build
2 parents 169387e + 854d098 commit 246e179

File tree

6 files changed

+51
-2
lines changed

6 files changed

+51
-2
lines changed

Documentation/arm/marvell.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,12 @@ Avanta family
266266
-------------
267267

268268
Flavors:
269+
- 88F6500
269270
- 88F6510
270271
- 88F6530P
271272
- 88F6550
272273
- 88F6560
274+
- 88F6601
273275

274276
Homepage:
275277
https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

Documentation/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ to ReStructured Text format, or are simply too old.
166166
.. toctree::
167167
:maxdepth: 2
168168

169+
tools/index
169170
staging/index
170171
watch_queue
171172

Documentation/kernel-hacking/locking.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Pete Zaitcev gives the following summary:
295295

296296
- If you are in a process context (any syscall) and want to lock other
297297
process out, use a mutex. You can take a mutex and sleep
298-
(``copy_from_user*(`` or ``kmalloc(x,GFP_KERNEL)``).
298+
(``copy_from_user()`` or ``kmalloc(x,GFP_KERNEL)``).
299299

300300
- Otherwise (== data can be touched in an interrupt), use
301301
spin_lock_irqsave() and

Documentation/tools/index.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
============
4+
Kernel tools
5+
============
6+
7+
This book covers user-space tools that are shipped with the kernel source;
8+
more additions are needed here:
9+
10+
.. toctree::
11+
:maxdepth: 1
12+
13+
rtla/index
14+
15+
.. only:: subproject and html
16+
17+
Indices
18+
=======
19+
20+
* :ref:`genindex`

Documentation/tools/rtla/index.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
================================
4+
The realtime Linux analysis tool
5+
================================
6+
7+
RTLA provides a set of tools for the analysis of the kernel's realtime
8+
behavior on specific hardware.
9+
10+
.. toctree::
11+
:maxdepth: 1
12+
13+
rtla
14+
rtla-osnoise
15+
rtla-osnoise-hist
16+
rtla-osnoise-top
17+
rtla-timerlat
18+
rtla-timerlat-hist
19+
rtla-timerlat-top
20+
21+
.. only:: subproject and html
22+
23+
Indices
24+
=======
25+
26+
* :ref:`genindex`

Documentation/vm/page_table_check.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Page Table Check
99
Introduction
1010
============
1111

12-
Page table check allows to hardern the kernel by ensuring that some types of
12+
Page table check allows to harden the kernel by ensuring that some types of
1313
the memory corruptions are prevented.
1414

1515
Page table check performs extra verifications at the time when new pages become

0 commit comments

Comments
 (0)