---

yaml --- r: 105922 b: refs/heads/master c: 100360f h: refs/heads/master v: v3
git-mirror · Jul 25, 2008 · ce3bc3e · ce3bc3e
1 parent 520ca5a
commit ce3bc3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;