In the bad_exception macro used when taking abort exceptions in Hyp mode (which shouldn't happen) we can use the vcpu register alias instead of r0. Cc: Marc Zyngier <marc.zyngier@xxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx> --- arch/arm/kvm/interrupts.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S index 3bb0f5b..4332629 100644 --- a/arch/arm/kvm/interrupts.S +++ b/arch/arm/kvm/interrupts.S @@ -282,14 +282,14 @@ ENTRY(kvm_call_hyp) .if \exception_code == ARM_EXCEPTION_DATA_ABORT mrc p15, 4, r2, c5, c2, 0 @ HSR mrc p15, 4, r1, c6, c0, 0 @ HDFAR - str r2, [r0, #VCPU_HSR] - str r1, [r0, #VCPU_HxFAR] + str r2, [vcpu, #VCPU_HSR] + str r1, [vcpu, #VCPU_HxFAR] .endif .if \exception_code == ARM_EXCEPTION_PREF_ABORT mrc p15, 4, r2, c5, c2, 0 @ HSR mrc p15, 4, r1, c6, c0, 2 @ HIFAR - str r2, [r0, #VCPU_HSR] - str r1, [r0, #VCPU_HxFAR] + str r2, [vcpu, #VCPU_HSR] + str r1, [vcpu, #VCPU_HxFAR] .endif mov r1, #\exception_code b __kvm_vcpu_return -- 1.7.9.5 _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
