Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU

+2 -2
+2 -2
mm/slub.c
··· 2594 2594 */ 2595 2595 void kmem_cache_destroy(struct kmem_cache *s) 2596 2596 { 2597 - if (s->flags & SLAB_DESTROY_BY_RCU) 2598 - rcu_barrier(); 2599 2597 down_write(&slub_lock); 2600 2598 s->refcount--; 2601 2599 if (!s->refcount) { ··· 2604 2606 "still has objects.\n", s->name, __func__); 2605 2607 dump_stack(); 2606 2608 } 2609 + if (s->flags & SLAB_DESTROY_BY_RCU) 2610 + rcu_barrier(); 2607 2611 sysfs_slab_remove(s); 2608 2612 } else 2609 2613 up_write(&slub_lock);