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

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

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 76f4c039baaee1aabdfd3153e6d7615d5caaf263..3a216ec869cdbafc00ec89ab88fb412b0bb3f462 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -91,7 +91,8 @@ again:
        page = NULL;
        /* CMA can be used only in the context which permits sleeping */
        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_to_phys(page) + size > dma_mask) {
                        dma_release_from_contiguous(dev, page, count);
                        page = NULL;