Commit 6b52f7bd authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall

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: default avatarKeerthy <j-keerthy@ti.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 6b85677c
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment