---

yaml --- r: 206074 b: refs/heads/master c: d7278bd h: refs/heads/master v: v3
git-mirror · Jul 16, 2010 · bcd8010 · bcd8010
1 parent fbb93d9
commit bcd8010
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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);