diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-07-06 11:51:54 +0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-07-06 11:51:54 +0400 |
| commit | 67fc25ef34a27dc43ce6dfc98a8b249db304d641 (patch) | |
| tree | cd1b88e99c315526379cf918e56aceb266143192 /mm | |
| parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
| parent | ec5a36f94e7ca4b1f28ae4dd135cd415a704e772 (diff) | |
| download | linux-67fc25ef34a27dc43ce6dfc98a8b249db304d641.tar.xz | |
Merge branch 'slab/urgent' into for-linus
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 8 | ||||
| -rw-r--r-- | mm/slob.c | 2 | ||||
| -rw-r--r-- | mm/slub.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c index e74a16e4ced6..7b5d4deacfcd 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -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); diff --git a/mm/slob.c b/mm/slob.c index c78742defdc6..9641da3d5e58 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -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); diff --git a/mm/slub.c b/mm/slub.c index 819f056b39c6..a9201d83178b 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -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) { |