diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/device_cgroup.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 8b5b5d8612c6..c43a3323feea 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
@@ -61,8 +61,8 @@ static inline struct dev_cgroup *task_devcgroup(struct task_struct *task) | |||
61 | 61 | ||
62 | struct cgroup_subsys devices_subsys; | 62 | struct cgroup_subsys devices_subsys; |
63 | 63 | ||
64 | static int devcgroup_can_attach(struct cgroup_subsys *ss, | 64 | static int devcgroup_can_attach(struct cgroup *new_cgrp, |
65 | struct cgroup *new_cgrp, struct cgroup_taskset *set) | 65 | struct cgroup_taskset *set) |
66 | { | 66 | { |
67 | struct task_struct *task = cgroup_taskset_first(set); | 67 | struct task_struct *task = cgroup_taskset_first(set); |
68 | 68 | ||
@@ -156,8 +156,7 @@ remove: | |||
156 | /* | 156 | /* |
157 | * called from kernel/cgroup.c with cgroup_lock() held. | 157 | * called from kernel/cgroup.c with cgroup_lock() held. |
158 | */ | 158 | */ |
159 | static struct cgroup_subsys_state *devcgroup_create(struct cgroup_subsys *ss, | 159 | static struct cgroup_subsys_state *devcgroup_create(struct cgroup *cgroup) |
160 | struct cgroup *cgroup) | ||
161 | { | 160 | { |
162 | struct dev_cgroup *dev_cgroup, *parent_dev_cgroup; | 161 | struct dev_cgroup *dev_cgroup, *parent_dev_cgroup; |
163 | struct cgroup *parent_cgroup; | 162 | struct cgroup *parent_cgroup; |
@@ -195,8 +194,7 @@ static struct cgroup_subsys_state *devcgroup_create(struct cgroup_subsys *ss, | |||
195 | return &dev_cgroup->css; | 194 | return &dev_cgroup->css; |
196 | } | 195 | } |
197 | 196 | ||
198 | static void devcgroup_destroy(struct cgroup_subsys *ss, | 197 | static void devcgroup_destroy(struct cgroup *cgroup) |
199 | struct cgroup *cgroup) | ||
200 | { | 198 | { |
201 | struct dev_cgroup *dev_cgroup; | 199 | struct dev_cgroup *dev_cgroup; |
202 | struct dev_whitelist_item *wh, *tmp; | 200 | struct dev_whitelist_item *wh, *tmp; |