From: Mike Frysinger Date: Tue, 11 May 2010 04:43:19 +0000 (+0000) Subject: Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic X-Git-Tag: v2.6.35-rc1~410^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eb5400b6131e6ebaacf809357643a22a72d5cc4c;p=~shefty%2Frdma-dev.git Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic Some drivers allocate L1 SRAM in atomic contexts, so make sure these functions also use GFP_ATOMIC to avoid BUG()'s. Signed-off-by: Mike Frysinger --- diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 49b2ff2c8b7..627e04b5ba9 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c @@ -256,7 +256,8 @@ static void *_sram_alloc(size_t size, struct sram_piece *pfree_head, plast->next = pslot->next; pavail = pslot; } else { - pavail = kmem_cache_alloc(sram_piece_cache, GFP_KERNEL); + /* use atomic so our L1 allocator can be used atomically */ + pavail = kmem_cache_alloc(sram_piece_cache, GFP_ATOMIC); if (!pavail) return NULL;