From bcd80104c8898920b01edb214422cc545e35f122 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Fri, 9 Jul 2010 14:07:12 -0500
Subject: [PATCH] --- yaml --- r: 206074 b: refs/heads/master c:
 d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 09460e6fb9fd..16717b9eca5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f90ec390148fdbc0db38c477bc6dc94db721e7f1
+refs/heads/master: d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 2c1190351726..8655be5b7404 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3118,9 +3118,12 @@ void __init kmem_cache_init(void)
 	slab_state = UP;
 
 	/* Provide the correct kmalloc names now that the caches are up */
-	for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++)
-		kmalloc_caches[i]. name =
-			kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i);
+	for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
+		char *s = kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i);
+
+		BUG_ON(!s);
+		kmalloc_caches[i].name = s;
+	}
 
 #ifdef CONFIG_SMP
 	register_cpu_notifier(&slab_notifier);