diff --git a/[refs] b/[refs] index 8dd5a85e2a84..541bda67133a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e1c9d865543593ee92ec3a5075f064dec981a96 +refs/heads/master: 0eb253e223c88b982461e59154fcad1b82597592 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index fb62b4335fa9..f0dc076adf05 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -2202,7 +2202,7 @@ static void __init enable_swap_cgroup(void) } #endif -static struct cgroup_subsys_state * +static struct cgroup_subsys_state * __ref mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont) { struct mem_cgroup *mem, *parent;