posix-timers: Rename do_schedule_next_timer

That function is a misnomer. Rename it with a proper prefix to
posixtimer_rearm().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20170530211656.811362578@linutronix.de

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 8f9cca390cdb1b512eec3a73065c30a93bf5e299..771e5f788c90e38d6efe566c245ebd34784fc74c 100644 (file)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -112,6 +112,6 @@ long clock_nanosleep_restart(struct restart_block *restart_block);
 
 void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new);
 
-void do_schedule_next_timer(struct siginfo *info);
+void posixtimer_rearm(struct siginfo *info);
 
 #endif

diff --git a/kernel/signal.c b/kernel/signal.c
index 1f85c843be8e5bebfc47b5be3a628a37c38d580f..d031cd24f8a92c3f24b08866d99eeafad1bc67db 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -630,7 +630,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
                 * about to disable them again anyway.
                 */
                spin_unlock(&tsk->sighand->siglock);
-               do_schedule_next_timer(info);
+               posixtimer_rearm(info);
                spin_lock(&tsk->sighand->siglock);
        }
 #endif

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 0123ece6851b24bc1e9ab6fdcbe9986a67f924da..1ba576d3151a59c9f1eb2053a38db3c96adeacee 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -981,7 +981,7 @@ static void check_process_timers(struct task_struct *tsk,
 }
 
 /*
- * This is called from the signal code (via do_schedule_next_timer)
+ * This is called from the signal code (via posixtimer_rearm)
  * when the last timer signal was delivered and we have to reload the timer.
  */
 void posix_cpu_timer_schedule(struct k_itimer *timer)

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index eb007e19811de01d3342e950d9458e1ed4ff2fa9..036b7e70c65c35878e31db4f4f82573099d4913d 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -305,7 +305,7 @@ static void schedule_next_timer(struct k_itimer *timr)
  * To protect against the timer going away while the interrupt is queued,
  * we require that the it_requeue_pending flag be set.
  */
-void do_schedule_next_timer(struct siginfo *info)
+void posixtimer_rearm(struct siginfo *info)
 {
        struct k_itimer *timr;
        unsigned long flags;
@@ -336,12 +336,12 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
        int shared, ret = -1;
        /*
         * FIXME: if ->sigq is queued we can race with
-        * dequeue_signal()->do_schedule_next_timer().
+        * dequeue_signal()->posixtimer_rearm().
         *
         * If dequeue_signal() sees the "right" value of
-        * si_sys_private it calls do_schedule_next_timer().
+        * si_sys_private it calls posixtimer_rearm().
         * We re-queue ->sigq and drop ->it_lock().
-        * do_schedule_next_timer() locks the timer
+        * posixtimer_rearm() locks the timer
         * and re-schedules it while ->sigq is pending.
         * Not really bad, but not that we want.
         */
@@ -701,7 +701,7 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
  * accumulating overruns on the next timer.  The overrun is frozen when
  * the signal is delivered, either at the notify time (if the info block
  * is not queued) or at the actual delivery time (as we are informed by
- * the call back to do_schedule_next_timer().  So all we need to do is
+ * the call back to posixtimer_rearm().  So all we need to do is
  * to pick up the frozen overrun.
  */
 SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)