---

yaml --- r: 86251 b: refs/heads/master c: 2dda81c h: refs/heads/master i: 86249: ee19e3f 86247: 3d23554 v: v3
git-mirror · Feb 24, 2008 · d0fe812 · d0fe812
1 parent f3420a2
commit d0fe812
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fde4c3eb7ee68828d76a2148ed6d70b6a794add
+refs/heads/master: 2dda81ca31dc73e695ff8b83351f7aaefbef192a
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1100,7 +1100,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 		mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL);
 
 	if (mem == NULL)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	res_counter_init(&mem->res);
 
@@ -1116,7 +1116,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 		free_mem_cgroup_per_zone_info(mem, node);
 	if (cont->parent != NULL)
 		kfree(mem);
-	return NULL;
+	return ERR_PTR(-ENOMEM);
 }
 
 static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss,