projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 568fccc)
KVM: PPC: Book3S HV: Fix ABIv2 indirect branch issue
authorAnton Blanchard <anton@samba.org>
Thu, 12 Jun 2014 08:16:10 +0000 (18:16 +1000)
committerAlexander Graf <agraf@suse.de>
Mon, 28 Jul 2014 13:22:13 +0000 (15:22 +0200)
To establish addressability quickly, ABIv2 requires the target
address of the function being called to be in r12.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
arch/powerpc/kvm/book3s_hv_rmhandlers.S patch | blob | blame | history

diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 868347ef09fd48bcf8bfd343becb49f6898887c5..da1cac5ae288519be4324fecca7df440ac710e7a 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1913,8 +1913,8 @@ hcall_try_real_mode:
        lwax    r3,r3,r4
        cmpwi   r3,0
        beq     guest_exit_cont
-       add     r3,r3,r4
-       mtctr   r3
+       add     r12,r3,r4
+       mtctr   r12
        mr      r3,r9           /* get vcpu pointer */
        ld      r4,VCPU_GPR(R4)(r9)
        bctrl