diff options
| author | Longpeng(Mike) <longpeng2@huawei.com> | 2016-11-09 10:50:14 +0800 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-11-15 11:54:16 +0000 |
| commit | fd5ebf99f814fadae0dd50893699ba17e1b4af42 (patch) | |
| tree | 37094e427bcd3b8289de1de7b54923920b0b128f /virt | |
| parent | 2988509dd8a0e9c2b64192a46ec2fe8211af6d3c (diff) | |
| download | linux-stable-fd5ebf99f814fadae0dd50893699ba17e1b4af42.tar.gz linux-stable-fd5ebf99f814fadae0dd50893699ba17e1b4af42.tar.bz2 linux-stable-fd5ebf99f814fadae0dd50893699ba17e1b4af42.zip | |
arm/arm64: KVM: Clean up useless code in kvm_timer_enable
1) Since commit:41a54482 changed timer enabled variable to per-vcpu,
the correlative comment in kvm_timer_enable is useless now.
2) After the kvm module init successfully, the timecounter is always
non-null, so we can remove the checking of timercounter.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 12 |
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) if (ret) return ret; - - /* - * There is a potential race here between VCPUs starting for the first - * time, which may be enabling the timer multiple times. That doesn't - * hurt though, because we're just setting a variable to the same - * variable that it already was. The important thing is that all - * VCPUs have the enabled variable set, before entering the guest, if - * the arch timers are enabled. - */ - if (timecounter) - timer->enabled = 1; + timer->enabled = 1; return 0; } |