Merge branch 'iommu/page-sizes' into x86/amd

Conflicts:
	drivers/iommu/amd_iommu.c

diff --cc drivers/iommu/amd_iommu.c
index 2a46b1d7a60193b222d0810d6f509c58d4b76a07,341573821864e48b0715a02d7712a0dbcbc84d91..a7cbcd46af9e89991f6319cff170f3798b74b251
--- 1/drivers/iommu/amd_iommu.c
--- 2/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@@ -3115,17 -2738,12 +3132,15 @@@ static int amd_iommu_map(struct iommu_d
        return ret;
  }
  
- static int amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,
-                          int gfp_order)
+ static size_t amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,
+                          size_t page_size)
  {
        struct protection_domain *domain = dom->priv;
-       unsigned long page_size, unmap_size;
+       size_t unmap_size;
  
-       page_size  = 0x1000UL << gfp_order;
- 
 +      if (domain->mode == PAGE_MODE_NONE)
 +              return -EINVAL;
 +
        mutex_lock(&domain->api_lock);
        unmap_size = iommu_unmap_page(domain, iova, page_size);
        mutex_unlock(&domain->api_lock);

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/omap-iovmm.c
Simple merge