summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorFlorian Schmidt <florian.schmidt@neclab.eu>2018-01-30 17:42:13 +0100
committerTejun Heo <tj@kernel.org>2018-01-30 09:52:11 -0800
commit03eac8b22194becd77d253fc546429ebb544aebf (patch)
treed4bad841a18000d0abfe08294744d977757fe4b6 /Documentation
parent08a77676f9c5fc69a681ccd2cd8140e65dcb26c7 (diff)
Documentation: Fix 'file_mapped' -> 'mapped_file'
There is no entry file_mapped in the memory.stat file. This looks like a simple word flip that's gone unnoticed since 2010 (dc10e281f5fc, memcg: update documentation). Signed-off-by: Florian Schmidt <florian.schmidt@neclab.eu> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroup-v1/memory.txt4
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