On Wed 24-08-16 10:22:43, Arnd Bergmann wrote: > A bugfix in v4.8-rc2 introduced a harmless warning when CONFIG_MEMCG_SWAP > is disabled but CONFIG_MEMCG is enabled: > > mm/memcontrol.c:4085:27: error: 'mem_cgroup_id_get_online' defined but not > used [-Werror=unused-function] > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > > This adds an extra #ifdef that matches the one around the caller to > avoid the warning.
Thanks for fixing that! Could you please move the function to the same ifdef section as its users please. > Signed-off-by: Arnd Bergmann <a...@arndb.de> > Fixes: 1f47b61fb407 ("mm: memcontrol: fix swap counter leak on swapout from > offline cgroup") Anyway Acked-by: Michal Hocko <mho...@suse.com> > --- > mm/memcontrol.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 2ff0289ad061..e8d787163b65 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4082,6 +4082,7 @@ static void mem_cgroup_id_get_many(struct mem_cgroup > *memcg, unsigned int n) > atomic_add(n, &memcg->id.ref); > } > > +#ifdef CONFIG_MEMCG_SWAP > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > { > while (!atomic_inc_not_zero(&memcg->id.ref)) { > @@ -4099,6 +4100,7 @@ static struct mem_cgroup > *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > } > return memcg; > } > +#endif > > static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) > { > -- > 2.9.0 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majord...@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"d...@kvack.org"> em...@kvack.org </a> -- Michal Hocko SUSE Labs