---

yaml --- r: 14067 b: refs/heads/master c: b17b042 h: refs/heads/master i: 14065: 3a92b1b 14063: 8baa3eb v: v3
git-mirror · Nov 14, 2005 · 7bc9a34 · 7bc9a34
1 parent a1184f0
commit 7bc9a34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba260e23efbabcff975f60401475c2bdd693f872
+refs/heads/master: b17b0421d70f5b85a791afe145a16d5ca5f849aa
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -513,16 +513,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
 {
 	int sig = 0;
 
-	/* SIGKILL must have priority, otherwise it is quite easy
-	 * to create an unkillable process, sending sig < SIGKILL
-	 * to self */
-	if (unlikely(sigismember(&pending->signal, SIGKILL))) {
-		if (!sigismember(mask, SIGKILL))
-			sig = SIGKILL;
-	}
-
-	if (likely(!sig))
-		sig = next_signal(pending, mask);
+	sig = next_signal(pending, mask);
 	if (sig) {
 		if (current->notifier) {
 			if (sigismember(current->notifier_mask, sig)) {