From e7ff0b62bb843b38f41265508766e7077c8bb3da Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Tue, 11 Sep 2012 19:49:38 +0000
Subject: [PATCH] --- yaml --- r: 330447 b: refs/heads/master c:
 f28510d30c7f03daa290019fbc57ad8277347614 h: refs/heads/master i:   330445:
 3a8526fc99bf97c59eea9d9cddae865a06084452   330443:
 af6bae80446e1520b24dea518a65045706b2df68   330439:
 14d75e7ae8093e588db1300ea7fb082991bed1f2   330431:
 f966565667d267685af6e66544ae827551401d45 v: v3

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

diff --git a/[refs] b/[refs]
index ddb4f96d475e..d959e027fed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9df53b154ac712c87db1170057aa6df05eb7bdbd
+refs/heads/master: f28510d30c7f03daa290019fbc57ad8277347614
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 11d9af5f9d2e..8524923966b5 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -803,6 +803,7 @@ static void cache_estimate(unsigned long gfporder, size_t buffer_size,
 	*left_over = slab_size - nr_objs*buffer_size - mgmt_size;
 }
 
+#if DEBUG
 #define slab_error(cachep, msg) __slab_error(__func__, cachep, msg)
 
 static void __slab_error(const char *function, struct kmem_cache *cachep,
@@ -812,6 +813,7 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
 	       function, cachep->name, msg);
 	dump_stack();
 }
+#endif
 
 /*
  * By default on NUMA we use alien caches to stage the freeing of