diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-13 17:02:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-13 17:02:39 -0800 |
| commit | b4e3d9c9f2b940c91e992f58939d0582133e1677 (patch) | |
| tree | b22a5d7327f8703e62b3e372960df7dcfafd75f3 /include/linux | |
| parent | 28b82ee8764c3607ab051d93b6678f95a0a57136 (diff) | |
| parent | 5ade64f1b176fb3ec68d778e69b2b8182717c630 (diff) | |
Merge "iommu/io-pgtable: Allow page table coherency to be set"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-mapping-fast.h | 2 | ||||
| -rw-r--r-- | include/linux/iommu.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dma-mapping-fast.h b/include/linux/dma-mapping-fast.h index ddd126c0fd85..560f04736c1d 100644 --- a/include/linux/dma-mapping-fast.h +++ b/include/linux/dma-mapping-fast.h @@ -36,6 +36,8 @@ struct dma_fast_smmu_mapping { spinlock_t lock; struct notifier_block notifier; + + int is_smmu_pt_coherent; }; #ifdef CONFIG_IOMMU_IO_PGTABLE_FAST diff --git a/include/linux/iommu.h b/include/linux/iommu.h index d7db6b2eeb52..005e83752c68 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -134,6 +134,7 @@ enum iommu_attr { DOMAIN_ATTR_FAST, DOMAIN_ATTR_PGTBL_INFO, DOMAIN_ATTR_EARLY_MAP, + DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT, DOMAIN_ATTR_MAX, }; |