diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
| commit | 9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch) | |
| tree | cc6ac425f7580a40d011ad2e8fc7974678843e0b /virt/kvm/arm/arch_timer.c | |
| parent | 93f13a9f96771a064c716364aebc6e283b186eb8 (diff) | |
| parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
| download | talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.tar.gz talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.zip | |
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt/kvm/arm/arch_timer.c')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 76e38d231e99..48c6e1ac6827 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -200,6 +200,14 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, timer->irq = irq; /* + * The bits in CNTV_CTL are architecturally reset to UNKNOWN for ARMv8 + * and to 0 for ARMv7. We provide an implementation that always + * resets the timer to be disabled and unmasked and is compliant with + * the ARMv7 architecture. + */ + timer->cntv_ctl = 0; + + /* * Tell the VGIC that the virtual interrupt is tied to a * physical interrupt. We do that once per VCPU. */ |
