aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJörg Sommer <joerg@alea.gnuu.de>2011-06-15 16:00:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 00:52:50 -0400
commit67de0162fbb78713fcb23cb2502b380faa8bde73 (patch)
treeadae72115105d0a02e93b5c793b66bda3d51bace /Documentation
parentf6e07d38078e82a6aeaae00bb134591ef5ac1167 (diff)
Documentation: fix cgroup typos and formatting
Fix format and spelling. Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> Acked-by: Paul Menage <menage@google.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroups/blkio-controller.txt2
-rw-r--r--Documentation/cgroups/cgroups.txt2
-rw-r--r--Documentation/cgroups/memory.txt22
3 files changed, 13 insertions, 13 deletions
diff --git a/Documentation/cgroups/blkio-controller.txt b/Documentation/cgroups/blkio-controller.txt
index b1b1bfadc9c0..cd45c8ea7463 100644
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
@@ -111,7 +111,7 @@ Hierarchical Cgroups
111 CFQ and throttling will practically treat all groups at same level. 111 CFQ and throttling will practically treat all groups at same level.
112 112
113 pivot 113 pivot
114 / | \ \ 114 / / \ \
115 root test1 test2 test3 115 root test1 test2 test3
116 116
117 Down the line we can implement hierarchical accounting/control support 117 Down the line we can implement hierarchical accounting/control support
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index 15bca101ff62..cd67e90003c0 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -142,7 +142,7 @@ and depending on who is launching the browser he can
142 142
143With only a single hierarchy, he now would potentially have to create 143With only a single hierarchy, he now would potentially have to create
144a separate cgroup for every browser launched and associate it with 144a separate cgroup for every browser launched and associate it with
145approp network and other resource class. This may lead to 145appropriate network and other resource class. This may lead to
146proliferation of such cgroups. 146proliferation of such cgroups.
147 147
148Also lets say that the administrator would like to give enhanced network 148Also lets say that the administrator would like to give enhanced network
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index ffec2416aa74..06eb6d957c83 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -1,8 +1,8 @@
1Memory Resource Controller 1Memory Resource Controller
2 2
3NOTE: The Memory Resource Controller has been generically been referred 3NOTE: The Memory Resource Controller has generically been referred to as the
4 to as the memory controller in this document. Do not confuse memory 4 memory controller in this document. Do not confuse memory controller
5 controller used here with the memory controller that is used in hardware. 5 used here with the memory controller that is used in hardware.
6 6
7(For editors) 7(For editors)
8In this document: 8In this document:
@@ -182,7 +182,7 @@ behind this approach is that a cgroup that aggressively uses a shared
182page will eventually get charged for it (once it is uncharged from 182page will eventually get charged for it (once it is uncharged from
183the cgroup that brought it in -- this will happen on memory pressure). 183the cgroup that brought it in -- this will happen on memory pressure).
184 184
185Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used.. 185Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used.
186When you do swapoff and make swapped-out pages of shmem(tmpfs) to 186When you do swapoff and make swapped-out pages of shmem(tmpfs) to
187be backed into memory in force, charges for pages are accounted against the 187be backed into memory in force, charges for pages are accounted against the
188caller of swapoff rather than the users of shmem. 188caller of swapoff rather than the users of shmem.
@@ -214,7 +214,7 @@ affecting global LRU, memory+swap limit is better than just limiting swap from
214OS point of view. 214OS point of view.
215 215
216* What happens when a cgroup hits memory.memsw.limit_in_bytes 216* What happens when a cgroup hits memory.memsw.limit_in_bytes
217When a cgroup his memory.memsw.limit_in_bytes, it's useless to do swap-out 217When a cgroup hits memory.memsw.limit_in_bytes, it's useless to do swap-out
218in this cgroup. Then, swap-out will not be done by cgroup routine and file 218in this cgroup. Then, swap-out will not be done by cgroup routine and file
219caches are dropped. But as mentioned above, global LRU can do swapout memory 219caches are dropped. But as mentioned above, global LRU can do swapout memory
220from it for sanity of the system's memory management state. You can't forbid 220from it for sanity of the system's memory management state. You can't forbid
@@ -491,13 +491,13 @@ The hierarchy is created by creating the appropriate cgroups in the
491cgroup filesystem. Consider for example, the following cgroup filesystem 491cgroup filesystem. Consider for example, the following cgroup filesystem
492hierarchy 492hierarchy
493 493
494 root 494 root
495 / | \ 495 / | \
496 / | \ 496 / | \
497 a b c 497 a b c
498 | \ 498 | \
499 | \ 499 | \
500 d e 500 d e
501 501
502In the diagram above, with hierarchical accounting enabled, all memory 502In the diagram above, with hierarchical accounting enabled, all memory
503usage of e, is accounted to its ancestors up until the root (i.e, c and root), 503usage of e, is accounted to its ancestors up until the root (i.e, c and root),