diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 02:56:07 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 02:56:07 +0100 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /kernel/signal.c | |
| parent | Merge branch 'upstream-fixes' (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.xz linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip | |
Merge branch 'master'
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 80789a59b4db..d7611f189ef7 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)) { |