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

[karo-tx-linux.git] / arch / mips / mm / dma-default.c

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 1cb84472cb582977db32ac4b9a8341853366a495..fe8df14b616984a702416dcdb442e5a2c2f3761d 100644 (file)
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -148,8 +148,8 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
        gfp = massage_gfp_flags(dev, gfp);
 
        if (IS_ENABLED(CONFIG_DMA_CMA) && gfpflags_allow_blocking(gfp))
-               page = dma_alloc_from_contiguous(dev,
-                                       count, get_order(size));
+               page = dma_alloc_from_contiguous(dev, count, get_order(size),
+                                                gfp);
        if (!page)
                page = alloc_pages(gfp, get_order(size));