diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:26:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:26:14 -0700 |
| commit | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (patch) | |
| tree | 7db5a11d1d57a56fc330b8313680bbbe4eb3a564 /mm | |
| parent | b312bf359e20cc39c00d480fd40a24c245d80bf7 (diff) | |
| parent | e79aec291da55aa322ddb5d8f3bb04cdf69470d5 (diff) | |
| download | linux-3.10-b9d2252c1e44fa83a4e65fdc9eb93db6297c55af.tar.gz linux-3.10-b9d2252c1e44fa83a4e65fdc9eb93db6297c55af.tar.bz2 linux-3.10-b9d2252c1e44fa83a4e65fdc9eb93db6297c55af.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: rename slab_destroy_objs
slub: current is always valid
slub: Add check for kfree() of non slab objects.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 14 | ||||
| -rw-r--r-- | mm/slub.c | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/mm/slab.c b/mm/slab.c index 046607f05f3..b4aa4c88250 100644 --- a/mm/slab.c +++ b/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; diff --git a/mm/slub.c b/mm/slub.c index 5f6e2c4a2ba..488400d1070 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -411,7 +411,7 @@ static void set_track(struct kmem_cache *s, void *object, if (addr) { p->addr = addr; p->cpu = smp_processor_id(); - p->pid = current ? current->pid : -1; + p->pid = current->pid; p->when = jiffies; } else memset(p, 0, sizeof(struct track)); @@ -2766,6 +2766,7 @@ void kfree(const void *x) page = virt_to_head_page(x); if (unlikely(!PageSlab(page))) { + BUG_ON(!PageCompound(page)); put_page(page); return; } |