[meta-virtualization] [PATCH] Revert "kvm: Make lapic hrtimer irq safe"

[Mark Asselstine]

This reverts commit 5345ad1661edb624aeca87f5fb08abccd4414f68.

Conflicts:
	arch/x86/kvm/lapic.c
---
 arch/x86/kvm/lapic.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 671aa5d..8c26c63 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1037,13 +1037,9 @@ static void start_apic_timer(struct kvm_lapic *apic)
 			}
 		}
 
-again:
-		if (hrtimer_start(&apic->lapic_timer.timer,
-				  ktime_add_ns(now, apic->lapic_timer.period),
-				  HRTIMER_MODE_ABS) == -ETIME) {
-			if (apic_timer_fn(&apic->lapic_timer.timer) == HRTIMER_RESTART)
-				goto again;
-		}
+		hrtimer_start(&apic->lapic_timer.timer,
+			      ktime_add_ns(now, apic->lapic_timer.period),
+			      HRTIMER_MODE_ABS);
 
 		apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016"
 			   PRIx64 ", "
@@ -1562,7 +1558,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
 	hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
 		     HRTIMER_MODE_ABS);
 	apic->lapic_timer.timer.function = apic_timer_fn;
-	apic->lapic_timer.timer.irqsafe = 1;
 	apic->lapic_timer.t_ops = &lapic_timer_ops;
 	apic->lapic_timer.kvm = vcpu->kvm;
 	apic->lapic_timer.vcpu = vcpu;
-- 
1.8.1.2