From: Andrew Morton <akpm@linux-foundation.org>

Cc: Balbir Singh <balbir@in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff -puN mm/memcontrol.c~use-vmalloc-for-mem_cgroup-allocation-v3-simplification mm/memcontrol.c
--- a/mm/memcontrol.c~use-vmalloc-for-mem_cgroup-allocation-v3-simplification
+++ a/mm/memcontrol.c
@@ -993,10 +993,8 @@ static struct mem_cgroup *mem_cgroup_all
 	else
 		mem = vmalloc(sizeof(*mem));
 
-	if (!mem)
-		return NULL;
-
-	memset(mem, 0, sizeof(*mem));
+	if (mem)
+		memset(mem, 0, sizeof(*mem));
 	return mem;
 }
 
_