summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 19:37:49 +0100
committerChristoffer Dall <cdall@linaro.org>2017-04-09 07:49:25 -0700
commit6b52f7bdb8883b9c6a47a5558e6b08834c952fb3 (patch)
tree2077edbd0f9c404f671d1c053a5c65ce9b831b2c /arch/arm/kernel
parent6b85677c38510e09d482a9bd57000a099003a898 (diff)
ARM: hyp-stub: Use r1 for the soft-restart address
It is not really obvious why the restart address should be in r3 when communicated to the hyp-stub. r1 should be perfectly adequate, and consistent with the rest of the code. Tested-by: Keerthy <j-keerthy@ti.com> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> 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>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/hyp-stub.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 8301db963d83..15eaa14322a7 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -214,7 +214,7 @@ __hyp_stub_do_trap:
1: teq r0, #HVC_SOFT_RESTART
bne 1f
- bx r3
+ bx r1
1: mov r0, #-1
@@ -258,10 +258,9 @@ ENTRY(__hyp_set_vectors)
ENDPROC(__hyp_set_vectors)
ENTRY(__hyp_soft_restart)
- mov r3, r0
+ mov r1, r0
mov r0, #HVC_SOFT_RESTART
__HVC(0)
- mov r0, r3
ret lr
ENDPROC(__hyp_soft_restart)