Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22455
b: refs/heads/master
c: 911851e
h: refs/heads/master
i:
  22453: 2858c33
  22451: 094e410
  22447: 320bde9
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Mar 22, 2006
1 parent 9b65a13 commit d985f5e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fcc234f888ba2365c44ba0507eb8a18eebf1f594
refs/heads/master: 911851e6ee6ac4e26f07be342a89632f78494fef
15 changes: 12 additions & 3 deletions trunk/mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit d985f5e

Please sign in to comment.