diff --git a/[refs] b/[refs] index 27faae125bee..7ec00c50769d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1640879afe0065caf276e98fff059c4dc01c97ae +refs/heads/master: 573b400d01b3411c2436e73d8e63fc1186b94535 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index d280016039f2..7e5bc43c2d1f 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -5813,7 +5813,7 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) return ret; return mem_cgroup_sockets_init(memcg, ss); -}; +} static void kmem_cgroup_destroy(struct mem_cgroup *memcg) {