summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-08-27 14:27:23 -0400
committerTejun Heo <tj@kernel.org>2013-08-27 14:27:23 -0400
commitd1625964da51bda61306ad3ec45307a799c21f08 (patch)
treee91a885c04d7ba1e1f4024b84591c09698386ee2 /kernel
parent7c918cbbd829669bf70ffcc45962d5d992942243 (diff)
downloadlinux-d1625964da51bda61306ad3ec45307a799c21f08.tar.bz2
cgroup: fix cgroup_css() invocation in css_from_id()
ca8bdcaff0 ("cgroup: make cgroup_css() take cgroup_subsys * instead and allow NULL subsys") missed one conversion in css_from_id(), which was newly added. As css_from_id() doesn't have any user yet, this doesn't break anything other than generating a build warning. Convert it. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: kbuild test robot <fengguang.wu@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e76698dd6c08..b5f4989937f2 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5729,7 +5729,7 @@ struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss)
cgrp = idr_find(&ss->root->cgroup_idr, id);
if (cgrp)
- return cgroup_css(cgrp, ss->subsys_id);
+ return cgroup_css(cgrp, ss);
return NULL;
}