diff options
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 56003c6edfd3..64903731d834 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -342,7 +342,7 @@ struct perf_cgroup { | |||
| 342 | static inline struct perf_cgroup * | 342 | static inline struct perf_cgroup * |
| 343 | perf_cgroup_from_task(struct task_struct *task) | 343 | perf_cgroup_from_task(struct task_struct *task) |
| 344 | { | 344 | { |
| 345 | return container_of(task_css(task, perf_subsys_id), | 345 | return container_of(task_css(task, perf_event_cgrp_id), |
| 346 | struct perf_cgroup, css); | 346 | struct perf_cgroup, css); |
| 347 | } | 347 | } |
| 348 | 348 | ||
| @@ -595,7 +595,7 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
| 595 | 595 | ||
| 596 | rcu_read_lock(); | 596 | rcu_read_lock(); |
| 597 | 597 | ||
| 598 | css = css_from_dir(f.file->f_dentry, &perf_subsys); | 598 | css = css_from_dir(f.file->f_dentry, &perf_event_cgrp_subsys); |
| 599 | if (IS_ERR(css)) { | 599 | if (IS_ERR(css)) { |
| 600 | ret = PTR_ERR(css); | 600 | ret = PTR_ERR(css); |
| 601 | goto out; | 601 | goto out; |
| @@ -8055,9 +8055,7 @@ static void perf_cgroup_exit(struct cgroup_subsys_state *css, | |||
| 8055 | task_function_call(task, __perf_cgroup_move, task); | 8055 | task_function_call(task, __perf_cgroup_move, task); |
| 8056 | } | 8056 | } |
| 8057 | 8057 | ||
| 8058 | struct cgroup_subsys perf_subsys = { | 8058 | struct cgroup_subsys perf_event_cgrp_subsys = { |
| 8059 | .name = "perf_event", | ||
| 8060 | .subsys_id = perf_subsys_id, | ||
| 8061 | .css_alloc = perf_cgroup_css_alloc, | 8059 | .css_alloc = perf_cgroup_css_alloc, |
| 8062 | .css_free = perf_cgroup_css_free, | 8060 | .css_free = perf_cgroup_css_free, |
| 8063 | .exit = perf_cgroup_exit, | 8061 | .exit = perf_cgroup_exit, |