redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190726185752.791885290@linutronix.de
alistair/sunxi64-5.4-dsi
Thomas Gleixner 2019-07-26 20:30:49 +02:00
parent 511885d706
commit b744948725
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-mq.c
View File

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

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

@ -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) {

3
include/linux/hrtimer.h
View File

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

2
include/linux/wait.h
View File

@ -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, \

2
kernel/futex.c
View File

@ -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

8
kernel/time/hrtimer.c
View File

@ -1639,10 +1639,10 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
return HRTIMER_NORESTART;
}
void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
void hrtimer_init_sleeper(struct hrtimer_sleeper *sl)
{
sl->timer.function = hrtimer_wakeup;
sl->task = task;
sl->task = current;
}
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
@ -1669,7 +1669,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
{
struct restart_block *restart;
hrtimer_init_sleeper(t, current);
hrtimer_init_sleeper(t);
do {
set_current_state(TASK_INTERRUPTIBLE);
@ -1930,7 +1930,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
hrtimer_init_on_stack(&t.timer, clock_id, mode);
hrtimer_set_expires_range_ns(&t.timer, *expires, delta);
hrtimer_init_sleeper(&t, current);
hrtimer_init_sleeper(&t);
hrtimer_start_expires(&t.timer, mode);

2
net/core/pktgen.c
View File

@ -2171,7 +2171,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
} while (ktime_compare(end_time, spin_until) < 0);
} else {
/* see do_nanosleep */
hrtimer_init_sleeper(&t, current);
hrtimer_init_sleeper(&t);
do {
set_current_state(TASK_INTERRUPTIBLE);
hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);