commit 100360f03077663b7bef3af44805b6cf700c3bee
author Oleg Nesterov <oleg@tv-sign.ru> Fri Jul 25 01:47:29 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 25 10:53:38 2008 -0700
tree 338cedfd71101fdaeb317fc0692d1bf93bd3a1a7
parent d4434207616980885205c605697868c0f07e4378

signals: change collect_signal() to return void

With the recent changes collect_signal() always returns true.  Change it
to return void and update the single caller.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

kernel/signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 50ad439..fea236f 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -338,7 +338,7 @@
 	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 @@
 		info->si_pid = 0;
 		info->si_uid = 0;
 	}
-	return 1;
 }
 
 static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
@@ -390,8 +389,7 @@
 			}
 		}
 
-		if (!collect_signal(sig, pending, info))
-			sig = 0;
+		collect_signal(sig, pending, info);
 	}
 
 	return sig;