summaryrefslogtreecommitdiff
path: root/include/linux/cgroup-defs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-12-03 18:22:52 +0300
committerTejun Heo <tj@kernel.org>2015-12-03 18:22:52 +0300
commit8075b542cf9f5d8a6afd92b4a940e29a677a7510 (patch)
treec2075c5fa70b16d086871edaf94febd954fec073 /include/linux/cgroup-defs.h
parentd2b4365809060b256330a99289de9797a5dd6967 (diff)
parent67cde9c4938945b9510730c64e68d2f1dd7bc0aa (diff)
downloadlinux-8075b542cf9f5d8a6afd92b4a940e29a677a7510.tar.xz
Merge branch 'for-4.4-fixes' into for-4.5
Diffstat (limited to 'include/linux/cgroup-defs.h')
-rw-r--r--include/linux/cgroup-defs.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 80e2ae655208..678cd5e4e881 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -421,12 +421,9 @@ struct cgroup_subsys {
void (*css_reset)(struct cgroup_subsys_state *css);
void (*css_e_css_changed)(struct cgroup_subsys_state *css);
- int (*can_attach)(struct cgroup_subsys_state *css,
- struct cgroup_taskset *tset);
- void (*cancel_attach)(struct cgroup_subsys_state *css,
- struct cgroup_taskset *tset);
- void (*attach)(struct cgroup_subsys_state *css,
- struct cgroup_taskset *tset);
+ int (*can_attach)(struct cgroup_taskset *tset);
+ void (*cancel_attach)(struct cgroup_taskset *tset);
+ void (*attach)(struct cgroup_taskset *tset);
int (*can_fork)(struct task_struct *task, void **priv_p);
void (*cancel_fork)(struct task_struct *task, void *priv);
void (*fork)(struct task_struct *task, void *priv);