Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index c78742defdc6477ef7474ebc1fc8117173aaabfc..837ebd64cc346875c9f84f2d87ac4b149c137755 100644 (file)
--- 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);
@@ -690,3 +692,8 @@ void __init kmem_cache_init(void)
 {
        slob_ready = 1;
 }
+
+void __init kmem_cache_init_late(void)
+{
+       /* Nothing to do */
+}