Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

[deliverable/linux.git] / virt / kvm / arm / hyp / timer-sr.c

diff --git a/virt/kvm/arm/hyp/timer-sr.c b/virt/kvm/arm/hyp/timer-sr.c
index ea00d69e7078ccfaa8420c13a98a0c54b698b243..798866a8d8756b07dd815d7a8bc8dec8f6019e13 100644 (file)
--- a/virt/kvm/arm/hyp/timer-sr.c
+++ b/virt/kvm/arm/hyp/timer-sr.c
@@ -24,11 +24,10 @@
 /* vcpu is already in the HYP VA space */
 void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu)
 {
-       struct kvm *kvm = kern_hyp_va(vcpu->kvm);
        struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
        u64 val;
 
-       if (kvm->arch.timer.enabled) {
+       if (timer->enabled) {
                timer->cntv_ctl = read_sysreg_el0(cntv_ctl);
                timer->cntv_cval = read_sysreg_el0(cntv_cval);
        }
@@ -60,7 +59,7 @@ void __hyp_text __timer_restore_state(struct kvm_vcpu *vcpu)
        val |= CNTHCTL_EL1PCTEN;
        write_sysreg(val, cnthctl_el2);
 
-       if (kvm->arch.timer.enabled) {
+       if (timer->enabled) {
                write_sysreg(kvm->arch.timer.cntvoff, cntvoff_el2);
                write_sysreg_el0(timer->cntv_cval, cntv_cval);
                isb();