summaryrefslogtreecommitdiff
path: root/arch/x86/kvm/hyperv.c
diff options
context:
space:
mode:
authorAndrey Smetanin <asmetanin@virtuozzo.com>2015-12-28 18:27:19 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2016-01-08 19:04:40 +0100
commit019b9781ccd667d4160f3636c8735e3baa085555 (patch)
tree8a200e2b8a1b6d47fb751c456ba58367aeba23c0 /arch/x86/kvm/hyperv.c
parent1ac1b65ac199205724a8077d37ba7e64a1b7e77c (diff)
kvm/x86: Drop stimer_stop() function
The function stimer_stop() is called in one place so remove the function and replace it's call by function content. Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> CC: Gleb Natapov <gleb@kernel.org> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Roman Kagan <rkagan@virtuozzo.com> CC: Denis V. Lunev <den@openvz.org> CC: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/hyperv.c')
-rw-r--r--arch/x86/kvm/hyperv.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index e4ef13a37d4c..6b2ed930bf18 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -400,16 +400,11 @@ static void stimer_mark_expired(struct kvm_vcpu_hv_stimer *stimer,
kvm_vcpu_kick(vcpu);
}
-static void stimer_stop(struct kvm_vcpu_hv_stimer *stimer)
-{
- hrtimer_cancel(&stimer->timer);
-}
-
static void stimer_cleanup(struct kvm_vcpu_hv_stimer *stimer)
{
struct kvm_vcpu *vcpu = stimer_to_vcpu(stimer);
- stimer_stop(stimer);
+ hrtimer_cancel(&stimer->timer);
clear_bit(stimer->index,
vcpu_to_hv_vcpu(vcpu)->stimer_pending_bitmap);
stimer->msg_pending = false;