remove unneeded SI_TIMER checks
PATCH 1/1 remove unneeded SI_TIMER checks
Depends on "cleanup the usage of SEND_SIG_xxx constants" patch in the rc2-mm1 tree, filename is
cleanup-the-usage-of-send_sig_xxx-constants.patch
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 Oleg Nesterov <[email protected]>
kernel/signal.c renamed from kernel/signal.c~2_TIMER +0 -18
@@ -840,12 +840,6 @@ static int send_signal(int sig, struct s* 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:
@@ -866,12 +860,6 @@ specific_send_sig_info(int sig, struct sBUG ();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;
@@ -1061,12 +1049,6 @@ __group_send_sig_info(int sig, struct siassert_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;