Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 2 insertions, 3 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6bded84c20c8..631002d085d1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -534,7 +534,6 @@ unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
                 if (scan >= nr_to_scan)
                         break;
                 page = pc->page;
-                VM_BUG_ON(!pc);
 
                 if (unlikely(!PageLRU(page)))
                         continue;
@@ -1101,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);
 
@@ -1117,7 +1116,7 @@ free_out:
                 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,