aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/cgroups
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-04 14:40:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-04 14:40:58 -0400
commit80cc38b16389849a6e06441ace4530f6b2497c3c (patch)
tree1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/cgroups
parent3366dd9fa887ebbda4872e9554f853eaeda764be (diff)
parent83a35e360433b58791bc9c4e288cace466d62e3a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "The usual stuff from trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) treewide: relase -> release Documentation/cgroups/memory.txt: fix stat file documentation sysctl/net.txt: delete reference to obsolete 2.4.x kernel spinlock_api_smp.h: fix preprocessor comments treewide: Fix typo in printk doc: device tree: clarify stuff in usage-model.txt. open firmware: "/aliasas" -> "/aliases" md: bcache: Fixed a typo with the word 'arithmetic' irq/generic-chip: fix a few kernel-doc entries frv: Convert use of typedef ctl_table to struct ctl_table sgi: xpc: Convert use of typedef ctl_table to struct ctl_table doc: clk: Fix incorrect wording Documentation/arm/IXP4xx fix a typo Documentation/networking/ieee802154 fix a typo Documentation/DocBook/media/v4l fix a typo Documentation/video4linux/si476x.txt fix a typo Documentation/virtual/kvm/api.txt fix a typo Documentation/early-userspace/README fix a typo Documentation/video4linux/soc-camera.txt fix a typo lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment ...
Diffstat (limited to 'Documentation/cgroups')
-rw-r--r--Documentation/cgroups/memory.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 327acec6f90b..2a3330696372 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -304,7 +304,7 @@ kernel memory, we prevent new processes from being created when the kernel
304memory usage is too high. 304memory usage is too high.
305 305
306* slab pages: pages allocated by the SLAB or SLUB allocator are tracked. A copy 306* slab pages: pages allocated by the SLAB or SLUB allocator are tracked. A copy
307of each kmem_cache is created everytime the cache is touched by the first time 307of each kmem_cache is created every time the cache is touched by the first time
308from inside the memcg. The creation is done lazily, so some objects can still be 308from inside the memcg. The creation is done lazily, so some objects can still be
309skipped while the cache is being created. All objects in a slab page should 309skipped while the cache is being created. All objects in a slab page should
310belong to the same memcg. This only fails to hold when a task is migrated to a 310belong to the same memcg. This only fails to hold when a task is migrated to a
@@ -490,10 +490,10 @@ pgpgin - # of charging events to the memory cgroup. The charging
490pgpgout - # of uncharging events to the memory cgroup. The uncharging 490pgpgout - # of uncharging events to the memory cgroup. The uncharging
491 event happens each time a page is unaccounted from the cgroup. 491 event happens each time a page is unaccounted from the cgroup.
492swap - # of bytes of swap usage 492swap - # of bytes of swap usage
493inactive_anon - # of bytes of anonymous memory and swap cache memory on 493inactive_anon - # of bytes of anonymous and swap cache memory on inactive
494 LRU list. 494 LRU list.
495active_anon - # of bytes of anonymous and swap cache memory on active 495active_anon - # of bytes of anonymous and swap cache memory on active
496 inactive LRU list. 496 LRU list.
497inactive_file - # of bytes of file-backed memory on inactive LRU list. 497inactive_file - # of bytes of file-backed memory on inactive LRU list.
498active_file - # of bytes of file-backed memory on active LRU list. 498active_file - # of bytes of file-backed memory on active LRU list.
499unevictable - # of bytes of memory that cannot be reclaimed (mlocked etc). 499unevictable - # of bytes of memory that cannot be reclaimed (mlocked etc).