diff options
-rw-r--r-- | arch/arm/include/asm/domain.h | 2 | ||||
-rw-r--r-- | arch/arm/kernel/traps.c | 1 |
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 @@ | |||
59 | #define domain_val(dom,type) ((type) << (2 * (dom))) | 59 | #define domain_val(dom,type) ((type) << (2 * (dom))) |
60 | 60 | ||
61 | #define DACR_INIT \ | 61 | #define DACR_INIT \ |
62 | (domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \ | 62 | (domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \ |
63 | domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \ | 63 | domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \ |
64 | domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \ | 64 | domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \ |
65 | domain_val(DOMAIN_IO, DOMAIN_CLIENT)) | 65 | 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) | |||
870 | kuser_init(vectors_base); | 870 | kuser_init(vectors_base); |
871 | 871 | ||
872 | flush_icache_range(vectors, vectors + PAGE_SIZE * 2); | 872 | flush_icache_range(vectors, vectors + PAGE_SIZE * 2); |
873 | modify_domain(DOMAIN_USER, DOMAIN_CLIENT); | ||
874 | #else /* ifndef CONFIG_CPU_V7M */ | 873 | #else /* ifndef CONFIG_CPU_V7M */ |
875 | /* | 874 | /* |
876 | * on V7-M there is no need to copy the vector table to a dedicated | 875 | * on V7-M there is no need to copy the vector table to a dedicated |