diff options
| author |   Joerg Roedel <joro@8bytes.org> | 2013-12-30 14:15:27 +0100 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2013-12-30 14:15:27 +0100 |
| commit | e2c22d9599ec9872894856405c0b62d04da5fd9b (patch) | |
| tree | a46d6dce1ce9ac9563e367d2052174c3329aadfb /include | |
| parent | Linux 3.13-rc6 (diff) | |
| parent | iommu/arm-smmu: add support for IOMMU_EXEC (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')
| -rw-r--r-- | include/linux/iommu.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a444c790fa72..709a697c4e02 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -24,9 +24,10 @@ #include <linux/types.h> #include <trace/events/iommu.h> -#define IOMMU_READ (1) -#define IOMMU_WRITE (2) -#define IOMMU_CACHE (4) /* DMA cache coherency */ +#define IOMMU_READ (1 << 0) +#define IOMMU_WRITE (1 << 1) +#define IOMMU_CACHE (1 << 2) /* DMA cache coherency */ +#define IOMMU_EXEC (1 << 3) struct iommu_ops; struct iommu_group; |