On Thu, Jun 9, 2011 at 5:46 PM, Jörg Sommer <joerg@xxxxxxxxxxxx> wrote: > Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx> Acked-by: Paul Menage <menage@xxxxxxxxxx> Thanks, Paul > --- > Documentation/cgroups/blkio-controller.txt | 2 +- > Documentation/cgroups/cgroups.txt | 2 +- > Documentation/cgroups/memory.txt | 22 +++++++++++----------- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/Documentation/cgroups/blkio-controller.txt b/Documentation/cgroups/blkio-controller.txt > index b1b1bfa..cd45c8e 100644 > --- a/Documentation/cgroups/blkio-controller.txt > +++ b/Documentation/cgroups/blkio-controller.txt > @@ -111,7 +111,7 @@ Hierarchical Cgroups > CFQ and throttling will practically treat all groups at same level. > > pivot > - / | \ \ > + / / \ \ > root test1 test2 test3 > > Down the line we can implement hierarchical accounting/control support > diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt > index 15bca10..cd67e90 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 > > With only a single hierarchy, he now would potentially have to create > a separate cgroup for every browser launched and associate it with > -approp network and other resource class. This may lead to > +appropriate network and other resource class. This may lead to > proliferation of such cgroups. > > Also lets say that the administrator would like to give enhanced network > diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt > index 47ecded1..963bbc2 100644 > --- a/Documentation/cgroups/memory.txt > +++ b/Documentation/cgroups/memory.txt > @@ -1,8 +1,8 @@ > Memory Resource Controller > > -NOTE: The Memory Resource Controller has been generically been referred > - to as the memory controller in this document. Do not confuse memory > - controller used here with the memory controller that is used in hardware. > +NOTE: The Memory Resource Controller has generically been referred to as the > + memory controller in this document. Do not confuse memory controller > + used here with the memory controller that is used in hardware. > > (For editors) > In this document: > @@ -181,7 +181,7 @@ behind this approach is that a cgroup that aggressively uses a shared > page will eventually get charged for it (once it is uncharged from > the cgroup that brought it in -- this will happen on memory pressure). > > -Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used.. > +Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used. > When you do swapoff and make swapped-out pages of shmem(tmpfs) to > be backed into memory in force, charges for pages are accounted against the > caller of swapoff rather than the users of shmem. > @@ -213,7 +213,7 @@ affecting global LRU, memory+swap limit is better than just limiting swap from > OS point of view. > > * What happens when a cgroup hits memory.memsw.limit_in_bytes > -When a cgroup his memory.memsw.limit_in_bytes, it's useless to do swap-out > +When a cgroup hits memory.memsw.limit_in_bytes, it's useless to do swap-out > in this cgroup. Then, swap-out will not be done by cgroup routine and file > caches are dropped. But as mentioned above, global LRU can do swapout memory > from it for sanity of the system's memory management state. You can't forbid > @@ -472,13 +472,13 @@ The hierarchy is created by creating the appropriate cgroups in the > cgroup filesystem. Consider for example, the following cgroup filesystem > hierarchy > > - root > + root > / | \ > - / | \ > - a b c > - | \ > - | \ > - d e > + / | \ > + a b c > + | \ > + | \ > + d e > > In the diagram above, with hierarchical accounting enabled, all memory > usage of e, is accounted to its ancestors up until the root (i.e, c and root), > -- > 1.7.5.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
