aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 19:37:36 +0100
committerChristoffer Dall <cdall@linaro.org>2017-04-09 07:49:18 -0700
commit9bae3ae513015eea9534cc2c2b6f7e405abad71a (patch)
treeefaf07c84faa176d80344ceb22562d7cfe48c583
parentarm64: KVM: Move lr save/restore to do_el2_call (diff)
downloadlinux-dev-9bae3ae513015eea9534cc2c2b6f7e405abad71a.tar.xz
linux-dev-9bae3ae513015eea9534cc2c2b6f7e405abad71a.zip
arm64: hyp-stub: Don't save lr in the EL1 code
The EL2 code is not corrupting lr anymore, so don't bother preserving it in the EL1 trampoline code. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <cdall@linaro.org>
-rw-r--r--arch/arm64/kernel/hyp-stub.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index e4215ad06930..193dfb25ce2f 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -116,18 +116,14 @@ ENDPROC(\label)
*/
ENTRY(__hyp_get_vectors)
- str lr, [sp, #-16]!
mov x0, #HVC_GET_VECTORS
hvc #0
- ldr lr, [sp], #16
ret
ENDPROC(__hyp_get_vectors)
ENTRY(__hyp_set_vectors)
- str lr, [sp, #-16]!
mov x1, x0
mov x0, #HVC_SET_VECTORS
hvc #0
- ldr lr, [sp], #16
ret
ENDPROC(__hyp_set_vectors)