diff options
-rw-r--r-- | arch/x86/kvm/i8254.c | 9 | ||||
-rw-r--r-- | arch/x86/kvm/irq.c | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index ddeb2314b522..2ad40a4ddc34 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -232,15 +232,6 @@ static void pit_latch_status(struct kvm *kvm, int channel) | |||
232 | } | 232 | } |
233 | } | 233 | } |
234 | 234 | ||
235 | int pit_has_pending_timer(struct kvm_vcpu *vcpu) | ||
236 | { | ||
237 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | ||
238 | |||
239 | if (pit && kvm_vcpu_is_bsp(vcpu) && pit->pit_state.irq_ack) | ||
240 | return atomic_read(&pit->pit_state.pit_timer.pending); | ||
241 | return 0; | ||
242 | } | ||
243 | |||
244 | static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian) | 235 | static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian) |
245 | { | 236 | { |
246 | struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state, | 237 | struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state, |
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 2095a049835e..f994da40ad94 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c | |||
@@ -33,12 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) | 34 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) |
35 | { | 35 | { |
36 | int ret; | 36 | return apic_has_pending_timer(vcpu); |
37 | |||
38 | ret = pit_has_pending_timer(vcpu); | ||
39 | ret |= apic_has_pending_timer(vcpu); | ||
40 | |||
41 | return ret; | ||
42 | } | 37 | } |
43 | EXPORT_SYMBOL(kvm_cpu_has_pending_timer); | 38 | EXPORT_SYMBOL(kvm_cpu_has_pending_timer); |
44 | 39 | ||