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

Commit 9861df15 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: Fix lockdep annotations
  fix RCU-callback-after-kmem_cache_destroy problem in sl[aou]b
parents 8871b201 67fc25ef

mm/slab.c

+4 −4
Original line number Diff line number Diff line
@@ -1544,9 +1544,6 @@ void __init kmem_cache_init(void) 
	}



	g_cpucache_up = EARLY;



	/* Annotate slab for lockdep -- annotate the malloc caches */

	init_lock_keys();

}



void __init kmem_cache_init_late(void)
@@ -1563,6 +1560,9 @@ void __init kmem_cache_init_late(void) 
	/* Done! */

	g_cpucache_up = FULL;



	/* Annotate slab for lockdep -- annotate the malloc caches */

	init_lock_keys();



	/*

	 * Register a cpu startup notifier callback that initializes

	 * cpu_cache_get for all new cpus
@@ -2547,7 +2547,7 @@ void kmem_cache_destroy(struct kmem_cache *cachep) 
	}



	if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU))

		synchronize_rcu();

		rcu_barrier();



	__kmem_cache_destroy(cachep);

	mutex_unlock(&cache_chain_mutex);

mm/slob.c

+2 −0
Original line number Diff line number Diff line
@@ -595,6 +595,8 @@ EXPORT_SYMBOL(kmem_cache_create); 
void kmem_cache_destroy(struct kmem_cache *c)

{

	kmemleak_free(c);

	if (c->flags & SLAB_DESTROY_BY_RCU)

		rcu_barrier();

	slob_free(c, sizeof(struct kmem_cache));

}

EXPORT_SYMBOL(kmem_cache_destroy);

mm/slub.c

+2 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,8 @@ static inline int kmem_cache_close(struct kmem_cache *s) 
 */

void kmem_cache_destroy(struct kmem_cache *s)

{

	if (s->flags & SLAB_DESTROY_BY_RCU)

		rcu_barrier();

	down_write(&slub_lock);

	s->refcount--;

	if (!s->refcount) {