1 files changed, 3 insertions, 9 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 97a45b392f77..bef114258bbd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4764,6 +4764,7 @@ static struct cftype mem_cgroup_files[] = {
                 .read = mem_cgroup_read,
         },
 #endif
+        { },    /* terminate */
 };
 
 static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
@@ -5041,15 +5042,7 @@ static void mem_cgroup_destroy(struct cgroup *cont)
 static int mem_cgroup_populate(struct cgroup_subsys *ss,
                                 struct cgroup *cont)
 {
-        int ret;
-
-        ret = cgroup_add_files(cont, ss, mem_cgroup_files,
-                                ARRAY_SIZE(mem_cgroup_files));
-
-        if (!ret)
-                ret = register_kmem_files(cont, ss);
-
-        return ret;
+        return register_kmem_files(cont, ss);
 }
 
 #ifdef CONFIG_MMU
@@ -5639,6 +5632,7 @@ struct cgroup_subsys mem_cgroup_subsys = {
         .can_attach = mem_cgroup_can_attach,
         .cancel_attach = mem_cgroup_cancel_attach,
         .attach = mem_cgroup_move_task,
+        .base_cftypes = mem_cgroup_files,
         .early_init = 0,
         .use_id = 1,
 };