From 7bc9a34955eddfadf75c1511810898437bb57d67 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sun, 13 Nov 2005 16:07:14 -0800
Subject: [PATCH] --- yaml --- r: 14067 b: refs/heads/master c:
 b17b0421d70f5b85a791afe145a16d5ca5f849aa h: refs/heads/master i:   14065:
 3a92b1b93162860b09dfb1d910a8f308374f2a56   14063:
 8baa3eb9046c86975084ff040b23e52cba7c4aa9 v: v3

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

diff --git a/[refs] b/[refs]
index 1b7cffaa7481..177cc6e645b3 100644
--- 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
index 80789a59b4db..d7611f189ef7 100644
--- 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)) {