diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-10 14:43:12 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-10 14:43:12 +1000 |
commit | 41aa594a367ee1a8bc00d4ae9b50eee7e5cf6d4c (patch) | |
tree | 73dce1050d24b83279a972414e84adf03a0109a5 /Documentation/cgroups/memory.txt | |
parent | 02479717326aac5316d0081f578715d924045fc2 (diff) | |
parent | c1be48e758a61b1b63c621646691ead532625a40 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'Documentation/cgroups/memory.txt')
-rw-r--r-- | Documentation/cgroups/memory.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 2a3330696372..8af4ad121828 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -490,6 +490,8 @@ pgpgin - # of charging events to the memory cgroup. The charging pgpgout - # of uncharging events to the memory cgroup. The uncharging event happens each time a page is unaccounted from the cgroup. swap - # of bytes of swap usage +writeback - # of bytes of file/anon cache that are queued for syncing to + disk. inactive_anon - # of bytes of anonymous and swap cache memory on inactive LRU list. active_anon - # of bytes of anonymous and swap cache memory on active |