diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
tree | c7839809e35fce4868910742157e8ef96782b378 /kernel/signal.c | |
parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index d7b9d14ac80d..328a01e1a2f0 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -2485,6 +2485,8 @@ relock: | |||
2485 | if (signal_group_exit(signal)) { | 2485 | if (signal_group_exit(signal)) { |
2486 | ksig->info.si_signo = signr = SIGKILL; | 2486 | ksig->info.si_signo = signr = SIGKILL; |
2487 | sigdelset(¤t->pending.signal, SIGKILL); | 2487 | sigdelset(¤t->pending.signal, SIGKILL); |
2488 | trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO, | ||
2489 | &sighand->action[SIGKILL - 1]); | ||
2488 | recalc_sigpending(); | 2490 | recalc_sigpending(); |
2489 | goto fatal; | 2491 | goto fatal; |
2490 | } | 2492 | } |