From d84a1368a7fc65d9294f5c5b33d12d84225a878c Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Fri, 4 Jul 2008 00:40:32 +0530
Subject: [PATCH] --- yaml --- r: 101341 b: refs/heads/master c:
 e79aec291da55aa322ddb5d8f3bb04cdf69470d5 h: refs/heads/master i:   101339:
 0fe132f9f1e1a870e4899114ccf318fc0f5362af v: v3

---
 [refs]          |  2 +-
 trunk/mm/slab.c | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 34e03e88874d..fe2ca202eeb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88e4ccf294ca62c2da998012a83533ce150c8dce
+refs/heads/master: e79aec291da55aa322ddb5d8f3bb04cdf69470d5
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 046607f05f3e..b4aa4c88250e 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1901,15 +1901,7 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
 #endif
 
 #if DEBUG
-/**
- * slab_destroy_objs - destroy a slab and its objects
- * @cachep: cache pointer being destroyed
- * @slabp: slab pointer being destroyed
- *
- * Call the registered destructor for each object in a slab that is being
- * destroyed.
- */
-static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
+static void slab_destroy_debugcheck(struct kmem_cache *cachep, struct slab *slabp)
 {
 	int i;
 	for (i = 0; i < cachep->num; i++) {
@@ -1938,7 +1930,7 @@ static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
 	}
 }
 #else
-static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
+static void slab_destroy_debugcheck(struct kmem_cache *cachep, struct slab *slabp)
 {
 }
 #endif
@@ -1956,7 +1948,7 @@ static void slab_destroy(struct kmem_cache *cachep, struct slab *slabp)
 {
 	void *addr = slabp->s_mem - slabp->colouroff;
 
-	slab_destroy_objs(cachep, slabp);
+	slab_destroy_debugcheck(cachep, slabp);
 	if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) {
 		struct slab_rcu *slab_rcu;