diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-11-21 12:28:28 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-11-21 12:28:28 +0100 |
| commit | 2d565a57f2520b6bc2de0eef1d77d9683f397947 (patch) | |
| tree | 46654119e86a98c36adc93eed9c0bed2e417d0b8 /include/linux/iommu.h | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
| parent | c752ce45b213de8532baaf987ba930638f77c439 (diff) | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'include/linux/iommu.h')
| -rw-r--r-- | include/linux/iommu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e6a7c9ff72f2..e438b30f062b 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -27,7 +27,7 @@ #define IOMMU_READ (1 << 0) #define IOMMU_WRITE (1 << 1) #define IOMMU_CACHE (1 << 2) /* DMA cache coherency */ -#define IOMMU_EXEC (1 << 3) +#define IOMMU_NOEXEC (1 << 3) struct iommu_ops; struct iommu_group; @@ -61,6 +61,7 @@ enum iommu_cap { IOMMU_CAP_CACHE_COHERENCY, /* IOMMU can enforce cache coherent DMA transactions */ IOMMU_CAP_INTR_REMAP, /* IOMMU supports interrupt isolation */ + IOMMU_CAP_NOEXEC, /* IOMMU_NOEXEC flag */ }; /* |