From d0fe812611b17cb325d162ceae03034bd60a26ce Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Sat, 23 Feb 2008 15:24:14 -0800 Subject: [PATCH] --- yaml --- r: 86251 b: refs/heads/master c: 2dda81ca31dc73e695ff8b83351f7aaefbef192a h: refs/heads/master i: 86249: ee19e3f71b9a101b1f18183d4269a94ef480e040 86247: 3d235547263d809b92f212ab5662fedf79124a44 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ad23f10d3977..9ecd309203ef 100644 --- 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 index bb4d7acfbca3..631002d085d1 100644 --- 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,