From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 14 Dec 2011 11:41:31 +0000 (+0100)
Subject: Merge branch 'iommu/page-sizes' into x86/amd
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00;p=~shefty%2Frdma-dev.git

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

Conflicts:
	drivers/iommu/amd_iommu.c
---

a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00
diff --cc drivers/iommu/amd_iommu.c
index 2a46b1d7a60,34157382186..a7cbcd46af9
--- a/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;
  
 +	if (domain->mode == PAGE_MODE_NONE)
 +		return -EINVAL;
 +
- 	page_size  = 0x1000UL << gfp_order;
- 
  	mutex_lock(&domain->api_lock);
  	unmap_size = iommu_unmap_page(domain, iova, page_size);
  	mutex_unlock(&domain->api_lock);