From 23550f9cb4455832a81502224b3c832f9100432c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 14 Aug 2012 14:53:22 -0700
Subject: [PATCH] --- yaml --- r: 330411 b: refs/heads/master c:
 455ce9eb1cfa083da0def023094190aeb133855a h: refs/heads/master i:   330409:
 71bbc147608790dc35bbeb76ff93ba3ed9074082   330407:
 667ae56126f968d111227b4db0da0db00fa1e089 v: v3

---
 [refs]                 |  2 +-
 trunk/mm/slab_common.c | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 91fb2ed9eccf..8e34c2185c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48f2474144ac708f1faad97e82a863ca8214b602
+refs/heads/master: 455ce9eb1cfa083da0def023094190aeb133855a
diff --git a/trunk/mm/slab_common.c b/trunk/mm/slab_common.c
index aa3ca5bb01b5..281600b30100 100644
--- a/trunk/mm/slab_common.c
+++ b/trunk/mm/slab_common.c
@@ -53,19 +53,17 @@ 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 out;
+				" failed\n", name);
+		goto oops;
 	}
-#endif
-
-	get_online_cpus();
-	mutex_lock(&slab_mutex);
 
-#ifdef CONFIG_DEBUG_VM
 	list_for_each_entry(s, &slab_caches, list) {
 		char tmp;
 		int res;
@@ -104,9 +102,6 @@ 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);