summaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-03 15:12:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-03 15:12:52 -0700
commit241e5e6f0497769d37240215047b9473ae3ae3f0 (patch)
treee39ac4cd67277804a83ca48749a03a6b2765d52d /kernel/signal.c
parent7a69f9c60b49699579f5bfb71f928cceba0afe1a (diff)
parent204a2be30a7a8a8d12642f23f3fbdc8b9923b500 (diff)
downloadlinux-241e5e6f0497769d37240215047b9473ae3ae3f0.tar.bz2
Merge tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - NuBus improvements and cleanups - defconfig updates - Fix debugger syscall restart interactions, leading to the global removal of ptrace_signal_deliver() * tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Remove ptrace_signal_deliver m68k/defconfig: Update defconfigs for v4.12-rc1 nubus: Fix pointer validation nubus: Remove slot zero probe
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 45b4c1ffe14e..9b28954e058f 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2100,7 +2100,6 @@ static void do_jobctl_trap(void)
static int ptrace_signal(int signr, siginfo_t *info)
{
- ptrace_signal_deliver();
/*
* We do not check sig_kernel_stop(signr) but set this marker
* unconditionally because we do not know whether debugger will