Skip to content

Commit 70da22e

Browse files
committed
Merge tag 'docs-6.8-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A handful of relatively boring documentation fixes" * tag 'docs-6.8-fixes' of git://git.lwn.net/linux: docs: admin-guide: remove obsolete advice related to SLAB allocator doc: admin-guide/kernel-parameters: remove useless comment docs/accel: correct links to mailing list archives docs/sphinx: Fix TOC scroll hack for the home page
2 parents 168174d + d546978 commit 70da22e

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

Documentation/accel/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ External References
101101
email threads
102102
-------------
103103

104-
* `Initial discussion on the New subsystem for acceleration devices <https://lkml.org/lkml/2022/7/31/83>`_ - Oded Gabbay (2022)
105-
* `patch-set to add the new subsystem <https://lkml.org/lkml/2022/10/22/544>`_ - Oded Gabbay (2022)
104+
* `Initial discussion on the New subsystem for acceleration devices <https://lore.kernel.org/lkml/CAFCwf11=9qpNAepL7NL+YAV_QO=Wv6pnWPhKHKAepK3fNn+2Dg@mail.gmail.com/>`_ - Oded Gabbay (2022)
105+
* `patch-set to add the new subsystem <https://lore.kernel.org/lkml/20221022214622.18042-1-ogabbay@kernel.org/>`_ - Oded Gabbay (2022)
106106

107107
Conference talks
108108
----------------

Documentation/admin-guide/kernel-parameters.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,3 @@ bytes respectively. Such letter suffixes can also be entirely omitted:
218218

219219
.. include:: kernel-parameters.txt
220220
:literal:
221-
222-
Todo
223-
----
224-
225-
Add more DRM drivers.

Documentation/admin-guide/kernel-per-CPU-kthreads.rst

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,9 @@ To reduce its OS jitter, do any of the following:
243243
3. Do any of the following needed to avoid jitter that your
244244
application cannot tolerate:
245245

246-
a. Build your kernel with CONFIG_SLUB=y rather than
247-
CONFIG_SLAB=y, thus avoiding the slab allocator's periodic
248-
use of each CPU's workqueues to run its cache_reap()
249-
function.
250-
b. Avoid using oprofile, thus avoiding OS jitter from
246+
a. Avoid using oprofile, thus avoiding OS jitter from
251247
wq_sync_buffer().
252-
c. Limit your CPU frequency so that a CPU-frequency
248+
b. Limit your CPU frequency so that a CPU-frequency
253249
governor is not required, possibly enlisting the aid of
254250
special heatsinks or other cooling technologies. If done
255251
correctly, and if you CPU architecture permits, you should
@@ -259,7 +255,7 @@ To reduce its OS jitter, do any of the following:
259255

260256
WARNING: Please check your CPU specifications to
261257
make sure that this is safe on your particular system.
262-
d. As of v3.18, Christoph Lameter's on-demand vmstat workers
258+
c. As of v3.18, Christoph Lameter's on-demand vmstat workers
263259
commit prevents OS jitter due to vmstat_update() on
264260
CONFIG_SMP=y systems. Before v3.18, is not possible
265261
to entirely get rid of the OS jitter, but you can
@@ -274,20 +270,20 @@ To reduce its OS jitter, do any of the following:
274270
(based on an earlier one from Gilad Ben-Yossef) that
275271
reduces or even eliminates vmstat overhead for some
276272
workloads at https://lore.kernel.org/r/00000140e9dfd6bd-40db3d4f-c1be-434f-8132-7820f81bb586-000000@email.amazonses.com.
277-
e. If running on high-end powerpc servers, build with
273+
d. If running on high-end powerpc servers, build with
278274
CONFIG_PPC_RTAS_DAEMON=n. This prevents the RTAS
279275
daemon from running on each CPU every second or so.
280276
(This will require editing Kconfig files and will defeat
281277
this platform's RAS functionality.) This avoids jitter
282278
due to the rtas_event_scan() function.
283279
WARNING: Please check your CPU specifications to
284280
make sure that this is safe on your particular system.
285-
f. If running on Cell Processor, build your kernel with
281+
e. If running on Cell Processor, build your kernel with
286282
CBE_CPUFREQ_SPU_GOVERNOR=n to avoid OS jitter from
287283
spu_gov_work().
288284
WARNING: Please check your CPU specifications to
289285
make sure that this is safe on your particular system.
290-
g. If running on PowerMAC, build your kernel with
286+
f. If running on PowerMAC, build your kernel with
291287
CONFIG_PMAC_RACKMETER=n to disable the CPU-meter,
292288
avoiding OS jitter from rackmeter_do_timer().
293289

Documentation/sphinx/templates/kernel-toc.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ <h3 class="kernel-toc-contents">Contents</h3>
1212
<script type="text/javascript"> <!--
1313
var sbar = document.getElementsByClassName("sphinxsidebar")[0];
1414
let currents = document.getElementsByClassName("current")
15-
sbar.scrollTop = currents[currents.length - 1].offsetTop;
15+
if (currents.length) {
16+
sbar.scrollTop = currents[currents.length - 1].offsetTop;
17+
}
1618
--> </script>

0 commit comments

Comments
 (0)