leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'slab/urgent' into for-linus

Browse Source
This commit is contained in:
Pekka Enberg 2009-07-06 10:51:54 +03:00
commit 67fc25ef34
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/slab.c
View File

@ -1544,9 +1544,6 @@ void __init kmem_cache_init(void)
} }
g_cpucache_up = EARLY; g_cpucache_up = EARLY;
/* Annotate slab for lockdep -- annotate the malloc caches */
init_lock_keys();
} }
void __init kmem_cache_init_late(void) void __init kmem_cache_init_late(void)
@ -1563,6 +1560,9 @@ void __init kmem_cache_init_late(void)
/* Done! */ /* Done! */
g_cpucache_up = FULL; g_cpucache_up = FULL;
/* Annotate slab for lockdep -- annotate the malloc caches */
init_lock_keys();
/* /*
* Register a cpu startup notifier callback that initializes * Register a cpu startup notifier callback that initializes
* cpu_cache_get for all new cpus * cpu_cache_get for all new cpus
@ -2547,7 +2547,7 @@ void kmem_cache_destroy(struct kmem_cache *cachep)
} }
if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU))
synchronize_rcu(); rcu_barrier();
__kmem_cache_destroy(cachep); __kmem_cache_destroy(cachep);
mutex_unlock(&cache_chain_mutex); mutex_unlock(&cache_chain_mutex);

2
mm/slob.c
View File

@ -595,6 +595,8 @@ EXPORT_SYMBOL(kmem_cache_create);
void kmem_cache_destroy(struct kmem_cache *c) void kmem_cache_destroy(struct kmem_cache *c)
{ {
kmemleak_free(c); kmemleak_free(c);
if (c->flags & SLAB_DESTROY_BY_RCU)
rcu_barrier();
slob_free(c, sizeof(struct kmem_cache)); slob_free(c, sizeof(struct kmem_cache));
} }
EXPORT_SYMBOL(kmem_cache_destroy); EXPORT_SYMBOL(kmem_cache_destroy);

2
mm/slub.c
View File

@ -2595,6 +2595,8 @@ static inline int kmem_cache_close(struct kmem_cache *s)
*/ */
void kmem_cache_destroy(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); down_write(&slub_lock);
s->refcount--; s->refcount--;
if (!s->refcount) { if (!s->refcount) {