Skip to content

Commit b1e6ec0

Browse files
committed
Merge tag 'docs-6.9-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "Four small documentation fixes" * tag 'docs-6.9-fixes' of git://git.lwn.net/linux: docs: zswap: fix shell command format tracing: Fix documentation on tp_printk cmdline option docs: Fix bitfield handling in kernel-doc Documentation: dev-tools: Add link to RV docs
2 parents 67199a4 + e9c44c1 commit b1e6ec0

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6599,7 +6599,7 @@
65996599
To turn off having tracepoints sent to printk,
66006600
echo 0 > /proc/sys/kernel/tracepoint_printk
66016601
Note, echoing 1 into this file without the
6602-
tracepoint_printk kernel cmdline option has no effect.
6602+
tp_printk kernel cmdline option has no effect.
66036603

66046604
The tp_printk_stop_on_boot (see below) can also be used
66056605
to stop the printing of events to console at

Documentation/admin-guide/mm/zswap.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis.
155155

156156
Some users cannot tolerate the swapping that comes with zswap store failures
157157
and zswap writebacks. Swapping can be disabled entirely (without disabling
158-
zswap itself) on a cgroup-basis as follows:
158+
zswap itself) on a cgroup-basis as follows::
159159

160160
echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback
161161

@@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again).
166166
When there is a sizable amount of cold memory residing in the zswap pool, it
167167
can be advantageous to proactively write these cold pages to swap and reclaim
168168
the memory for other use cases. By default, the zswap shrinker is disabled.
169-
User can enable it as follows:
169+
User can enable it as follows::
170170

171171
echo Y > /sys/module/zswap/parameters/shrinker_enabled
172172

Documentation/dev-tools/testing-overview.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Some of these tools are listed below:
104104
KASAN and can be used in production. See Documentation/dev-tools/kfence.rst
105105
* lockdep is a locking correctness validator. See
106106
Documentation/locking/lockdep-design.rst
107+
* Runtime Verification (RV) supports checking specific behaviours for a given
108+
subsystem. See Documentation/trace/rv/runtime-verification.rst
107109
* There are several other pieces of debug instrumentation in the kernel, many
108110
of which can be found in lib/Kconfig.debug
109111

scripts/kernel-doc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ sub create_parameterlist($$$$) {
15411541
save_struct_actual($2);
15421542

15431543
push_parameter($2, "$type $1", $arg, $file, $declaration_name);
1544-
} elsif ($param =~ m/(.*?):(\d+)/) {
1544+
} elsif ($param =~ m/(.*?):(\w+)/) {
15451545
if ($type ne "") { # skip unnamed bit-fields
15461546
save_struct_actual($1);
15471547
push_parameter($1, "$type:$2", $arg, $file, $declaration_name)

0 commit comments

Comments
 (0)