aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--virt/kvm/arm/arch_timer.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 27a1f6341d41..17b8fa52bf3b 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -498,17 +498,7 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
498 if (ret) 498 if (ret)
499 return ret; 499 return ret;
500 500
501 501 timer->enabled = 1;
502 /*
503 * There is a potential race here between VCPUs starting for the first
504 * time, which may be enabling the timer multiple times. That doesn't
505 * hurt though, because we're just setting a variable to the same
506 * variable that it already was. The important thing is that all
507 * VCPUs have the enabled variable set, before entering the guest, if
508 * the arch timers are enabled.
509 */
510 if (timecounter)
511 timer->enabled = 1;
512 502
513 return 0; 503 return 0;
514} 504}