---

yaml --- r: 99091 b: refs/heads/master c: 781711a h: refs/heads/master i: 99089: bbbc9fd 99087: d832324 v: v3
git-mirror · Jun 13, 2008 · cd1a6ef · cd1a6ef
1 parent 52b8c2c
commit cd1a6ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36ca6e133ae3a57318a3ad8a41b2f005e3934c29
+refs/heads/master: 781711a93e8aae756e8ae07acef185a6dfe552b8
diff --git a/trunk/sound/pci/emu10k1/memory.c b/trunk/sound/pci/emu10k1/memory.c
@@ -466,7 +466,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk
 					    __GFP_NOWARN);
 		if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT)))
 			/* try to allocate from <16MB zone */
-			p = alloc_page(GFP_DMA |
+			p = alloc_page(GFP_ATOMIC | GFP_DMA |
 				       __GFP_NORETRY | /* no OOM-killer */
 				       __GFP_NOWARN);
 		if (!p) {