---

yaml --- r: 330414 b: refs/heads/master c: b920536 h: refs/heads/master v: v3
git-mirror · Aug 16, 2012 · 88cd36e · 88cd36e
1 parent 0b28faa
commit 88cd36e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e24fc410f58cc7851188a6e996dc6ce5c4259eb4
+refs/heads/master: b920536aa0a4fd178b2957774adfe409027fe55b
diff --git a/trunk/mm/slab_common.c b/trunk/mm/slab_common.c
@@ -53,17 +53,19 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
 {
 	struct kmem_cache *s = NULL;
 
-	get_online_cpus();
-	mutex_lock(&slab_mutex);
-
 #ifdef CONFIG_DEBUG_VM
 	if (!name || in_interrupt() || size < sizeof(void *) ||
 		size > KMALLOC_MAX_SIZE) {
 		printk(KERN_ERR "kmem_cache_create(%s) integrity check"
-				" failed\n", name);
-		goto oops;
+			" failed\n", name);
+		goto out;
 	}
+#endif
+
+	get_online_cpus();
+	mutex_lock(&slab_mutex);
 
+#ifdef CONFIG_DEBUG_VM
 	list_for_each_entry(s, &slab_caches, list) {
 		char tmp;
 		int res;
@@ -102,6 +104,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
 	mutex_unlock(&slab_mutex);
 	put_online_cpus();
 
+#ifdef CONFIG_DEBUG_VM
+out:
+#endif
 	if (!s && (flags & SLAB_PANIC))
 		panic("kmem_cache_create: Failed to create slab '%s'\n", name);