diff options
| author | Joerg Roedel | 2017-01-30 16:05:18 +0100 |
|---|---|---|
| committer | Joerg Roedel | 2017-01-30 16:05:18 +0100 |
| commit | ce273db0ff1ae64fea785af25a43977b0b6a4555 (patch) | |
| tree | 1a5d03cb1e5c0d63f298691a980b3e248654619f /include/linux/dma-iommu.h | |
| parent | Merge branch 'iommu/guest-msi' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Revert "iommu/arm-smmu: Set PRIVCFG in stage 1 STEs" (diff) | |
| download | kernel-qcow2-linux-ce273db0ff1ae64fea785af25a43977b0b6a4555.tar.gz kernel-qcow2-linux-ce273db0ff1ae64fea785af25a43977b0b6a4555.tar.xz kernel-qcow2-linux-ce273db0ff1ae64fea785af25a43977b0b6a4555.zip | |
Merge branch 'iommu/iommu-priv' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/core
Diffstat (limited to 'include/linux/dma-iommu.h')
| -rw-r--r-- | include/linux/dma-iommu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 28df844a23b6..3a846f9ec0fd 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -35,7 +35,8 @@ int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, u64 size, struct device *dev); /* General helpers for DMA-API <-> IOMMU-API interaction */ -int dma_direction_to_prot(enum dma_data_direction dir, bool coherent); +int dma_info_to_prot(enum dma_data_direction dir, bool coherent, + unsigned long attrs); /* * These implement the bulk of the relevant DMA mapping callbacks, but require |