diff options
Diffstat (limited to 'Documentation/cgroups')
| -rw-r--r-- | Documentation/cgroups/cpusets.txt | 2 | ||||
| -rw-r--r-- | Documentation/cgroups/memory.txt | 5 | 
2 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/cgroups/cpusets.txt b/Documentation/cgroups/cpusets.txt index 5c51ed406d1..cefd3d8bbd1 100644 --- a/Documentation/cgroups/cpusets.txt +++ b/Documentation/cgroups/cpusets.txt @@ -217,7 +217,7 @@ and name space for cpusets, with a minimum of additional kernel code.  The cpus and mems files in the root (top_cpuset) cpuset are  read-only.  The cpus file automatically tracks the value of -cpu_online_map using a CPU hotplug notifier, and the mems file +cpu_online_mask using a CPU hotplug notifier, and the mems file  automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e.,  nodes with memory--using the cpuset_track_online_nodes() hook. diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 4c95c0034a4..9b1067afb22 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April)  Features:   - accounting anonymous pages, file caches, swap caches usage and limiting them. - - private LRU and reclaim routine. (system's global LRU and private LRU -   work independently from each other) + - pages are linked to per-memcg LRU exclusively, and there is no global LRU.   - optionally, memory+swap usage can be accounted and limited.   - hierarchical accounting   - soft limit @@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup.  2.2.1 Accounting details  All mapped anon pages (RSS) and cache pages (Page Cache) are accounted. -Some pages which are never reclaimable and will not be on the global LRU +Some pages which are never reclaimable and will not be on the LRU  are not accounted. We just account pages under usual VM management.  RSS pages are accounted at page_fault unless they've already been accounted  |