1 files changed, 15 insertions, 1 deletions

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index b7d75a9e8ccf..271ce6c12907 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -432,7 +432,7 @@ int alarm_cancel(struct alarm *alarm)
                 int ret = alarm_try_to_cancel(alarm);
                 if (ret >= 0)
                         return ret;
-                cpu_relax();
+                hrtimer_cancel_wait_running(&alarm->timer);
         }
 }
 EXPORT_SYMBOL_GPL(alarm_cancel);
@@ -606,6 +606,19 @@ static int alarm_timer_try_to_cancel(struct k_itimer *timr)
 }
 
 /**
+ * alarm_timer_wait_running - Posix timer callback to wait for a timer
+ * @timr:       Pointer to the posixtimer data struct
+ *
+ * Called from the core code when timer cancel detected that the callback
+ * is running. @timr is unlocked and rcu read lock is held to prevent it
+ * from being freed.
+ */
+static void alarm_timer_wait_running(struct k_itimer *timr)
+{
+        hrtimer_cancel_wait_running(&timr->it.alarm.alarmtimer.timer);
+}
+
+/**
  * alarm_timer_arm - Posix timer callback to arm a timer
  * @timr:       Pointer to the posixtimer data struct
  * @expires:    The new expiry time
@@ -834,6 +847,7 @@ const struct k_clock alarm_clock = {
         .timer_forward          = alarm_timer_forward,
         .timer_remaining        = alarm_timer_remaining,
         .timer_try_to_cancel    = alarm_timer_try_to_cancel,
+        .timer_wait_running     = alarm_timer_wait_running,
         .nsleep                 = alarm_timer_nsleep,
 };
 #endif /* CONFIG_POSIX_TIMERS */