1 files changed, 5 insertions, 7 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 6d50728ef2e7..bd18f60e4c6c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -487,11 +487,9 @@ futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout,
         if (!time)
                 return NULL;
 
-        hrtimer_init_on_stack(&timeout->timer, (flags & FLAGS_CLOCKRT) ?
-                              CLOCK_REALTIME : CLOCK_MONOTONIC,
-                              HRTIMER_MODE_ABS);
-        hrtimer_init_sleeper(timeout, current);
-
+        hrtimer_init_sleeper_on_stack(timeout, (flags & FLAGS_CLOCKRT) ?
+                                      CLOCK_REALTIME : CLOCK_MONOTONIC,
+                                      HRTIMER_MODE_ABS);
         /*
          * If range_ns is 0, calling hrtimer_set_expires_range_ns() is
          * effectively the same as calling hrtimer_set_expires().
@@ -2613,7 +2611,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
 
         /* Arm the timer */
         if (timeout)
-                hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
+                hrtimer_sleeper_start_expires(timeout, HRTIMER_MODE_ABS);
 
         /*
          * If we have been removed from the hash list, then another task
@@ -2899,7 +2897,7 @@ retry_private:
         }
 
         if (unlikely(to))
-                hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
+                hrtimer_sleeper_start_expires(to, HRTIMER_MODE_ABS);
 
         ret = rt_mutex_wait_proxy_lock(&q.pi_state->pi_mutex, to, &rt_waiter);