1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f1c4155b49ac..f580dd9db286 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -550,6 +550,7 @@ static inline void run_hrtimer_queue(struct hrtimer_base *base)
                 fn = timer->function;
                 data = timer->data;
                 set_curr_timer(base, timer);
+                timer->state = HRTIMER_RUNNING;
                 __remove_hrtimer(timer, base);
                 spin_unlock_irq(&base->lock);
 
@@ -565,6 +566,10 @@ static inline void run_hrtimer_queue(struct hrtimer_base *base)
 
                 spin_lock_irq(&base->lock);
 
+                /* Another CPU has added back the timer */
+                if (timer->state != HRTIMER_RUNNING)
+                        continue;
+
                 if (restart == HRTIMER_RESTART)
                         enqueue_hrtimer(timer, base);
                 else