Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[~andy/linux] / arch / blackfin / mm / sram-alloc.c

diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index 49b2ff2c8b74bee191df47682bcbae227b5beac6..627e04b5ba9a8979be2149ecff27e52f6bb05458 100644 (file)
--- 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;