diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 15:09:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 15:09:47 -0800 |
| commit | 13ddd1667e7f01071cdf120132238ffca004a88e (patch) | |
| tree | 6cd3cae74cc6a7e9d5e5292600623c8533a3fa7c /Documentation/cgroup-v1/memory.txt | |
| parent | 289104c9a45cf27e80fa7b04286ada22f4e964fe (diff) | |
| parent | 03eac8b22194becd77d253fc546429ebb544aebf (diff) | |
| download | linux-13ddd1667e7f01071cdf120132238ffca004a88e.tar.gz | |
Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Nothing too interesting. Documentation updates and trivial changes;
however, this pull request does containt he previusly discussed
dropping of __must_check from strscpy()"
* 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
Documentation: Fix 'file_mapped' -> 'mapped_file'
string: drop __must_check from strscpy() and restore strscpy() usages in cgroup
cgroup, docs: document the root cgroup behavior of cpu and io controllers
cgroup-v2.txt: fix typos
cgroup: Update documentation reference
Documentation/cgroup-v1: fix outdated programming details
cgroup, docs: document cgroup v2 device controller
Diffstat (limited to 'Documentation/cgroup-v1/memory.txt')
| -rw-r--r-- | Documentation/cgroup-v1/memory.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroup-v1/memory.txt b/Documentation/cgroup-v1/memory.txt index cefb63639070..a4af2e124e24 100644 --- a/Documentation/cgroup-v1/memory.txt +++ b/Documentation/cgroup-v1/memory.txt @@ -524,9 +524,9 @@ Note: Only anonymous and swap cache memory is listed as part of 'rss' stat. This should not be confused with the true 'resident set size' or the amount of physical memory used by the cgroup. - 'rss + file_mapped" will give you resident set size of cgroup. + 'rss + mapped_file" will give you resident set size of cgroup. (Note: file and shmem may be shared among other cgroups. In that case, - file_mapped is accounted only when the memory cgroup is owner of page + mapped_file is accounted only when the memory cgroup is owner of page cache.) 5.3 swappiness |