1 files changed, 8 insertions, 3 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index f7d0672481fd..a25e202bb319 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -97,12 +97,17 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
 
         dma_mask = dma_alloc_coherent_mask(dev, flag);
 
-        flag |= __GFP_ZERO;
+        flag &= ~__GFP_ZERO;
 again:
         page = NULL;
         /* CMA can be used only in the context which permits sleeping */
-        if (flag & __GFP_WAIT)
+        if (flag & __GFP_WAIT) {
                 page = dma_alloc_from_contiguous(dev, count, get_order(size));
+                if (page && page_to_phys(page) + size > dma_mask) {
+                        dma_release_from_contiguous(dev, page, count);
+                        page = NULL;
+                }
+        }
         /* fallback */
         if (!page)
                 page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));
@@ -120,7 +125,7 @@ again:
 
                 return NULL;
         }
-
+        memset(page_address(page), 0, size);
         *dma_addr = addr;
         return page_address(page);
 }