summaryrefslogtreecommitdiffstats
path: root/include/linux/cgroup.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-05-13 11:27:24 -0400
committerTejun Heo <tj@kernel.org>2014-05-13 11:27:24 -0400
commitd39ea871c3c1269e2852ea096fff492ea034df8a (patch)
tree762859cc57b776048a968f1ab9ceb06d06d4ffb4 /include/linux/cgroup.h
parent2b53f41fa8604845f4f7c538723694a453088b15 (diff)
parent4fb6e25049cb6fa0accc7f1b7c192b952fad7ac8 (diff)
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.16
Pull to receive percpu_ref_tryget[_live]() changes. Planned cgroup changes will make use of them. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/cgroup.h')
-rw-r--r--include/linux/cgroup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index f482f95c2c7..6ab3ee5d4a1 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -108,7 +108,7 @@ static inline bool css_tryget(struct cgroup_subsys_state *css)
{
if (css->flags & CSS_ROOT)
return true;
- return percpu_ref_tryget(&css->refcnt);
+ return percpu_ref_tryget_live(&css->refcnt);
}
/**