diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-11-16 10:51:25 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-30 11:14:59 +0200 |
| commit | f3ad05f6c31a18c83d46d234a32769f151c46593 (patch) | |
| tree | 51f12ddd5bbcbb20f9e04552ad1a8ff40bf4cc77 /virt | |
| parent | 0057950da5b287bbc3885872c98c57ee33bb26c5 (diff) | |
| download | lwn-f3ad05f6c31a18c83d46d234a32769f151c46593.tar.gz lwn-f3ad05f6c31a18c83d46d234a32769f151c46593.zip | |
arm/arm64: KVM: arch_timer: Initialize cntvoff at kvm_init
commit a1a64387adeeba7a34ce06f2774e81f496ee803b upstream.
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>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'virt')
| -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 b001dbff0f38..14d7b51bb223 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1410,7 +1410,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); |