Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7449487 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

hrtimer: Remove task argument from hrtimer_init_sleeper() 



All callers hand in 'current' and that's the only task pointer which
actually makes sense. Remove the task argument and set current in the
function.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190726185752.791885290@linutronix.de
parent 511885d7

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -3418,7 +3418,7 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q, 
	hrtimer_init_on_stack(&hs.timer, CLOCK_MONOTONIC, mode);

	hrtimer_set_expires(&hs.timer, kt);



	hrtimer_init_sleeper(&hs, current);

	hrtimer_init_sleeper(&hs);

	do {

		if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE)

			break;

drivers/staging/android/vsoc.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg) 
		hrtimer_set_expires_range_ns(&to->timer, wake_time,

					     current->timer_slack_ns);



		hrtimer_init_sleeper(to, current);

		hrtimer_init_sleeper(to);

	}



	while (1) {

include/linux/hrtimer.h

+1 −2
Original line number Diff line number Diff line
@@ -463,8 +463,7 @@ extern long hrtimer_nanosleep(const struct timespec64 *rqtp, 
			      const enum hrtimer_mode mode,

			      const clockid_t clockid);



extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,

				 struct task_struct *tsk);

extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl);



extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,

						const enum hrtimer_mode mode);

include/linux/wait.h

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ do { \ 
	struct hrtimer_sleeper __t;						\

										\

	hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);	\

	hrtimer_init_sleeper(&__t, current);					\

	hrtimer_init_sleeper(&__t);						\

	if ((timeout) != KTIME_MAX)						\

		hrtimer_start_range_ns(&__t.timer, timeout,			\

				       current->timer_slack_ns,			\

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout, 
	hrtimer_init_on_stack(&timeout->timer, (flags & FLAGS_CLOCKRT) ?

			      CLOCK_REALTIME : CLOCK_MONOTONIC,

			      HRTIMER_MODE_ABS);

	hrtimer_init_sleeper(timeout, current);

	hrtimer_init_sleeper(timeout);



	/*

	 * If range_ns is 0, calling hrtimer_set_expires_range_ns() is