From cd1a6efda23047337ee25318979e77d1e2b69371 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 10 Jun 2008 12:34:45 +0200
Subject: [PATCH] --- yaml --- r: 99091 b: refs/heads/master c:
 781711a93e8aae756e8ae07acef185a6dfe552b8 h: refs/heads/master i:   99089:
 bbbc9fde40f43b69286ac5614434ec51f4c9c57d   99087:
 d832324bf894eb2bb1e38925d5ea117eda5d6eaf v: v3

---
 [refs]                           | 2 +-
 trunk/sound/pci/emu10k1/memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1a6cbf62258..e8b91213d8d3 100644
--- 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
index 128eaca17a61..42943b4fcb7b 100644
--- 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) {