summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-21 10:30:16 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-21 14:55:52 +0200
commit3c2aed5b28819564e1a07b4686bd89802bcc4d6b (patch)
tree063a2dd93a675eb5352433b9f381f1fc5313bf64 /arch
parentARM: domains: move initial domain setting value to asm/domains.h (diff)
downloadlinux-3c2aed5b28819564e1a07b4686bd89802bcc4d6b.tar.xz
linux-3c2aed5b28819564e1a07b4686bd89802bcc4d6b.zip
ARM: domains: get rid of manager mode for user domain
Since we switched to early trap initialisation in 94e5a85b3be0 ("ARM: earlier initialization of vectors page") we haven't been writing directly to the vectors page, and so there's no need for this domain to be in manager mode. Switch it to client mode. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/domain.h2
-rw-r--r--arch/arm/kernel/traps.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index 4218f88e8f7e..08b601e69ddc 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -59,7 +59,7 @@
#define domain_val(dom,type) ((type) << (2 * (dom)))
#define DACR_INIT \
- (domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
+ (domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
domain_val(DOMAIN_IO, DOMAIN_CLIENT))
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index d358226236f2..969f9d9e665f 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -870,7 +870,6 @@ void __init early_trap_init(void *vectors_base)
kuser_init(vectors_base);
flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
#else /* ifndef CONFIG_CPU_V7M */
/*
* on V7-M there is no need to copy the vector table to a dedicated