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

Commit 96fe3b07 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Rename do_schedule_next_timer 



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

Signed-off-by: default avatarThomas 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
parent 30802945

include/linux/posix-timers.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 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
 
#endif

kernel/signal.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -630,7 +630,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) 
		 * about to disable them again anyway.

		 * about to disable them again anyway.

		 */

		 */

		spin_unlock(&tsk->sighand->siglock);

		spin_unlock(&tsk->sighand->siglock);

		do_schedule_next_timer(info);

		posixtimer_rearm(info);

		spin_lock(&tsk->sighand->siglock);

		spin_lock(&tsk->sighand->siglock);

	}

	}

#endif

#endif

kernel/time/posix-cpu-timers.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.

 * when the last timer signal was delivered and we have to reload the timer.

 */

 */

void posix_cpu_timer_schedule(struct k_itimer *timer)

void posix_cpu_timer_schedule(struct k_itimer *timer)

kernel/time/posix-timers.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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,

 * To protect against the timer going away while the interrupt is queued,

 * we require that the it_requeue_pending flag be set.

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

	struct k_itimer *timr;

	unsigned long flags;

	unsigned long flags;
@@ -336,12 +336,12 @@ int posix_timer_event(struct k_itimer *timr, int si_private) 
	int shared, ret = -1;

	int shared, ret = -1;

	/*

	/*

	 * FIXME: if ->sigq is queued we can race with

	 * 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

	 * 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().

	 * 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.

	 * and re-schedules it while ->sigq is pending.

	 * Not really bad, but not that we want.

	 * 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

 * accumulating overruns on the next timer.  The overrun is frozen when

 * the signal is delivered, either at the notify time (if the info block

 * 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

 * 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.

 * to pick up the frozen overrun.

 */

 */

SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)

SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)