ARM: mm: Remove SW emulation for ARM domain manager
8x50 is no longer supported in the msm-3.4 kernel, so remove this
feature.
Change-Id: I2156ef22cca82d3cce6a7d39e366b93cab32f811
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index bf24487..ecbf4f5 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -746,15 +746,8 @@
ldr r7, [r7, #TSK_STACK_CANARY]
#endif
#ifdef CONFIG_CPU_USE_DOMAINS
-#ifdef CONFIG_EMULATE_DOMAIN_MANAGER_V7
- stmdb r13!, {r0-r3, lr}
- mov r0, r6
- bl emulate_domain_manager_set
- ldmia r13!, {r0-r3, lr}
-#else
mcr p15, 0, r6, c3, c0, 0 @ Set domain register
#endif
-#endif
mov r5, r0
add r4, r2, #TI_CPU_SAVE
ldr r0, =thread_notify_head
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 542ceb0..4d5f86b 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -415,17 +415,10 @@
mov r5, #0
mcrr p15, 0, r4, r5, c2 @ load TTBR0
#else
-#ifdef CONFIG_EMULATE_DOMAIN_MANAGER_V7
- mov r5, #(domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
- domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT) | \
- domain_val(DOMAIN_TABLE, DOMAIN_CLIENT) | \
- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
-#else
- mov r5, #(domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
+ mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_TABLE, DOMAIN_CLIENT) | \
+ domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
domain_val(DOMAIN_IO, DOMAIN_CLIENT))
-#endif
mcr p15, 0, r5, c3, c0, 0 @ load domain access register
mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
#endif