Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9d2252c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents b312bf35 e79aec29

mm/slab.c

+3 −11
Original line number Diff line number Diff line
@@ -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;

mm/slub.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}