Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.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 2247100..bfd0632 100644 (file)
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -1,6 +1,7 @@
 /* Glue code to lib/swiotlb-xen.c */
 
 #include <linux/dma-mapping.h>
+#include <linux/pci.h>
 #include <xen/swiotlb-xen.h>
 
 #include <asm/xen/hypervisor.h>
@@ -55,6 +56,9 @@ void __init pci_xen_swiotlb_init(void)
        if (xen_swiotlb) {
                xen_swiotlb_init(1);
                dma_ops = &xen_swiotlb_dma_ops;
+
+               /* Make sure ACS will be enabled */
+               pci_request_acs();
        }
 }
 IOMMU_INIT_FINISH(pci_xen_swiotlb_detect,