hrtimer/treewide: Use hrtimer_sleeper_start_expires()

hrtimer_sleepers will gain a scheduling class dependent treatment on
PREEMPT_RT. Use the new hrtimer_sleeper_start_expires() function to make
that possible.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index df3fafb..f567146 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3422,7 +3422,7 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q,
                if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE)
                        break;
                set_current_state(TASK_UNINTERRUPTIBLE);
-               hrtimer_start_expires(&hs.timer, mode);
+               hrtimer_sleeper_start_expires(&hs, mode);
                if (hs.task)
                        io_schedule();
                hrtimer_cancel(&hs.timer);

diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index 2d6b398..1240bb0 100644 (file)
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -458,7 +458,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg)
                        break;
                }
                if (to) {
-                       hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
+                       hrtimer_sleeper_start_expires(to, HRTIMER_MODE_ABS);
                        if (likely(to->task))
                                freezable_schedule();
                        hrtimer_cancel(&to->timer);

diff --git a/kernel/futex.c b/kernel/futex.c
index c8561aa..bd18f60 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2611,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
@@ -2897,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);
 

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index a590597..1d0c1b4 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2172,7 +2172,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
        } else {
                do {
                        set_current_state(TASK_INTERRUPTIBLE);
-                       hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
+                       hrtimer_sleeper_start_expires(&t, HRTIMER_MODE_ABS);
 
                        if (likely(t.task))
                                schedule();