Merge tag 'v4.3-rc1' into perf/core, to refresh the tree

[firefly-linux-kernel-4.4.55.git] / arch / x86 / xen / pci-swiotlb-xen.c

diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
index 969570491c3964d0023dc82a231ff683ee88f735..0e98e5d241d04847c7a9a54c242b7a232ebae148 100644 (file)
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -75,8 +75,10 @@ void __init pci_xen_swiotlb_init(void)
                xen_swiotlb_init(1, true /* early */);
                dma_ops = &xen_swiotlb_dma_ops;
 
+#ifdef CONFIG_PCI
                /* Make sure ACS will be enabled */
                pci_request_acs();
+#endif
        }
 }
 
@@ -92,8 +94,10 @@ int pci_xen_swiotlb_init_late(void)
                return rc;
 
        dma_ops = &xen_swiotlb_dma_ops;
+#ifdef CONFIG_PCI
        /* Make sure ACS will be enabled */
        pci_request_acs();
+#endif
 
        return 0;
 }