aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-06-12 04:16:10 -0400
committerAlexander Graf <agraf@suse.de>2014-07-28 09:22:13 -0400
commit05a308c722822b0fbcc706b54be70f9bb9d52539 (patch)
treec2a676ed6413138b95da12b66806cf4f07ff7754 /arch
parent568fccc43f901889b94b228cd0238916cb40e0bd (diff)
KVM: PPC: Book3S HV: Fix ABIv2 indirect branch issue
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kvm/book3s_hv_rmhandlers.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 868347ef09fd..da1cac5ae288 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1913,8 +1913,8 @@ hcall_try_real_mode:
1913 lwax r3,r3,r4 1913 lwax r3,r3,r4
1914 cmpwi r3,0 1914 cmpwi r3,0
1915 beq guest_exit_cont 1915 beq guest_exit_cont
1916 add r3,r3,r4 1916 add r12,r3,r4
1917 mtctr r3 1917 mtctr r12
1918 mr r3,r9 /* get vcpu pointer */ 1918 mr r3,r9 /* get vcpu pointer */
1919 ld r4,VCPU_GPR(R4)(r9) 1919 ld r4,VCPU_GPR(R4)(r9)
1920 bctrl 1920 bctrl