diff options
| author | Linus Torvalds | 2014-10-10 07:24:40 -0400 |
|---|---|---|
| committer | Linus Torvalds | 2014-10-10 07:24:40 -0400 |
| commit | b211e9d7c861bdb37b86d6384da9edfb80949ceb (patch) | |
| tree | dfb209ffce92a2b203a9fd2ddbc23eed5daddacf /kernel/events | |
| parent | d9428f09763d307a6d2220c4bbb01d8fc5c55b52 (diff) | |
| parent | e756c7b698604f11a979f2781d06eb7b80aba363 (diff) | |
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Nothing too interesting. Just a handful of cleanup patches"
* 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
Revert "cgroup: remove redundant variable in cgroup_mount()"
cgroup: remove redundant variable in cgroup_mount()
cgroup: fix missing unlock in cgroup_release_agent()
cgroup: remove CGRP_RELEASABLE flag
perf/cgroup: Remove perf_put_cgroup()
cgroup: remove redundant check in cgroup_ino()
cpuset: simplify proc_cpuset_show()
cgroup: simplify proc_cgroup_show()
cgroup: use a per-cgroup work for release agent
cgroup: remove bogus comments
cgroup: remove redundant code in cgroup_rmdir()
cgroup: remove some useless forward declarations
cgroup: fix a typo in comment.
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 963bf139e2b2..b1c663593f5c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -392,14 +392,9 @@ perf_cgroup_match(struct perf_event *event) event->cgrp->css.cgroup); } -static inline void perf_put_cgroup(struct perf_event *event) -{ - css_put(&event->cgrp->css); -} - static inline void perf_detach_cgroup(struct perf_event *event) { - perf_put_cgroup(event); + css_put(&event->cgrp->css); event->cgrp = NULL; } |