diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2009-01-15 13:50:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:39:37 -0800 |
| commit | 45ce80fb6b6f9594d1396d44dd7e7c02d596fef8 (patch) | |
| tree | 2409270f7073c08329ac01c82df0509a264af48c /Documentation | |
| parent | 23964d2d02984d44aeb2d84d7ffb3359e728df43 (diff) | |
| download | linux-45ce80fb6b6f9594d1396d44dd7e7c02d596fef8.tar.gz linux-45ce80fb6b6f9594d1396d44dd7e7c02d596fef8.tar.bz2 linux-45ce80fb6b6f9594d1396d44dd7e7c02d596fef8.zip | |
cgroups: consolidate cgroup documents
Move Documentation/cpusets.txt and Documentation/controllers/* to
Documentation/cgroups/
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cgroups/cgroups.txt | 5 | ||||
| -rw-r--r-- | Documentation/cgroups/cpuacct.txt (renamed from Documentation/controllers/cpuacct.txt) | 0 | ||||
| -rw-r--r-- | Documentation/cgroups/cpusets.txt (renamed from Documentation/cpusets.txt) | 0 | ||||
| -rw-r--r-- | Documentation/cgroups/devices.txt (renamed from Documentation/controllers/devices.txt) | 0 | ||||
| -rw-r--r-- | Documentation/cgroups/memcg_test.txt (renamed from Documentation/controllers/memcg_test.txt) | 2 | ||||
| -rw-r--r-- | Documentation/cgroups/memory.txt (renamed from Documentation/controllers/memory.txt) | 0 | ||||
| -rw-r--r-- | Documentation/cgroups/resource_counter.txt (renamed from Documentation/controllers/resource_counter.txt) | 0 | ||||
| -rw-r--r-- | Documentation/scheduler/sched-design-CFS.txt | 2 |
8 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt index e33ee74eee77..d9e5d6f41b92 100644 --- a/Documentation/cgroups/cgroups.txt +++ b/Documentation/cgroups/cgroups.txt @@ -1,7 +1,8 @@ CGROUPS ------- -Written by Paul Menage <menage@google.com> based on Documentation/cpusets.txt +Written by Paul Menage <menage@google.com> based on +Documentation/cgroups/cpusets.txt Original copyright statements from cpusets.txt: Portions Copyright (C) 2004 BULL SA. @@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job tracking. The intention is that other subsystems hook into the generic cgroup support to provide new attributes for cgroups, such as accounting/limiting the resources which processes in a cgroup can -access. For example, cpusets (see Documentation/cpusets.txt) allows +access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows you to associate a set of CPUs and a set of memory nodes with the tasks in each cgroup. diff --git a/Documentation/controllers/cpuacct.txt b/Documentation/cgroups/cpuacct.txt index bb775fbe43d7..bb775fbe43d7 100644 --- a/Documentation/controllers/cpuacct.txt +++ b/Documentation/cgroups/cpuacct.txt diff --git a/Documentation/cpusets.txt b/Documentation/cgroups/cpusets.txt index 5c86c258c791..5c86c258c791 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cgroups/cpusets.txt diff --git a/Documentation/controllers/devices.txt b/Documentation/cgroups/devices.txt index 7cc6e6a60672..7cc6e6a60672 100644 --- a/Documentation/controllers/devices.txt +++ b/Documentation/cgroups/devices.txt diff --git a/Documentation/controllers/memcg_test.txt b/Documentation/cgroups/memcg_test.txt index 08d4d3ea0d79..19533f93b7a2 100644 --- a/Documentation/controllers/memcg_test.txt +++ b/Documentation/cgroups/memcg_test.txt @@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior is complex. This is a document for memcg's internal behavior. Please note that implementation details can be changed. -(*) Topics on API should be in Documentation/controllers/memory.txt) +(*) Topics on API should be in Documentation/cgroups/memory.txt) 0. How to record usage ? 2 objects are used. diff --git a/Documentation/controllers/memory.txt b/Documentation/cgroups/memory.txt index e1501964df1e..e1501964df1e 100644 --- a/Documentation/controllers/memory.txt +++ b/Documentation/cgroups/memory.txt diff --git a/Documentation/controllers/resource_counter.txt b/Documentation/cgroups/resource_counter.txt index f196ac1d7d25..f196ac1d7d25 100644 --- a/Documentation/controllers/resource_counter.txt +++ b/Documentation/cgroups/resource_counter.txt diff --git a/Documentation/scheduler/sched-design-CFS.txt b/Documentation/scheduler/sched-design-CFS.txt index 8398ca4ff4ed..6f33593e59e2 100644 --- a/Documentation/scheduler/sched-design-CFS.txt +++ b/Documentation/scheduler/sched-design-CFS.txt @@ -231,7 +231,7 @@ CPU bandwidth control purposes: This options needs CONFIG_CGROUPS to be defined, and lets the administrator create arbitrary groups of tasks, using the "cgroup" pseudo filesystem. See - Documentation/cgroups.txt for more information about this filesystem. + Documentation/cgroups/cgroups.txt for more information about this filesystem. Only one of these options to group tasks can be chosen and not both. |