These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / kernel / pci-swiotlb.c

diff --git a/kernel/arch/x86/kernel/pci-swiotlb.c b/kernel/arch/x86/kernel/pci-swiotlb.c
index 77dd0ad..adf0392 100644 (file)
--- a/kernel/arch/x86/kernel/pci-swiotlb.c
+++ b/kernel/arch/x86/kernel/pci-swiotlb.c
@@ -20,6 +20,13 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 {
        void *vaddr;
 
+       /*
+        * Don't print a warning when the first allocation attempt fails.
+        * swiotlb_alloc_coherent() will print a warning when the DMA
+        * memory allocation ultimately failed.
+        */
+       flags |= __GFP_NOWARN;
+
        vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags,
                                           attrs);
        if (vaddr)