diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
| commit | 86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch) | |
| tree | b4475d3ccde53015ad84a06e4e55e64591171b75 /arch/x86_64/kernel/pci-dma.c | |
| parent | 7ea9ea832212c4a755650f7c7cc1ff0b63292a41 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/x86_64/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86_64/kernel/pci-dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c index 4ed391edd47a..03c9eeedb0f3 100644 --- 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, | |||
| 73 | if (dma_mask == 0) | 73 | if (dma_mask == 0) |
| 74 | dma_mask = 0xffffffff; | 74 | dma_mask = 0xffffffff; |
| 75 | 75 | ||
| 76 | /* Don't invoke OOM killer */ | ||
| 77 | gfp |= __GFP_NORETRY; | ||
| 78 | |||
| 76 | /* Kludge to make it bug-to-bug compatible with i386. i386 | 79 | /* Kludge to make it bug-to-bug compatible with i386. i386 |
| 77 | uses the normal dma_mask for alloc_coherent. */ | 80 | uses the normal dma_mask for alloc_coherent. */ |
| 78 | dma_mask &= *dev->dma_mask; | 81 | dma_mask &= *dev->dma_mask; |