Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / kernel / time / timer.c

diff --git a/kernel/kernel/time/timer.c b/kernel/kernel/time/timer.c
index 76a301b..8b75754 100644 (file)
--- a/kernel/kernel/time/timer.c
+++ b/kernel/kernel/time/timer.c
@@ -1051,7 +1051,7 @@ static void wait_for_running_timer(struct timer_list *timer)
                   base->running_timer != timer);
 }
 
-# define wakeup_timer_waiters(b)       wake_up(&(b)->wait_for_running_timer)
+# define wakeup_timer_waiters(b)       wake_up_all(&(b)->wait_for_running_timer)
 #else
 static inline void wait_for_running_timer(struct timer_list *timer)
 {
@@ -1313,8 +1313,8 @@ static inline void __run_timers(struct tvec_base *base)
                        }
                }
        }
-       wakeup_timer_waiters(base);
        spin_unlock_irq(&base->lock);
+       wakeup_timer_waiters(base);
 }
 
 #ifdef CONFIG_NO_HZ_COMMON
@@ -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);
 }