diff options
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/emu10k1/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 128eaca17a61..42943b4fcb7b 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c | |||
| @@ -466,7 +466,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk | |||
| 466 | __GFP_NOWARN); | 466 | __GFP_NOWARN); |
| 467 | if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) | 467 | if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) |
| 468 | /* try to allocate from <16MB zone */ | 468 | /* try to allocate from <16MB zone */ |
| 469 | p = alloc_page(GFP_DMA | | 469 | p = alloc_page(GFP_ATOMIC | GFP_DMA | |
| 470 | __GFP_NORETRY | /* no OOM-killer */ | 470 | __GFP_NORETRY | /* no OOM-killer */ |
| 471 | __GFP_NOWARN); | 471 | __GFP_NOWARN); |
| 472 | if (!p) { | 472 | if (!p) { |