diff options
Diffstat (limited to 'arch/x86/kvm/lapic.c')
-rw-r--r-- | arch/x86/kvm/lapic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 954e98a8c2e3..2f0ade48614f 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
@@ -1172,7 +1172,7 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu) | |||
1172 | 1172 | ||
1173 | tsc_deadline = apic->lapic_timer.expired_tscdeadline; | 1173 | tsc_deadline = apic->lapic_timer.expired_tscdeadline; |
1174 | apic->lapic_timer.expired_tscdeadline = 0; | 1174 | apic->lapic_timer.expired_tscdeadline = 0; |
1175 | guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, native_read_tsc()); | 1175 | guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, rdtsc()); |
1176 | trace_kvm_wait_lapic_expire(vcpu->vcpu_id, guest_tsc - tsc_deadline); | 1176 | trace_kvm_wait_lapic_expire(vcpu->vcpu_id, guest_tsc - tsc_deadline); |
1177 | 1177 | ||
1178 | /* __delay is delay_tsc whenever the hardware has TSC, thus always. */ | 1178 | /* __delay is delay_tsc whenever the hardware has TSC, thus always. */ |
@@ -1240,7 +1240,7 @@ static void start_apic_timer(struct kvm_lapic *apic) | |||
1240 | local_irq_save(flags); | 1240 | local_irq_save(flags); |
1241 | 1241 | ||
1242 | now = apic->lapic_timer.timer.base->get_time(); | 1242 | now = apic->lapic_timer.timer.base->get_time(); |
1243 | guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, native_read_tsc()); | 1243 | guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, rdtsc()); |
1244 | if (likely(tscdeadline > guest_tsc)) { | 1244 | if (likely(tscdeadline > guest_tsc)) { |
1245 | ns = (tscdeadline - guest_tsc) * 1000000ULL; | 1245 | ns = (tscdeadline - guest_tsc) * 1000000ULL; |
1246 | do_div(ns, this_tsc_khz); | 1246 | do_div(ns, this_tsc_khz); |