From 25a782e3413639337ea5cd667ea420114e04d174 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Tue, 17 Jul 2007 04:03:25 -0700 Subject: [PATCH] --- yaml --- r: 60739 b: refs/heads/master c: dfce8648d64c07eade40d456d59cb4bfcbba008c h: refs/heads/master i: 60737: 3fc8425c09e2c674831e71676a52f8404e799ac1 60735: ed90eb4721428149b1d564d58b39c8c25ec88211 v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f1678e00688..f94dd3097774 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e443fd003d76394a8ceb78f079260478aa10710 +refs/heads/master: dfce8648d64c07eade40d456d59cb4bfcbba008c diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 2b50b97a0fc3..f93adb915c00 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2301,8 +2301,15 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags) text = kasprintf(flags & ~SLUB_DMA, "kmalloc_dma-%d", (unsigned int)realsize); s = create_kmalloc_cache(x, text, realsize, flags); - kmalloc_caches_dma[index] = s; - return s; + down_write(&slub_lock); + if (!kmalloc_caches_dma[index]) { + kmalloc_caches_dma[index] = s; + up_write(&slub_lock); + return s; + } + up_write(&slub_lock); + kmem_cache_destroy(s); + return kmalloc_caches_dma[index]; } #endif