projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
pci-dma.c
diff --git
a/arch/x86_64/kernel/pci-dma.c
b/arch/x86_64/kernel/pci-dma.c
index
4ed391e
..
03c9eee
100644
(file)
--- a/
arch/x86_64/kernel/pci-dma.c
+++ b/
arch/x86_64/kernel/pci-dma.c
@@
-73,6
+73,9
@@
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
if (dma_mask == 0)
dma_mask = 0xffffffff;
+ /* Don't invoke OOM killer */
+ gfp |= __GFP_NORETRY;
+
/* Kludge to make it bug-to-bug compatible with i386. i386
uses the normal dma_mask for alloc_coherent. */
dma_mask &= *dev->dma_mask;