diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 16:23:17 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 16:23:17 +0200 |
commit | 52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (patch) | |
tree | 10746baee8fd439130ab78e6caaadc609a7920d7 /Documentation/cgroup-v1/memcg_test.txt | |
parent | Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1 (diff) | |
download | linux-52ddb7e9dd735c1a10722c58d3e069af4d3e6df2.tar.xz 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/cgroup-v1/memcg_test.txt')
-rw-r--r-- | Documentation/cgroup-v1/memcg_test.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroup-v1/memcg_test.txt b/Documentation/cgroup-v1/memcg_test.txt index 78a8c2963b38..5c7f310f32bb 100644 --- a/Documentation/cgroup-v1/memcg_test.txt +++ b/Documentation/cgroup-v1/memcg_test.txt @@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior is complex. This is a document for memcg's internal behavior. Please note that implementation details can be changed. -(*) Topics on API should be in Documentation/cgroups/memory.txt) +(*) Topics on API should be in Documentation/cgroup-v1/memory.txt) 0. How to record usage ? 2 objects are used. @@ -256,7 +256,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. You can see charges have been moved by reading *.usage_in_bytes or memory.stat of both A and B. - See 8.2 of Documentation/cgroups/memory.txt to see what value should be + See 8.2 of Documentation/cgroup-v1/memory.txt to see what value should be written to move_charge_at_immigrate. 9.10 Memory thresholds |