From: Pekka Enberg <penberg@kernel.org>
Date: Thu, 16 Aug 2012 07:12:18 +0000 (+0300)
Subject: Revert "mm/slab_common.c: cleanup"
X-Git-Tag: v3.7-rc1~34^2~3^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b920536aa0a4fd178b2957774adfe409027fe55b;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Revert "mm/slab_common.c: cleanup"

This reverts commit 455ce9eb1cfa083da0def023094190aeb133855a. Andrew
sent a better version.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 281600b..aa3ca5b 100644
--- a/mm/slab_common.c
+++ b/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 @@ oops:
 	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);