Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197880
b: refs/heads/master
c: 8bdd77d
h: refs/heads/master
v: v3
  • Loading branch information
Nadav Amit authored and David Woodhouse committed Apr 9, 2010
1 parent 6e9eb17 commit 3f4d3b3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a45946abb8991e17c39326854ed1314d20742ca6
refs/heads/master: 8bdd77dd4ef99292f3d705c4c389c12f55641133
3 changes: 1 addition & 2 deletions trunk/drivers/pci/intel-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2860,7 +2860,6 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne
struct dmar_domain *domain;
size_t size = 0;
int prot = 0;
size_t offset_pfn = 0;
struct iova *iova = NULL;
int ret;
struct scatterlist *sg;
Expand Down Expand Up @@ -2914,7 +2913,7 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne

/* it's a non-present to present mapping. Only flush if caching mode */
if (cap_caching_mode(iommu->cap))
iommu_flush_iotlb_psi(iommu, 0, start_vpfn, offset_pfn);
iommu_flush_iotlb_psi(iommu, 0, start_vpfn, size);
else
iommu_flush_write_buffer(iommu);

Expand Down

0 comments on commit 3f4d3b3

Please sign in to comment.