diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-11-16 10:51:25 -0800 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-12-21 09:58:57 -0800 |
| commit | a1a64387adeeba7a34ce06f2774e81f496ee803b (patch) | |
| tree | 963fdf9b52a832d731ab35f955ee8a2d20c9ad18 /virt/kvm/arm | |
| parent | 989c6b34f6a9480e397b170cc62237e89bf4fdb9 (diff) | |
arm/arm64: KVM: arch_timer: Initialize cntvoff at kvm_init
Initialize the cntvoff at kvm_init_vm time, not before running the VCPUs
at the first time because that will overwrite any potentially restored
values from user space.
Cc: Andre Przywara <andre.przywara@linaro.org>
Acked-by: Marc Zynger <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt/kvm/arm')
| -rw-r--r-- | virt/kvm/arm/vgic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 685fc72fc75..81e9481184a 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1409,7 +1409,6 @@ int kvm_vgic_init(struct kvm *kvm) for (i = VGIC_NR_PRIVATE_IRQS; i < VGIC_NR_IRQS; i += 4) vgic_set_target_reg(kvm, 0, i); - kvm_timer_init(kvm); kvm->arch.vgic.ready = true; out: mutex_unlock(&kvm->lock); |