On Mon 21-09-15 14:10:39, Stephen Rothwell wrote: > Hi Andrew, > > After merging the akpm-current tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > mm/vmscan.c: In function 'sane_reclaim': > mm/vmscan.c:178:2: error: implicit declaration of function 'cgroup_on_dfl' [-Werror=implicit-function-declaration] > if (cgroup_on_dfl(memcg->css.cgroup)) > ^ > > Caused by commit > > d08255ab4d66 ("vmscan: fix sane_reclaim helper for legacy memcg") > > interacting with commit > > 9e10a130d9b6 ("cgroup: replace cgroup_on_dfl() tests in controllers with cgroup_subsys_on_dfl()") > > from the cgroup tree. > > I don't know what the correct firx is here (help, please) so I have just > open coded the cgroup_on_dfl() call for now: AFAIU your fix is correct but using cgroup_subsys_on_dfl(memory_cgrp_subsys) is more appropriate: diff --git a/mm/vmscan.c b/mm/vmscan.c index d62924ee8022..c3df03add73e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -176,7 +176,7 @@ static bool sane_reclaim(struct scan_control *sc) if (!memcg) return true; #ifdef CONFIG_CGROUP_WRITEBACK - if (cgroup_on_dfl(memcg->css.cgroup)) + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) return true; #endif return false; -- Michal Hocko SUSE Labs -- 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