Commit 9dd8813e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 01656464

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/android/vsoc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

kernel/futex.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags, 
	}



	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);

net/core/pktgen.c

+1 −1
Original line number Diff line number Diff line
@@ -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();