aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-21 10:37:27 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-21 10:37:27 -0500
commit77835492ed489c0b870f82f4c50687bd267acc0a (patch)
treed80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /init/Kconfig
parentaf37501c792107c2bde1524bdae38d9a247b841a (diff)
parent1de9e8e70f5acc441550ca75433563d91b269bbe (diff)
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts: include/linux/syscalls.h
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig65
1 files changed, 32 insertions, 33 deletions
diff --git a/init/Kconfig b/init/Kconfig
index a588cdc274bc..6af96b7e2238 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -323,26 +323,26 @@ 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
331menu "Control Group support" 331menuconfig CGROUPS
332config CGROUPS 332 boolean "Control Group support"
333 bool "Control Group support"
334 help 333 help
335 This option add support for grouping sets of processes together, for 334 This option adds support for grouping sets of processes together, for
336 use with process control subsystems such as Cpusets, CFS, memory 335 use with process control subsystems such as Cpusets, CFS, memory
337 controls or device isolation. 336 controls or device isolation.
338 See 337 See
339 - Documentation/cpusets.txt (Cpusets)
340 - Documentation/scheduler/sched-design-CFS.txt (CFS) 338 - Documentation/scheduler/sched-design-CFS.txt (CFS)
341 - Documentation/cgroups/ (features for grouping, isolation) 339 - Documentation/cgroups/ (features for grouping, isolation
342 - Documentation/controllers/ (features for resource control) 340 and resource control)
343 341
344 Say N if unsure. 342 Say N if unsure.
345 343
344if CGROUPS
345
346config CGROUP_DEBUG 346config CGROUP_DEBUG
347 bool "Example debug cgroup subsystem" 347 bool "Example debug cgroup subsystem"
348 depends on CGROUPS 348 depends on CGROUPS
@@ -350,24 +350,24 @@ config CGROUP_DEBUG
350 help 350 help
351 This option enables a simple cgroup subsystem that 351 This option enables a simple cgroup subsystem that
352 exports useful debugging information about the cgroups 352 exports useful debugging information about the cgroups
353 framework 353 framework.
354 354
355 Say N if unsure 355 Say N if unsure.
356 356
357config CGROUP_NS 357config CGROUP_NS
358 bool "Namespace cgroup subsystem" 358 bool "Namespace cgroup subsystem"
359 depends on CGROUPS 359 depends on CGROUPS
360 help 360 help
361 Provides a simple namespace cgroup subsystem to 361 Provides a simple namespace cgroup subsystem to
362 provide hierarchical naming of sets of namespaces, 362 provide hierarchical naming of sets of namespaces,
363 for instance virtual servers and checkpoint/restart 363 for instance virtual servers and checkpoint/restart
364 jobs. 364 jobs.
365 365
366config CGROUP_FREEZER 366config CGROUP_FREEZER
367 bool "control group freezer subsystem" 367 bool "Freezer cgroup subsystem"
368 depends on CGROUPS 368 depends on CGROUPS
369 help 369 help
370 Provides a way to freeze and unfreeze all tasks in a 370 Provides a way to freeze and unfreeze all tasks in a
371 cgroup. 371 cgroup.
372 372
373config CGROUP_DEVICE 373config CGROUP_DEVICE
@@ -388,18 +388,23 @@ config CPUSETS
388 388
389 Say N if unsure. 389 Say N if unsure.
390 390
391config PROC_PID_CPUSET
392 bool "Include legacy /proc/<pid>/cpuset file"
393 depends on CPUSETS
394 default y
395
391config CGROUP_CPUACCT 396config CGROUP_CPUACCT
392 bool "Simple CPU accounting cgroup subsystem" 397 bool "Simple CPU accounting cgroup subsystem"
393 depends on CGROUPS 398 depends on CGROUPS
394 help 399 help
395 Provides a simple Resource Controller for monitoring the 400 Provides a simple Resource Controller for monitoring the
396 total CPU consumed by the tasks in a cgroup 401 total CPU consumed by the tasks in a cgroup.
397 402
398config RESOURCE_COUNTERS 403config RESOURCE_COUNTERS
399 bool "Resource counters" 404 bool "Resource counters"
400 help 405 help
401 This option enables controller independent resource accounting 406 This option enables controller independent resource accounting
402 infrastructure that works with cgroups 407 infrastructure that works with cgroups.
403 depends on CGROUPS 408 depends on CGROUPS
404 409
405config CGROUP_MEM_RES_CTLR 410config CGROUP_MEM_RES_CTLR
@@ -425,9 +430,6 @@ config CGROUP_MEM_RES_CTLR
425 This config option also selects MM_OWNER config option, which 430 This config option also selects MM_OWNER config option, which
426 could in turn add some fork/exit overhead. 431 could in turn add some fork/exit overhead.
427 432
428config MM_OWNER
429 bool
430
431config CGROUP_MEM_RES_CTLR_SWAP 433config CGROUP_MEM_RES_CTLR_SWAP
432 bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" 434 bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
433 depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL 435 depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
@@ -444,8 +446,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
444 there will be no overhead from this. Even when you set this config=y, 446 there will be no overhead from this. Even when you set this config=y,
445 if boot option "noswapaccount" is set, swap will not be accounted. 447 if boot option "noswapaccount" is set, swap will not be accounted.
446 448
449endif # CGROUPS
447 450
448endmenu 451config MM_OWNER
452 bool
449 453
450config SYSFS_DEPRECATED 454config SYSFS_DEPRECATED
451 bool 455 bool
@@ -483,11 +487,6 @@ config SYSFS_DEPRECATED_V2
483 if the original kernel, that came with your distribution, has 487 if the original kernel, that came with your distribution, has
484 this option set to N. 488 this option set to N.
485 489
486config PROC_PID_CPUSET
487 bool "Include legacy /proc/<pid>/cpuset file"
488 depends on CPUSETS
489 default y
490
491config RELAY 490config RELAY
492 bool "Kernel->user space relay support (formerly relayfs)" 491 bool "Kernel->user space relay support (formerly relayfs)"
493 help 492 help