diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-07-06 10:51:54 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-07-06 10:51:54 +0300 |
| commit | 67fc25ef34a27dc43ce6dfc98a8b249db304d641 (patch) | |
| tree | cd1b88e99c315526379cf918e56aceb266143192 /mm/slub.c | |
| parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
| parent | ec5a36f94e7ca4b1f28ae4dd135cd415a704e772 (diff) | |
| download | linux-67fc25ef34a27dc43ce6dfc98a8b249db304d641.tar.gz linux-67fc25ef34a27dc43ce6dfc98a8b249db304d641.tar.bz2 linux-67fc25ef34a27dc43ce6dfc98a8b249db304d641.zip | |
Merge branch 'slab/urgent' into for-linus
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |