From d985f5e818496546e3095b3a505141ccbc99c7d3 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed, 22 Mar 2006 00:08:14 -0800
Subject: [PATCH] --- yaml --- r: 22455 b: refs/heads/master c:
 911851e6ee6ac4e26f07be342a89632f78494fef h: refs/heads/master i:   22453:
 2858c3369ae91bea0bd77e927a66347e8bb857d1   22451:
 094e410d7a26761a1099eedf8d2915069dcbec83   22447:
 320bde9a0c9cff6652f6a0182084cd735abb8f31 v: v3

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

diff --git a/[refs] b/[refs]
index 8302e922d76f..4f701a95ef4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcc234f888ba2365c44ba0507eb8a18eebf1f594
+refs/heads/master: 911851e6ee6ac4e26f07be342a89632f78494fef
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 2cd80203984b..5c2574989834 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1615,8 +1615,12 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
 
 #if DEBUG
 /**
- * slab_destroy_objs - call the registered destructor for each object in
- *      a slab that is to be destroyed.
+ * 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)
 {
@@ -1661,7 +1665,11 @@ static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
 }
 #endif
 
-/*
+/**
+ * slab_destroy - destroy and release all objects in a slab
+ * @cachep: cache pointer being destroyed
+ * @slabp: slab pointer being destroyed
+ *
  * Destroy all the objs in a slab, and release the mem back to the system.
  * Before calling the slab must have been unlinked from the cache.  The
  * cache-lock is not held/needed.
@@ -3170,6 +3178,7 @@ EXPORT_SYMBOL(kmalloc_node);
  * kmalloc - allocate memory
  * @size: how many bytes of memory are required.
  * @flags: the type of memory to allocate.
+ * @caller: function caller for debug tracking of the caller
  *
  * kmalloc is the normal method of allocating memory
  * in the kernel.