Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfor...

[karo-tx-linux.git] / arch / xtensa / kernel / pci-dma.c

diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index ecec5265a66d603468809ad04c55f6baaa73786a..cec86a1c2acce6845238da7ef1994e1e1ef1a6f0 100644 (file)
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -158,7 +158,8 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size,
                flag |= GFP_DMA;
 
        if (gfpflags_allow_blocking(flag))
-               page = dma_alloc_from_contiguous(dev, count, get_order(size));
+               page = dma_alloc_from_contiguous(dev, count, get_order(size),
+                                                flag);
 
        if (!page)
                page = alloc_pages(flag, get_order(size));