aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-07-06 03:51:54 -0400
committerPekka Enberg <penberg@cs.helsinki.fi>2009-07-06 03:51:54 -0400
commit67fc25ef34a27dc43ce6dfc98a8b249db304d641 (patch)
treecd1b88e99c315526379cf918e56aceb266143192 /mm/slub.c
parent8e4a718ff38d8539938ec3421935904c27e00c39 (diff)
parentec5a36f94e7ca4b1f28ae4dd135cd415a704e772 (diff)
Merge branch 'slab/urgent' into for-linus
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 819f056b39c..a9201d83178 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2595,6 +2595,8 @@ static inline int kmem_cache_close(struct kmem_cache *s)
2595 */ 2595 */
2596void kmem_cache_destroy(struct kmem_cache *s) 2596void kmem_cache_destroy(struct kmem_cache *s)
2597{ 2597{
2598 if (s->flags & SLAB_DESTROY_BY_RCU)
2599 rcu_barrier();
2598 down_write(&slub_lock); 2600 down_write(&slub_lock);
2599 s->refcount--; 2601 s->refcount--;
2600 if (!s->refcount) { 2602 if (!s->refcount) {