diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-07-07 04:55:05 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-07 04:55:05 +0200 |
commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /mm/slob.c | |
parent | video: hitfb: Move over to dev_pm_ops. (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
download | linux-2b5c0c72ea404d6b554a8284031dd78748314b9e.tar.xz linux-2b5c0c72ea404d6b554a8284031dd78748314b9e.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'mm/slob.c')
-rw-r--r-- | mm/slob.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |