diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 21:59:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 21:59:51 -0700 |
| commit | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (patch) | |
| tree | e5dd90cca3a69bc993b5aa860a9eeb8c9178450a /include | |
| parent | c9cedbba0fc591e1c0587f838932ca3f3c6fec57 (diff) | |
| parent | 615cc2211c17ed05a2a5d94abdac6c340a8ea508 (diff) | |
| download | linux-053d8f6622701f849fda2ca2c9ae596c13599ba9.tar.gz linux-053d8f6622701f849fda2ca2c9ae596c13599ba9.tar.bz2 linux-053d8f6622701f849fda2ca2c9ae596c13599ba9.zip | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index ed3e92e41c6e..5a53d8f039a2 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -578,7 +578,11 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp, void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it); int cgroup_scan_tasks(struct cgroup_scanner *scan); int cgroup_attach_task(struct cgroup *, struct task_struct *); -int cgroup_attach_task_current_cg(struct task_struct *); +int cgroup_attach_task_all(struct task_struct *from, struct task_struct *); +static inline int cgroup_attach_task_current_cg(struct task_struct *tsk) +{ + return cgroup_attach_task_all(current, tsk); +} /* * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works @@ -636,6 +640,11 @@ static inline int cgroupstats_build(struct cgroupstats *stats, } /* No cgroups - nothing to do */ +static inline int cgroup_attach_task_all(struct task_struct *from, + struct task_struct *t) +{ + return 0; +} static inline int cgroup_attach_task_current_cg(struct task_struct *t) { return 0; |