Messages in this thread Patch in this message | | | Date | Sat, 24 Sep 2005 17:48:51 +0400 | From | Oleg Nesterov <> | Subject | [PATCH rc2-mm1] 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 <oleg@tv-sign.ru>
--- 2.6.14-rc2/kernel/signal.c~2_TIMER 2005-09-24 18:33:51.000000000 +0400 +++ 2.6.14-rc2/kernel/signal.c 2005-09-24 18:47:16.000000000 +0400 @@ -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 s 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; @@ -1061,12 +1049,6 @@ __group_send_sig_info(int sig, struct si 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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |