aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorPaul Menage <menage@google.com>2007-10-19 02:39:39 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:36 -0400
commit8793d854edbc2774943a4b0de3304dc73991159a (patch)
tree380b3403a0fedfcce61d9af5af1ffbcc71017abf /init/Kconfig
parent81a6a5cdd2c5cd70874b88afe524ab09e9e869af (diff)
Task Control Groups: make cpusets a client of cgroups
Remove the filesystem support logic from the cpusets system and makes cpusets a cgroup subsystem The "cpuset" filesystem becomes a dummy filesystem; attempts to mount it get passed through to the cgroup filesystem with the appropriate options to emulate the old cpuset filesystem behaviour. Signed-off-by: Paul Menage <menage@google.com> Cc: Serge E. Hallyn <serue@us.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Paul Jackson <pj@sgi.com> Cc: Kirill Korotaev <dev@openvz.org> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Srivatsa Vaddagiri <vatsa@in.ibm.com> Cc: Cedric Le Goater <clg@fr.ibm.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/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 51b3d14f44f1..18b1abc677da 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -280,7 +280,7 @@ config CGROUPS
280 280
281config CPUSETS 281config CPUSETS
282 bool "Cpuset support" 282 bool "Cpuset support"
283 depends on SMP 283 depends on SMP && CGROUPS
284 help 284 help
285 This option will let you create and manage CPUSETs which 285 This option will let you create and manage CPUSETs which
286 allow dynamically partitioning a system into sets of CPUs and 286 allow dynamically partitioning a system into sets of CPUs and
@@ -330,6 +330,11 @@ config SYSFS_DEPRECATED
330 If you are using a distro that was released in 2006 or later, 330 If you are using a distro that was released in 2006 or later,
331 it should be safe to say N here. 331 it should be safe to say N here.
332 332
333config PROC_PID_CPUSET
334 bool "Include legacy /proc/<pid>/cpuset file"
335 depends on CPUSETS
336 default y
337
333config RELAY 338config RELAY
334 bool "Kernel->user space relay support (formerly relayfs)" 339 bool "Kernel->user space relay support (formerly relayfs)"
335 help 340 help