diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 18:26:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 18:26:38 -0500 |
| commit | 0cad3ff40486e341715cac3b5ef7b135fa0ba316 (patch) | |
| tree | 937b8c6fc8b28f6e556212c9deee726799f1f783 /Documentation | |
| parent | 1d567e19cc9810a9bd67b1ccab54b68d86dadb76 (diff) | |
| parent | 5576646f3c1abd60d72d19829de6f5d8c2ca8ecf (diff) | |
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton.
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (12 patches)
revert "mm: fix-up zone present pages"
tmpfs: change final i_blocks BUG to WARNING
tmpfs: fix shmem_getpage_gfp() VM_BUG_ON
mm: highmem: don't treat PKMAP_ADDR(LAST_PKMAP) as a highmem address
mm: revert "mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures"
rapidio: fix kernel-doc warnings
swapfile: fix name leak in swapoff
memcg: fix hotplugged memory zone oops
mips, arc: fix build failure
memcg: oom: fix totalpages calculation for memory.swappiness==0
mm: fix build warning for uninitialized value
mm: add anon_vma_lock to validate_mm()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cgroups/memory.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index c07f7b4fb88d..71c4da413444 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
| @@ -466,6 +466,10 @@ Note: | |||
| 466 | 5.3 swappiness | 466 | 5.3 swappiness |
| 467 | 467 | ||
| 468 | Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. | 468 | Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. |
| 469 | Please note that unlike the global swappiness, memcg knob set to 0 | ||
| 470 | really prevents from any swapping even if there is a swap storage | ||
| 471 | available. This might lead to memcg OOM killer if there are no file | ||
| 472 | pages to reclaim. | ||
| 469 | 473 | ||
| 470 | Following cgroups' swappiness can't be changed. | 474 | Following cgroups' swappiness can't be changed. |
| 471 | - root cgroup (uses /proc/sys/vm/swappiness). | 475 | - root cgroup (uses /proc/sys/vm/swappiness). |