1 files changed, 9 insertions, 4 deletions

diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
index 5be6154e2fd2..c1f5bb590b5e 100644
--- a/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/time/tick-broadcast-hrtimer.c
@@ -59,11 +59,16 @@ static int bc_set_next(ktime_t expires, struct clock_event_device *bc)
          * hrtimer_{start/cancel} functions call into tracing,
          * calls to these functions must be bound within RCU_NONIDLE.
          */
-        RCU_NONIDLE({
+        RCU_NONIDLE(
+                {
                         bc_moved = hrtimer_try_to_cancel(&bctimer) >= 0;
-                        if (bc_moved)
+                        if (bc_moved) {
                                 hrtimer_start(&bctimer, expires,
-                                              HRTIMER_MODE_ABS_PINNED);});
+                                              HRTIMER_MODE_ABS_PINNED_HARD);
+                        }
+                }
+        );
+
         if (bc_moved) {
                 /* Bind the "device" to the cpu */
                 bc->bound_on = smp_processor_id();
@@ -104,7 +109,7 @@ static enum hrtimer_restart bc_handler(struct hrtimer *t)
 
 void tick_setup_hrtimer_broadcast(void)
 {
-        hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+        hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
         bctimer.function = bc_handler;
         clockevents_register_device(&ce_broadcast_hrtimer);
 }