diff options
Diffstat (limited to 'kernel/events')
-rw-r--r-- | kernel/events/core.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 3f92a19aa11e..a6a9ec4cd8f5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -7154,8 +7154,7 @@ unlock: | |||
7154 | device_initcall(perf_event_sysfs_init); | 7154 | device_initcall(perf_event_sysfs_init); |
7155 | 7155 | ||
7156 | #ifdef CONFIG_CGROUP_PERF | 7156 | #ifdef CONFIG_CGROUP_PERF |
7157 | static struct cgroup_subsys_state *perf_cgroup_create( | 7157 | static struct cgroup_subsys_state *perf_cgroup_create(struct cgroup *cont) |
7158 | struct cgroup_subsys *ss, struct cgroup *cont) | ||
7159 | { | 7158 | { |
7160 | struct perf_cgroup *jc; | 7159 | struct perf_cgroup *jc; |
7161 | 7160 | ||
@@ -7172,8 +7171,7 @@ static struct cgroup_subsys_state *perf_cgroup_create( | |||
7172 | return &jc->css; | 7171 | return &jc->css; |
7173 | } | 7172 | } |
7174 | 7173 | ||
7175 | static void perf_cgroup_destroy(struct cgroup_subsys *ss, | 7174 | static void perf_cgroup_destroy(struct cgroup *cont) |
7176 | struct cgroup *cont) | ||
7177 | { | 7175 | { |
7178 | struct perf_cgroup *jc; | 7176 | struct perf_cgroup *jc; |
7179 | jc = container_of(cgroup_subsys_state(cont, perf_subsys_id), | 7177 | jc = container_of(cgroup_subsys_state(cont, perf_subsys_id), |
@@ -7189,8 +7187,7 @@ static int __perf_cgroup_move(void *info) | |||
7189 | return 0; | 7187 | return 0; |
7190 | } | 7188 | } |
7191 | 7189 | ||
7192 | static void perf_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, | 7190 | static void perf_cgroup_attach(struct cgroup *cgrp, struct cgroup_taskset *tset) |
7193 | struct cgroup_taskset *tset) | ||
7194 | { | 7191 | { |
7195 | struct task_struct *task; | 7192 | struct task_struct *task; |
7196 | 7193 | ||
@@ -7198,8 +7195,8 @@ static void perf_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, | |||
7198 | task_function_call(task, __perf_cgroup_move, task); | 7195 | task_function_call(task, __perf_cgroup_move, task); |
7199 | } | 7196 | } |
7200 | 7197 | ||
7201 | static void perf_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp, | 7198 | static void perf_cgroup_exit(struct cgroup *cgrp, struct cgroup *old_cgrp, |
7202 | struct cgroup *old_cgrp, struct task_struct *task) | 7199 | struct task_struct *task) |
7203 | { | 7200 | { |
7204 | /* | 7201 | /* |
7205 | * cgroup_exit() is called in the copy_process() failure path. | 7202 | * cgroup_exit() is called in the copy_process() failure path. |