diff -r 660cd5afaa97 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c	Tue Jul 22 21:12:44 2008 +0800
+++ b/xen/drivers/passthrough/vtd/iommu.c	Wed Jul 23 10:33:06 2008 +0800
@@ -1523,9 +1523,6 @@ int iommu_page_mapping(struct domain *do
 int iommu_page_mapping(struct domain *domain, paddr_t iova,
                        paddr_t hpa, size_t size, int prot)
 {
-    struct hvm_iommu *hd = domain_hvm_iommu(domain);
-    struct acpi_drhd_unit *drhd;
-    struct iommu *iommu;
     u64 start_pfn, end_pfn;
     struct dma_pte *page = NULL, *pte = NULL;
     int index;
@@ -1553,18 +1550,6 @@ int iommu_page_mapping(struct domain *do
         index++;
     }
 
-    for_each_drhd_unit ( drhd )
-    {
-        iommu = drhd->iommu;
-
-        if ( !test_bit(iommu->index, &hd->iommu_bitmap) )
-            continue;
-
-        if ( iommu_flush_iotlb_psi(iommu, domain_iommu_domid(domain),
-                                   iova, index, 1) )
-            iommu_flush_write_buffer(iommu);
-    }
-
     return 0;
 }
 
@@ -1803,11 +1788,9 @@ int intel_iommu_assign_device(struct dom
 
             ret = iommu_prepare_rmrr_dev(d, rmrr, bus, devfn);
             if ( ret )
-            {
                 gdprintk(XENLOG_ERR VTDPREFIX,
                          "IOMMU: mapping reserved region failed\n");
-                return ret;
-            }
+            return ret;
         }
     }