diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-05-11 00:43:19 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-22 14:19:12 -0400 |
commit | eb5400b6131e6ebaacf809357643a22a72d5cc4c (patch) | |
tree | 5b95658962e3a30fbfdc052647ac55bb04fc03c1 /arch | |
parent | be1577e3787536290cc17afaeb2cd58bbcc7ed6c (diff) |
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 <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 49b2ff2c8b74..627e04b5ba9a 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, | |||
256 | plast->next = pslot->next; | 256 | plast->next = pslot->next; |
257 | pavail = pslot; | 257 | pavail = pslot; |
258 | } else { | 258 | } else { |
259 | pavail = kmem_cache_alloc(sram_piece_cache, GFP_KERNEL); | 259 | /* use atomic so our L1 allocator can be used atomically */ |
260 | pavail = kmem_cache_alloc(sram_piece_cache, GFP_ATOMIC); | ||
260 | 261 | ||
261 | if (!pavail) | 262 | if (!pavail) |
262 | return NULL; | 263 | return NULL; |