On Tue, Aug 27, 2013 at 08:17:16PM +1000, Stephen Rothwell wrote: > Hi Tejun, > > After merging the cgroup tree, today's linux-next build (i386 defconfig) > produced this warning: > > kernel/cgroup.c: In function 'css_from_id': > kernel/cgroup.c:5723:3: warning: passing argument 2 of 'cgroup_css' makes pointer from integer without a cast [enabled by default] > kernel/cgroup.c:237:36: note: expected 'struct cgroup_subsys *' but argument is of type 'int' > > Introduced by commit ca8bdcaff0d7 ("cgroup: make cgroup_css() take > cgroup_subsys * instead and allow NULL subsys"). Yeap, the conversion missed a newly added function, which BTW currently doesn't have any users. Applied the following fix. Thanks a lot! >From d1625964da51bda61306ad3ec45307a799c21f08 Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@xxxxxxxxxx> Date: Tue, 27 Aug 2013 14:27:23 -0400 Subject: [PATCH] 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@xxxxxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx> --- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e76698d..b5f4989 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; } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html