diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-12-04 16:15:56 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-12-04 16:15:56 +0100 |
| commit | f538c50930b7d4fe3991909f6d411994ba6f605c (patch) | |
| tree | 4d818b6d61af15bffc6c60316c7b5d64efb01bde /drivers/iommu/ipmmu-vmsa.c | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 8918465163171322c77a19d5258a95f56d89d2e4 (diff) | |
| download | talos-op-linux-f538c50930b7d4fe3991909f6d411994ba6f605c.tar.gz talos-op-linux-f538c50930b7d4fe3991909f6d411994ba6f605c.zip | |
Merge branch 'for-3.19/iommu' into for-3.19/dt
Diffstat (limited to 'drivers/iommu/ipmmu-vmsa.c')
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 7dab5cbcc775..e509c58eee92 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -1127,6 +1127,7 @@ static const struct iommu_ops ipmmu_ops = { .detach_dev = ipmmu_detach_device, .map = ipmmu_map, .unmap = ipmmu_unmap, + .map_sg = default_iommu_map_sg, .iova_to_phys = ipmmu_iova_to_phys, .add_device = ipmmu_add_device, .remove_device = ipmmu_remove_device, |
