diff options
| author | Joerg Roedel <joro@8bytes.org> | 2013-12-30 08:15:27 -0500 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2013-12-30 08:15:27 -0500 |
| commit | e2c22d9599ec9872894856405c0b62d04da5fd9b (patch) | |
| tree | a46d6dce1ce9ac9563e367d2052174c3329aadfb /include/linux | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
| parent | cf2d45b19ddb361241f36d8c9f3d0b234a18459b (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')
| -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 @@ | |||
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <trace/events/iommu.h> | 25 | #include <trace/events/iommu.h> |
| 26 | 26 | ||
| 27 | #define IOMMU_READ (1) | 27 | #define IOMMU_READ (1 << 0) |
| 28 | #define IOMMU_WRITE (2) | 28 | #define IOMMU_WRITE (1 << 1) |
| 29 | #define IOMMU_CACHE (4) /* DMA cache coherency */ | 29 | #define IOMMU_CACHE (1 << 2) /* DMA cache coherency */ |
| 30 | #define IOMMU_EXEC (1 << 3) | ||
| 30 | 31 | ||
| 31 | struct iommu_ops; | 32 | struct iommu_ops; |
| 32 | struct iommu_group; | 33 | struct iommu_group; |
