Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 963bf139e2b244fa1a4e2efb9a697e02b0c8dfa5..b1c663593f5c9f082cb3dd997f94978a723b7599 100644 (file)
--- 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;
 }