summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAntonios Motakis <a.motakis@virtualopensystems.com>2014-10-13 14:06:16 +0100
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:12:13 -0700
commit36fe32f4eeab086bd4c7bf604f560067a2d68384 (patch)
treef6417adfbaeff910477d03c8a778ddbdf274b6e4 /include
parentb80f203ede5f557d102ac70f5f37f6f26dd2970f (diff)
iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC
Exposing the XN flag of the SMMU driver as IOMMU_NOEXEC instead of IOMMU_EXEC makes it enforceable, since for IOMMUs that don't support the XN flag pages will always be executable. Change-Id: Ic6b1f0ae8873035dcb798e9c996396fb2bc4921e Signed-off-by: Antonios Motakis <a.motakis@virtualopensystems.com> Acked-by: Joerg Roedel <jroedel@suse.de> Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: a720b41c41f5a7e4c51558cf087882c57331581f Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [mitchelh: context fixups] Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/iommu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 01025881a680..d68f9574e24a 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)
#define IOMMU_PRIV (1 << 4)
#define IOMMU_DEVICE (1 << 5) /* Indicates access to device memory */