|
@@ -466,7 +466,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk
|
|
__GFP_NOWARN);
|
|
__GFP_NOWARN);
|
|
if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT)))
|
|
if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT)))
|
|
/* try to allocate from <16MB zone */
|
|
/* try to allocate from <16MB zone */
|
|
- p = alloc_page(GFP_DMA |
|
|
|
|
|
|
+ p = alloc_page(GFP_ATOMIC | GFP_DMA |
|
|
__GFP_NORETRY | /* no OOM-killer */
|
|
__GFP_NORETRY | /* no OOM-killer */
|
|
__GFP_NOWARN);
|
|
__GFP_NOWARN);
|
|
if (!p) {
|
|
if (!p) {
|