diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
commit | 52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (patch) | |
tree | 10746baee8fd439130ab78e6caaadc609a7920d7 /Documentation/kernel-parameters.txt | |
parent | e9d488c3114acb6a0a93e99c02f9cd1d656f46c7 (diff) | |
parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
download | linux-52ddb7e9dd735c1a10722c58d3e069af4d3e6df2.tar.gz linux-52ddb7e9dd735c1a10722c58d3e069af4d3e6df2.tar.bz2 linux-52ddb7e9dd735c1a10722c58d3e069af4d3e6df2.zip |
Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"Three fixes for the docs build, including removing an annoying warning
on 'make help' if sphinx isn't present"
* tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
Documenation: update cgroup's document path
Documentation/sphinx: do not warn about missing tools in 'make help'
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index eb0a0582d912..46c030a49186 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3589,7 +3589,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. relax_domain_level= [KNL, SMP] Set scheduler's default relax_domain_level. - See Documentation/cgroups/cpusets.txt. + See Documentation/cgroup-v1/cpusets.txt. relative_sleep_states= [SUSPEND] Use sleep state labeling where the deepest @@ -3918,7 +3918,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. swapaccount=[0|1] [KNL] Enable accounting of swap in memory resource controller if no parameter or 1 is given or disable - it if 0 is given (See Documentation/cgroups/memory.txt) + it if 0 is given (See Documentation/cgroup-v1/memory.txt) swiotlb= [ARM,IA-64,PPC,MIPS,X86] Format: { <int> | force } |