X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fkernel%2Ftime%2Ftimer.c;fp=kernel%2Fkernel%2Ftime%2Ftimer.c;h=016a0bf5242c78a67b0f83cd22538d08a157eb0a;hb=fafab8722263f4ab08894e35f4385febbce09dd1;hp=76a301b24300103f44a5c6de8caea99dce03583b;hpb=ef4e798bc8761c401451649ed17a52e3e1c638e8;p=kvmfornfv.git

diff --git a/kernel/kernel/time/timer.c b/kernel/kernel/time/timer.c
index 76a301b24..016a0bf52 100644
--- a/kernel/kernel/time/timer.c
+++ b/kernel/kernel/time/timer.c
@@ -1453,9 +1453,11 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
 	 * the base lock to check when the next timer is pending and so
 	 * we assume the next jiffy.
 	 */
-	return basem + TICK_NSEC;
-#endif
+	if (!spin_do_trylock(&base->lock))
+		return basem + TICK_NSEC;
+#else
 	spin_lock(&base->lock);
+#endif
 	if (base->active_timers) {
 		if (time_before_eq(base->next_timer, base->timer_jiffies))
 			base->next_timer = __next_timer_interrupt(base);
@@ -1465,7 +1467,11 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
 		else
 			expires = basem + (nextevt - basej) * TICK_NSEC;
 	}
+#ifdef CONFIG_PREEMPT_RT_FULL
+	rt_spin_unlock(&base->lock);
+#else
 	spin_unlock(&base->lock);
+#endif
 
 	return cmp_next_hrtimer_event(basem, expires);
 }