aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-21 09:42:10 +0100
committerKees Cook <keescook@chromium.org>2015-11-18 11:10:42 -0800
commit9f4d82cfa4664b3fd9be1ac8118ab090a1750df3 (patch)
treeaf5d1c948d3f9dffcc3492f8bfdcc0273917f187
parent2a09c547421abfe97df3618dde6b90eb485a06ac (diff)
downloadv4.1-9f4d82cfa4664b3fd9be1ac8118ab090a1750df3.tar.gz
UPSTREAM: ARM: domains: remove DOMAIN_TABLE
DOMAIN_TABLE is not used; in any case, it aliases to the kernel domain. Remove this definition. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Bug: 25672827 Patchset: PAN emulation (cherry picked from commit 1fb6755f16872ad256c18cce2830f9087502dffd) Signed-off-by: Kees Cook <keescook@google.com> Change-Id: I87e5aabbd57de2f6b6d96ac1ed6d1e85ceda4ed6
-rw-r--r--arch/arm/include/asm/domain.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index 396a12e486f..2be92954993 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -34,12 +34,10 @@
*/
#ifndef CONFIG_IO_36
#define DOMAIN_KERNEL 0
-#define DOMAIN_TABLE 0
#define DOMAIN_USER 1
#define DOMAIN_IO 2
#else
#define DOMAIN_KERNEL 2
-#define DOMAIN_TABLE 2
#define DOMAIN_USER 1
#define DOMAIN_IO 0
#endif
@@ -62,7 +60,6 @@
#define DACR_INIT \
(domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
domain_val(DOMAIN_IO, DOMAIN_CLIENT) | \
domain_val(DOMAIN_VECTORS, DOMAIN_CLIENT))