diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-02 15:54:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-02 15:54:07 -0700 |
| commit | 4fc6eb7d35a28d808ff6c77fa36e637e334dceac (patch) | |
| tree | e69b4b7e5a5d050ce4d8837eda9c7e33cb5c3d7d /include | |
| parent | 9ed6eda4fad9ea95e99f1e3cc546bcde049695cf (diff) | |
| parent | 8dd014adfea6f173c1ef6378f7e5e7924866c923 (diff) | |
| download | linux-4fc6eb7d35a28d808ff6c77fa36e637e334dceac.tar.gz linux-4fc6eb7d35a28d808ff6c77fa36e637e334dceac.tar.bz2 linux-4fc6eb7d35a28d808ff6c77fa36e637e334dceac.zip | |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0c621604baa1..e0aa067d1b11 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -570,6 +570,7 @@ 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 *); /* * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works @@ -626,6 +627,12 @@ static inline int cgroupstats_build(struct cgroupstats *stats, return -EINVAL; } +/* No cgroups - nothing to do */ +static inline int cgroup_attach_task_current_cg(struct task_struct *t) +{ + return 0; +} + #endif /* !CONFIG_CGROUPS */ #endif /* _LINUX_CGROUP_H */ |