From: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
Since it doesn't make sense as kvm_cpu_has_pending_timer replaced it,
remove dead code.
Signed-off-by: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
---
arch/x86/kvm/lapic.c | 1 -
arch/x86/kvm/x86.c | 11 -----------
include/linux/kvm_host.h | 2 +-
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index b5cd8465d44f..2c4d19afc76d 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1372,7 +1372,6 @@ static void apic_timer_expired(struct kvm_lapic *apic)
return;
atomic_inc(&apic->lapic_timer.pending);
- kvm_set_pending_timer(vcpu);
/*
* For x86, the atomic_inc() is serialized, thus
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 2b812b3c5088..3b9165dae5c6 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1283,16 +1283,6 @@ static void update_pvclock_gtod(struct timekeeper *tk)
}
#endif
-void kvm_set_pending_timer(struct kvm_vcpu *vcpu)
-{
- /*
- * Note: KVM_REQ_PENDING_TIMER is implicitly checked in
- * vcpu_enter_guest. This function is only called from
- * the physical CPU that is running vcpu.
- */
- kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu);
-}
-
static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
{
int version;
@@ -7592,7 +7582,6 @@ static int vcpu_run(struct kvm_vcpu *vcpu)
if (r <= 0)
break;
- kvm_clear_request(KVM_REQ_PENDING_TIMER, vcpu);
if (kvm_cpu_has_pending_timer(vcpu))
kvm_inject_pending_timer_irqs(vcpu);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4ee7bc548a83..79877bd2a8c6 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -122,10 +122,10 @@ static inline bool is_error_page(struct page *page)
/*
* Architecture-independent vcpu->requests bit members
* Bits 4-7 are reserved for more arch-independent bits.
+ * Bit 2 was used before as KVM_REQ_PENDING_TIMER. but not now.
*/
#define KVM_REQ_TLB_FLUSH (0 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
#define KVM_REQ_MMU_RELOAD (1 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
-#define KVM_REQ_PENDING_TIMER 2
#define KVM_REQ_UNHALT 3
#define KVM_REQUEST_ARCH_BASE 8
--
2.17.1
