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
This commit is contained in:
commit
09784fb8ef
@ -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)
|
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 &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
|
||||||
|
*gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp);
|
||||||
|
|
||||||
if (!*dev)
|
if (!*dev)
|
||||||
*dev = &x86_dma_fallback_dev;
|
*dev = &x86_dma_fallback_dev;
|
||||||
|
Loading…
Reference in New Issue
Block a user