X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fsignal.c;h=d7611f189ef7ac33ef7610e7a92a3584f5c7028b;hb=d5ea4e26602fa7f5141872f2c17a862f1974a73f;hp=80789a59b4dbc6553a21b6f8075f803ad76fc5be;hpb=5643f000c1e10ab991182478b76550e1364c3570;p=linux-2.6 diff --git a/kernel/signal.c b/kernel/signal.c index 80789a59b4..d7611f189e 100644 --- a/kernel/signal.c +++ b/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)) {