diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:08:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:08:22 +1000 |
| commit | 714c40005d297744e3c52e76963d65ae05159ba2 (patch) | |
| tree | 126474d8d804b4cb36a8331e51945738d1b7d805 /kernel/events | |
| parent | ab30c194a899a6ef940cad4b67712b7c365ba8d8 (diff) | |
| parent | 5533e0114425dcdb878f11b291f2727af8667a7c (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 689237a0c5e..24d35cc38e4 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -608,7 +608,8 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, if (!f.file) return -EBADF; - css = css_tryget_from_dir(f.file->f_dentry, &perf_event_cgrp_subsys); + css = css_tryget_online_from_dir(f.file->f_dentry, + &perf_event_cgrp_subsys); if (IS_ERR(css)) { ret = PTR_ERR(css); goto out; |