Remove an extra "and" on the save path, which is already present on the restore path (which is also converted to the canonical ARM syntax). Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> --- arch/arm/kvm/interrupts_head.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index c906fac..64aae26 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S @@ -429,7 +429,6 @@ beq 1f mrc p15, 0, r2, c14, c3, 1 @ CNTV_CTL - and r2, #3 str r2, [\vcpup, #VCPU_TIMER_CNTV_CTL] bic r2, #1 @ Clear ENABLE mcr p15, 0, r2, c14, c3, 1 @ CNTV_CTL @@ -471,7 +470,7 @@ mcrr p15, 3, r2, r3, c14 @ CNTV_CVAL ldr r2, [\vcpup, #VCPU_TIMER_CNTV_CTL] - and r2, #3 + and r2, r2, #3 mcr p15, 0, r2, c14, c3, 1 @ CNTV_CTL isb 1: -- 1.8.0.1 _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
