---

yaml --- r: 221718 b: refs/heads/master c: d2e61b8 h: refs/heads/master v: v3
git-mirror · Nov 12, 2010 · f196218 · f196218
1 parent 7da2aff
commit f196218
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1093736b3c34319b8f1825a4423414d9cf397d73
+refs/heads/master: d2e61b8dc99fdb36e0fd176e25365f69afda4ff9
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -4208,15 +4208,17 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 
 	memset(mem, 0, size);
 	mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
-	if (!mem->stat) {
-		if (size < PAGE_SIZE)
-			kfree(mem);
-		else
-			vfree(mem);
-		mem = NULL;
-	}
+	if (!mem->stat)
+		goto out_free;
 	spin_lock_init(&mem->pcp_counter_lock);
 	return mem;
+
+out_free:
+	if (size < PAGE_SIZE)
+		kfree(mem);
+	else
+		vfree(mem);
+	return NULL;
 }
 
 /*