From 1967195ff5e5670f0ec1509a37994fd5687485e1 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 18 Oct 2007 03:05:11 -0700
Subject: [PATCH] --- yaml --- r: 71130 b: refs/heads/master c:
 12d00f6a121877235a5cacc56386936dd9bb81af h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/mm/slab.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1120e199e834..3ef50c02463b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbf1e473bd0ecc080a4c37bb89848b16c59ac18b
+refs/heads/master: 12d00f6a121877235a5cacc56386936dd9bb81af
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 671588497e82..54eb555c4ef8 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1282,13 +1282,18 @@ static int __cpuinit cpuup_prepare(long cpu)
 			shared = alloc_arraycache(node,
 				cachep->shared * cachep->batchcount,
 				0xbaadf00d);
-			if (!shared)
+			if (!shared) {
+				kfree(nc);
 				goto bad;
+			}
 		}
 		if (use_alien_caches) {
 			alien = alloc_alien_cache(node, cachep->limit);
-			if (!alien)
+			if (!alien) {
+				kfree(shared);
+				kfree(nc);
 				goto bad;
+			}
 		}
 		cachep->array[cpu] = nc;
 		l3 = cachep->nodelists[node];
@@ -1315,6 +1320,7 @@ static int __cpuinit cpuup_prepare(long cpu)
 	}
 	return 0;
 bad:
+	cpuup_canceled(cpu);
 	return -ENOMEM;
 }