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

diff --git a/block/blk-mq.c b/block/blk-mq.c
index b038ec680e843e14aa2f3a7b3d967bd802efd4db..5f647cb8c695f093f886035bb99d58f5f8e1af75 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -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;

diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index 00a1ec7b915492b00dfc58e9b599b264e1a7d7dd..ce480bcf20d258f672a7d76943684081054b773b 100644 (file)
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -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) {

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4971100a8cab547f25b49fd107d41b0be38a4642..3c74f89367c4882945b59d20eb4c42b2dbf97300 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -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);

diff --git a/include/linux/wait.h b/include/linux/wait.h
index b6f77cf60dd7bbf8154aa56a3ea0bb2631221981..d57832774ca6ad5da00e99eda539841fa0ba8000 100644 (file)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -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,                 \

diff --git a/kernel/futex.c b/kernel/futex.c
index 6d50728ef2e7483a5450a89f93f5f978e9ece3e6..5e9842ea4012839978b2d3acf7514ce26df2aa32 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -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

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 5ee77f1a8a925e8fad922c35050c3add686fdd52..de895d86800cae595b0a227919caa32dfddba09d 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -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);
 

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index bb9915291644e26720c5bc82c8e02210ef1fbaa5..7f3cf2381f2766eebce53f1560a0a8754bc43b39 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -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);