diff options
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 99bf651234a6..fe6830af6cfa 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
| @@ -1986,7 +1986,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, | |||
| 1986 | { | 1986 | { |
| 1987 | struct dma_pte *first_pte = NULL, *pte = NULL; | 1987 | struct dma_pte *first_pte = NULL, *pte = NULL; |
| 1988 | phys_addr_t uninitialized_var(pteval); | 1988 | phys_addr_t uninitialized_var(pteval); |
| 1989 | unsigned long sg_res; | 1989 | unsigned long sg_res = 0; |
| 1990 | unsigned int largepage_lvl = 0; | 1990 | unsigned int largepage_lvl = 0; |
| 1991 | unsigned long lvl_pages = 0; | 1991 | unsigned long lvl_pages = 0; |
| 1992 | 1992 | ||
| @@ -1997,10 +1997,8 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, | |||
| 1997 | 1997 | ||
| 1998 | prot &= DMA_PTE_READ | DMA_PTE_WRITE | DMA_PTE_SNP; | 1998 | prot &= DMA_PTE_READ | DMA_PTE_WRITE | DMA_PTE_SNP; |
| 1999 | 1999 | ||
| 2000 | if (sg) | 2000 | if (!sg) { |
| 2001 | sg_res = 0; | 2001 | sg_res = nr_pages; |
| 2002 | else { | ||
| 2003 | sg_res = nr_pages + 1; | ||
| 2004 | pteval = ((phys_addr_t)phys_pfn << VTD_PAGE_SHIFT) | prot; | 2002 | pteval = ((phys_addr_t)phys_pfn << VTD_PAGE_SHIFT) | prot; |
| 2005 | } | 2003 | } |
| 2006 | 2004 | ||
