aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index bb4d7acfbca3..631002d085d1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1100,7 +1100,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
1100 mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL); 1100 mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL);
1101 1101
1102 if (mem == NULL) 1102 if (mem == NULL)
1103 return NULL; 1103 return ERR_PTR(-ENOMEM);
1104 1104
1105 res_counter_init(&mem->res); 1105 res_counter_init(&mem->res);
1106 1106
@@ -1116,7 +1116,7 @@ free_out:
1116 free_mem_cgroup_per_zone_info(mem, node); 1116 free_mem_cgroup_per_zone_info(mem, node);
1117 if (cont->parent != NULL) 1117 if (cont->parent != NULL)
1118 kfree(mem); 1118 kfree(mem);
1119 return NULL; 1119 return ERR_PTR(-ENOMEM);
1120} 1120}
1121 1121
1122static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss, 1122static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss,