Message ID | 20140612181610.3479c3f2@kryten (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On 12.06.14 10:16, Anton Blanchard wrote: > 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> Thanks, applied to kvm-ppc-queue. Alex > --- > > Index: b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > =================================================================== > --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S > +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > @@ -1920,8 +1920,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
Index: b/arch/powerpc/kvm/book3s_hv_rmhandlers.S =================================================================== --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -1920,8 +1920,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
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> ---