As suggested by akpm, change the manual initialization of our kmem index to DEFINE_IDA() Signed-off-by: Glauber Costa <glommer@xxxxxxxxxxxxx> CC: Michal Hocko <mhocko@xxxxxxx> CC: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> CC: Johannes Weiner <hannes@xxxxxxxxxxx> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6136fec..c0c6adf 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -569,7 +569,7 @@ static void disarm_sock_keys(struct mem_cgroup *memcg) * memcg_limited_groups_array_size. It will double each time we have to * increase it. */ -static struct ida kmem_limited_groups; +static DEFINE_IDA(kmem_limited_groups); int memcg_limited_groups_array_size; /* @@ -5686,9 +5686,6 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) if (ret) return ret; - if (mem_cgroup_is_root(memcg)) - ida_init(&kmem_limited_groups); - return mem_cgroup_sockets_init(memcg, ss); }; -- 1.7.11.7 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>