Quellcode durchsuchen

[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: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Oleg Nesterov vor 19 Jahren
Ursprung
Commit
ae6866c377
1 geänderte Dateien mit 0 neuen und 18 gelöschten Zeilen
  1. 0 18
      kernel/signal.c

+ 0 - 18
kernel/signal.c

@@ -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().
 		 * and sent by user using something other than kill().
 		 */
 		 */
 			return -EAGAIN;
 			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:
 out_set:
@@ -856,12 +850,6 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
 		BUG();
 		BUG();
 	assert_spin_locked(&t->sighand->siglock);
 	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.  */
 	/* Short-circuit ignored signals.  */
 	if (sig_ignored(t, sig))
 	if (sig_ignored(t, sig))
 		goto out;
 		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);
 	assert_spin_locked(&p->sighand->siglock);
 	handle_stop_signal(sig, p);
 	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.  */
 	/* Short-circuit ignored signals.  */
 	if (sig_ignored(p, sig))
 	if (sig_ignored(p, sig))
 		return ret;
 		return ret;