diff options
| author | Nicholas Krause <xerofoify@gmail.com> | 2015-01-01 22:05:18 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-08 22:48:08 +0100 |
| commit | bab5bb398273bb37547a185f7b344b37c700d0b9 (patch) | |
| tree | 06c3cfc2cf1fc5b564dd7e33f29fde2673ddf4e3 /arch/x86/kvm/lapic.c | |
| parent | edccda7ca7e56b335c70ae512f89d0fdf7fb8c69 (diff) | |
| download | blackbird-op-linux-bab5bb398273bb37547a185f7b344b37c700d0b9.tar.gz blackbird-op-linux-bab5bb398273bb37547a185f7b344b37c700d0b9.zip | |
kvm: x86: Remove kvm_make_request from lapic.c
Adds a function kvm_vcpu_set_pending_timer instead of calling
kvm_make_request in lapic.c.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 3eb7f8d9992c..a688fbffb34e 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1076,16 +1076,11 @@ static void apic_timer_expired(struct kvm_lapic *apic) wait_queue_head_t *q = &vcpu->wq; struct kvm_timer *ktimer = &apic->lapic_timer; - /* - * Note: KVM_REQ_PENDING_TIMER is implicitly checked in - * vcpu_enter_guest. - */ if (atomic_read(&apic->lapic_timer.pending)) return; atomic_inc(&apic->lapic_timer.pending); - /* FIXME: this code should not know anything about vcpus */ - kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu); + kvm_set_pending_timer(vcpu); if (waitqueue_active(q)) wake_up_interruptible(q); |
