diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-24 12:10:51 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-24 12:10:51 +0200 |
| commit | 44bcc922381e24c4f38dc5dfd8d34d60b2ede898 (patch) | |
| tree | e7d680d230ff534c8e1c20c9121f7c41feb034d9 /virt/kvm/arm/hyp/timer-sr.c | |
| parent | KVM: MTRR: remove MSR 0x2f8 (diff) | |
| parent | KVM: arm/arm64: vgic-new: Synchronize changes to active state (diff) | |
| download | linux-44bcc922381e24c4f38dc5dfd8d34d60b2ede898.tar.xz linux-44bcc922381e24c4f38dc5dfd8d34d60b2ede898.zip | |
Merge tag 'kvm-arm-for-4-7-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
KVM/ARM Changes for v4.7 take 2
"The GIC is dead; Long live the GIC"
This set of changes include the new vgic, which is a reimplementation of
our horribly broken legacy vgic implementation. The two implementations
will live side-by-side (with the new being the configured default) for
one kernel release and then we'll remove it.
Also fixes a non-critical issue with virtual abort injection to guests.
Diffstat (limited to 'virt/kvm/arm/hyp/timer-sr.c')
| -rw-r--r-- | virt/kvm/arm/hyp/timer-sr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/virt/kvm/arm/hyp/timer-sr.c b/virt/kvm/arm/hyp/timer-sr.c index ea00d69e7078..798866a8d875 100644 --- 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(); |