Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-1
+1
-1
arch/x86/kernel/pci-dma.c
+1
-1
arch/x86/kernel/pci-dma.c
···
131
131
132
132
bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)
133
133
{
134
-
*gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp);
135
134
*gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
135
+
*gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp);
136
136
137
137
if (!*dev)
138
138
*dev = &x86_dma_fallback_dev;