aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-01-15 16:50:59 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-15 19:39:37 -0500
commit45ce80fb6b6f9594d1396d44dd7e7c02d596fef8 (patch)
tree2409270f7073c08329ac01c82df0509a264af48c /init/Kconfig
parent23964d2d02984d44aeb2d84d7ffb3359e728df43 (diff)
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 'init/Kconfig')
-rw-r--r--init/Kconfig9
1 files changed, 4 insertions, 5 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 56fd93c63c77..2af83825634e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -323,8 +323,8 @@ config CGROUP_SCHED
323 This option allows you to create arbitrary task groups 323 This option allows you to create arbitrary task groups
324 using the "cgroup" pseudo filesystem and control 324 using the "cgroup" pseudo filesystem and control
325 the cpu bandwidth allocated to each such task group. 325 the cpu bandwidth allocated to each such task group.
326 Refer to Documentation/cgroups.txt for more information 326 Refer to Documentation/cgroups/cgroups.txt for more
327 on "cgroup" pseudo filesystem. 327 information on "cgroup" pseudo filesystem.
328 328
329endchoice 329endchoice
330 330
@@ -335,10 +335,9 @@ menuconfig CGROUPS
335 use with process control subsystems such as Cpusets, CFS, memory 335 use with process control subsystems such as Cpusets, CFS, memory
336 controls or device isolation. 336 controls or device isolation.
337 See 337 See
338 - Documentation/cpusets.txt (Cpusets)
339 - Documentation/scheduler/sched-design-CFS.txt (CFS) 338 - Documentation/scheduler/sched-design-CFS.txt (CFS)
340 - Documentation/cgroups/ (features for grouping, isolation) 339 - Documentation/cgroups/ (features for grouping, isolation
341 - Documentation/controllers/ (features for resource control) 340 and resource control)
342 341
343 Say N if unsure. 342 Say N if unsure.
344 343