diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 17:06:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 17:06:28 +0200 |
| commit | 09784fb8ef79f5c5adb9c1b4d0df000354e476e7 (patch) | |
| tree | 329f69c311fa1d1da20052ce0920bb680d1ef5ae | |
| parent | Merge tag 'powerpc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | x86/pci/dma: Fix gfp flags for coherent DMA memory allocation (diff) | |
| download | linux-09784fb8ef79f5c5adb9c1b4d0df000354e476e7.tar.xz linux-09784fb8ef79f5c5adb9c1b4d0df000354e476e7.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single regression fix for the x86 dma allocator which got wreckaged
in the merge window"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pci/dma: Fix gfp flags for coherent DMA memory allocation
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 84b8ef82a159..1b55de1267cf 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -131,8 +131,8 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp) { - *gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp); *gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + *gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp); if (!*dev) *dev = &x86_dma_fallback_dev; |