From ce3bc3e8f61ecef501b308555b5b484aeb7a752c Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 25 Jul 2008 01:47:29 -0700
Subject: [PATCH] --- yaml --- r: 105922 b: refs/heads/master c:
 100360f03077663b7bef3af44805b6cf700c3bee h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e6e8cb0dc99..4c6e8cad7004 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4434207616980885205c605697868c0f07e4378
+refs/heads/master: 100360f03077663b7bef3af44805b6cf700c3bee
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 50ad439377b2..fea236fe0b50 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -338,7 +338,7 @@ unblock_all_signals(void)
 	spin_unlock_irqrestore(&current->sighand->siglock, flags);
 }
 
-static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
+static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
 {
 	struct sigqueue *q, *first = NULL;
 
@@ -372,7 +372,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
 		info->si_pid = 0;
 		info->si_uid = 0;
 	}
-	return 1;
 }
 
 static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
@@ -390,8 +389,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
 			}
 		}
 
-		if (!collect_signal(sig, pending, info))
-			sig = 0;
+		collect_signal(sig, pending, info);
 	}
 
 	return sig;