From 6699038fdcb597764fc8f548a8a1ca0f80458f1c Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah.khan@hp.com>
Date: Fri, 13 Jul 2012 17:12:05 -0600
Subject: [PATCH] --- yaml --- r: 319580 b: refs/heads/master c:
 73a1180e140d45cb9ef5fbab103d3bbfc4c84606 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/mm/slab_common.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c79cfc9313f2..e0201ec0d80c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44a8bdea19dff1abcdc4528e5f7e038b18ee5255
+refs/heads/master: 73a1180e140d45cb9ef5fbab103d3bbfc4c84606
diff --git a/trunk/mm/slab_common.c b/trunk/mm/slab_common.c
index 12637cee1f95..aa3ca5bb01b5 100644
--- a/trunk/mm/slab_common.c
+++ b/trunk/mm/slab_common.c
@@ -98,7 +98,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
 
 	s = __kmem_cache_create(name, size, align, flags, ctor);
 
+#ifdef CONFIG_DEBUG_VM
 oops:
+#endif
 	mutex_unlock(&slab_mutex);
 	put_online_cpus();