diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2009-01-07 21:07:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 11:31:01 -0500 |
commit | 5cdc38f98596662620b822a4e13f797c3f2f65e0 (patch) | |
tree | d6a9ccbe59610af212f5486f5f4df2fa14cdcb86 /init | |
parent | e04a88a920ff36d03641e1b9c01b7960d94209f1 (diff) |
cgroups: make cgroup config a submenu
Making CGROUP related configs be a sub-menu.
This patch make CGROUP related configs be a sub-menu and makes 1st level
configs of "General Setup" shorter.
including following additional changes
- add help comment about CGROUPS and GROUP_SCHED.
- moved MM_OWNER config to the bottom.
(for good indent in menuconfig)
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: 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')
-rw-r--r-- | init/Kconfig | 123 |
1 files changed, 67 insertions, 56 deletions
diff --git a/init/Kconfig b/init/Kconfig index e7893b1d3e42..6fcd192aa60d 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -271,59 +271,6 @@ config LOG_BUF_SHIFT | |||
271 | 13 => 8 KB | 271 | 13 => 8 KB |
272 | 12 => 4 KB | 272 | 12 => 4 KB |
273 | 273 | ||
274 | config CGROUPS | ||
275 | bool "Control Group support" | ||
276 | help | ||
277 | This option will let you use process cgroup subsystems | ||
278 | such as Cpusets | ||
279 | |||
280 | Say N if unsure. | ||
281 | |||
282 | config CGROUP_DEBUG | ||
283 | bool "Example debug cgroup subsystem" | ||
284 | depends on CGROUPS | ||
285 | default n | ||
286 | help | ||
287 | This option enables a simple cgroup subsystem that | ||
288 | exports useful debugging information about the cgroups | ||
289 | framework | ||
290 | |||
291 | Say N if unsure | ||
292 | |||
293 | config CGROUP_NS | ||
294 | bool "Namespace cgroup subsystem" | ||
295 | depends on CGROUPS | ||
296 | help | ||
297 | Provides a simple namespace cgroup subsystem to | ||
298 | provide hierarchical naming of sets of namespaces, | ||
299 | for instance virtual servers and checkpoint/restart | ||
300 | jobs. | ||
301 | |||
302 | config CGROUP_FREEZER | ||
303 | bool "control group freezer subsystem" | ||
304 | depends on CGROUPS | ||
305 | help | ||
306 | Provides a way to freeze and unfreeze all tasks in a | ||
307 | cgroup. | ||
308 | |||
309 | config CGROUP_DEVICE | ||
310 | bool "Device controller for cgroups" | ||
311 | depends on CGROUPS && EXPERIMENTAL | ||
312 | help | ||
313 | Provides a cgroup implementing whitelists for devices which | ||
314 | a process in the cgroup can mknod or open. | ||
315 | |||
316 | config CPUSETS | ||
317 | bool "Cpuset support" | ||
318 | depends on SMP && CGROUPS | ||
319 | help | ||
320 | This option will let you create and manage CPUSETs which | ||
321 | allow dynamically partitioning a system into sets of CPUs and | ||
322 | Memory Nodes and assigning tasks to run only within those sets. | ||
323 | This is primarily useful on large SMP or NUMA systems. | ||
324 | |||
325 | Say N if unsure. | ||
326 | |||
327 | # | 274 | # |
328 | # Architectures with an unreliable sched_clock() should select this: | 275 | # Architectures with an unreliable sched_clock() should select this: |
329 | # | 276 | # |
@@ -337,6 +284,8 @@ config GROUP_SCHED | |||
337 | help | 284 | help |
338 | This feature lets CPU scheduler recognize task groups and control CPU | 285 | This feature lets CPU scheduler recognize task groups and control CPU |
339 | bandwidth allocation to such task groups. | 286 | bandwidth allocation to such task groups. |
287 | In order to create a group from arbitrary set of processes, use | ||
288 | CONFIG_CGROUPS. (See Control Group support.) | ||
340 | 289 | ||
341 | config FAIR_GROUP_SCHED | 290 | config FAIR_GROUP_SCHED |
342 | bool "Group scheduling for SCHED_OTHER" | 291 | bool "Group scheduling for SCHED_OTHER" |
@@ -379,6 +328,66 @@ config CGROUP_SCHED | |||
379 | 328 | ||
380 | endchoice | 329 | endchoice |
381 | 330 | ||
331 | menu "Control Group support" | ||
332 | config CGROUPS | ||
333 | bool "Control Group support" | ||
334 | help | ||
335 | This option add support for grouping sets of processes together, for | ||
336 | use with process control subsystems such as Cpusets, CFS, memory | ||
337 | controls or device isolation. | ||
338 | See | ||
339 | - Documentation/cpusets.txt (Cpusets) | ||
340 | - Documentation/scheduler/sched-design-CFS.txt (CFS) | ||
341 | - Documentation/cgroups/ (features for grouping, isolation) | ||
342 | - Documentation/controllers/ (features for resource control) | ||
343 | |||
344 | Say N if unsure. | ||
345 | |||
346 | config CGROUP_DEBUG | ||
347 | bool "Example debug cgroup subsystem" | ||
348 | depends on CGROUPS | ||
349 | default n | ||
350 | help | ||
351 | This option enables a simple cgroup subsystem that | ||
352 | exports useful debugging information about the cgroups | ||
353 | framework | ||
354 | |||
355 | Say N if unsure | ||
356 | |||
357 | config CGROUP_NS | ||
358 | bool "Namespace cgroup subsystem" | ||
359 | depends on CGROUPS | ||
360 | help | ||
361 | Provides a simple namespace cgroup subsystem to | ||
362 | provide hierarchical naming of sets of namespaces, | ||
363 | for instance virtual servers and checkpoint/restart | ||
364 | jobs. | ||
365 | |||
366 | config CGROUP_FREEZER | ||
367 | bool "control group freezer subsystem" | ||
368 | depends on CGROUPS | ||
369 | help | ||
370 | Provides a way to freeze and unfreeze all tasks in a | ||
371 | cgroup. | ||
372 | |||
373 | config CGROUP_DEVICE | ||
374 | bool "Device controller for cgroups" | ||
375 | depends on CGROUPS && EXPERIMENTAL | ||
376 | help | ||
377 | Provides a cgroup implementing whitelists for devices which | ||
378 | a process in the cgroup can mknod or open. | ||
379 | |||
380 | config CPUSETS | ||
381 | bool "Cpuset support" | ||
382 | depends on SMP && CGROUPS | ||
383 | help | ||
384 | This option will let you create and manage CPUSETs which | ||
385 | allow dynamically partitioning a system into sets of CPUs and | ||
386 | Memory Nodes and assigning tasks to run only within those sets. | ||
387 | This is primarily useful on large SMP or NUMA systems. | ||
388 | |||
389 | Say N if unsure. | ||
390 | |||
382 | config CGROUP_CPUACCT | 391 | config CGROUP_CPUACCT |
383 | bool "Simple CPU accounting cgroup subsystem" | 392 | bool "Simple CPU accounting cgroup subsystem" |
384 | depends on CGROUPS | 393 | depends on CGROUPS |
@@ -393,9 +402,6 @@ config RESOURCE_COUNTERS | |||
393 | infrastructure that works with cgroups | 402 | infrastructure that works with cgroups |
394 | depends on CGROUPS | 403 | depends on CGROUPS |
395 | 404 | ||
396 | config MM_OWNER | ||
397 | bool | ||
398 | |||
399 | config CGROUP_MEM_RES_CTLR | 405 | config CGROUP_MEM_RES_CTLR |
400 | bool "Memory Resource Controller for Control Groups" | 406 | bool "Memory Resource Controller for Control Groups" |
401 | depends on CGROUPS && RESOURCE_COUNTERS | 407 | depends on CGROUPS && RESOURCE_COUNTERS |
@@ -419,6 +425,11 @@ config CGROUP_MEM_RES_CTLR | |||
419 | This config option also selects MM_OWNER config option, which | 425 | This config option also selects MM_OWNER config option, which |
420 | could in turn add some fork/exit overhead. | 426 | could in turn add some fork/exit overhead. |
421 | 427 | ||
428 | config MM_OWNER | ||
429 | bool | ||
430 | |||
431 | endmenu | ||
432 | |||
422 | config SYSFS_DEPRECATED | 433 | config SYSFS_DEPRECATED |
423 | bool | 434 | bool |
424 | 435 | ||