openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2019-07-30 21:16:55 +02:00
parent 01656464fc
commit 9dd8813ed9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-mq.c
View File

@ -3422,7 +3422,7 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q,
if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE) if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE)
break; break;
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
hrtimer_start_expires(&hs.timer, mode); hrtimer_sleeper_start_expires(&hs, mode);
if (hs.task) if (hs.task)
io_schedule(); io_schedule();
hrtimer_cancel(&hs.timer); hrtimer_cancel(&hs.timer);

2
drivers/staging/android/vsoc.c
View File

@ -458,7 +458,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg)
break; break;
} }
if (to) { if (to) {
hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS); hrtimer_sleeper_start_expires(to, HRTIMER_MODE_ABS);
if (likely(to->task)) if (likely(to->task))
freezable_schedule(); freezable_schedule();
hrtimer_cancel(&to->timer); hrtimer_cancel(&to->timer);

4
kernel/futex.c
View File

@ -2611,7 +2611,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
/* Arm the timer */ /* Arm the timer */
if (timeout) 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 * 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)) 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); ret = rt_mutex_wait_proxy_lock(&q.pi_state->pi_mutex, to, &rt_waiter);

2
net/core/pktgen.c
View File

@ -2172,7 +2172,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
} else { } else {
do { do {
set_current_state(TASK_INTERRUPTIBLE); 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)) if (likely(t.task))
schedule(); schedule();