From 67fdb8ea33d653ccd4eb7ea7b8ef62f6a7f494eb Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Sun, 30 Oct 2005 15:03:46 -0800
Subject: [PATCH] --- yaml --- r: 11918 b: refs/heads/master c:
 ae6866c377943de73e2c95398ff0120516f167ce h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/signal.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index ba8b1f00275b..5fb074b54653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621d31219d9a788bda924a0613048053f3f5f211
+refs/heads/master: ae6866c377943de73e2c95398ff0120516f167ce
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 27533b90c347..1d8f84c5c6ee 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/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().
 		 */
 			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;