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

Commit ae6866c3 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] remove unneeded SI_TIMER checks 



This patch removes checks for ->si_code == SI_TIMER from send_signal,
specific_send_sig_info, __group_send_sig_info.

I think posix-timers.c used these functions some time ago, now it sends
signals via send_{,group_}sigqueue, so these hooks are unneeded.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 621d3121

kernel/signal.c

+0 −18
Original line number Diff line number Diff line
@@ -830,12 +830,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, 
		 * and sent by user using something other than kill().

		 */

			return -EAGAIN;

		if (info->si_code == SI_TIMER)

			/*

			 * Set up a return to indicate that we dropped 

			 * the signal.

			 */

			ret = info->si_sys_private;

	}



out_set:
@@ -856,12 +850,6 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) 
		BUG();

	assert_spin_locked(&t->sighand->siglock);



	if (!is_si_special(info) && (info->si_code == SI_TIMER))

		/*

		 * Set up a return to indicate that we dropped the signal.

		 */

		ret = info->si_sys_private;



	/* Short-circuit ignored signals.  */

	if (sig_ignored(t, sig))

		goto out;
@@ -1048,12 +1036,6 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) 
	assert_spin_locked(&p->sighand->siglock);

	handle_stop_signal(sig, p);



	if (!is_si_special(info) && (info->si_code == SI_TIMER))

		/*

		 * Set up a return to indicate that we dropped the signal.

		 */

		ret = info->si_sys_private;



	/* Short-circuit ignored signals.  */

	if (sig_ignored(p, sig))

		return ret;