diff options
author | Paul Menage <menage@google.com> | 2007-10-19 02:39:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:36 -0400 |
commit | 8793d854edbc2774943a4b0de3304dc73991159a (patch) | |
tree | 380b3403a0fedfcce61d9af5af1ffbcc71017abf /kernel/fork.c | |
parent | 81a6a5cdd2c5cd70874b88afe524ab09e9e869af (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 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index fcac38929245..61516b89cb6c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/nsproxy.h> | 29 | #include <linux/nsproxy.h> |
30 | #include <linux/capability.h> | 30 | #include <linux/capability.h> |
31 | #include <linux/cpu.h> | 31 | #include <linux/cpu.h> |
32 | #include <linux/cpuset.h> | ||
33 | #include <linux/cgroup.h> | 32 | #include <linux/cgroup.h> |
34 | #include <linux/security.h> | 33 | #include <linux/security.h> |
35 | #include <linux/swap.h> | 34 | #include <linux/swap.h> |
@@ -1089,7 +1088,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1089 | #endif | 1088 | #endif |
1090 | p->io_context = NULL; | 1089 | p->io_context = NULL; |
1091 | p->audit_context = NULL; | 1090 | p->audit_context = NULL; |
1092 | cpuset_fork(p); | ||
1093 | cgroup_fork(p); | 1091 | cgroup_fork(p); |
1094 | #ifdef CONFIG_NUMA | 1092 | #ifdef CONFIG_NUMA |
1095 | p->mempolicy = mpol_copy(p->mempolicy); | 1093 | p->mempolicy = mpol_copy(p->mempolicy); |
@@ -1330,7 +1328,6 @@ bad_fork_cleanup_policy: | |||
1330 | mpol_free(p->mempolicy); | 1328 | mpol_free(p->mempolicy); |
1331 | bad_fork_cleanup_cgroup: | 1329 | bad_fork_cleanup_cgroup: |
1332 | #endif | 1330 | #endif |
1333 | cpuset_exit(p); | ||
1334 | cgroup_exit(p, cgroup_callbacks_done); | 1331 | cgroup_exit(p, cgroup_callbacks_done); |
1335 | bad_fork_cleanup_delays_binfmt: | 1332 | bad_fork_cleanup_delays_binfmt: |
1336 | delayacct_tsk_free(p); | 1333 | delayacct_tsk_free(p); |