diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 17d4e17fd614..421d5b6bcdbc 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -2138,8 +2138,7 @@ static void do_jobctl_trap(void) | |||
2138 | } | 2138 | } |
2139 | } | 2139 | } |
2140 | 2140 | ||
2141 | static int ptrace_signal(int signr, siginfo_t *info, | 2141 | static int ptrace_signal(int signr, siginfo_t *info) |
2142 | struct pt_regs *regs, void *cookie) | ||
2143 | { | 2142 | { |
2144 | ptrace_signal_deliver(); | 2143 | ptrace_signal_deliver(); |
2145 | /* | 2144 | /* |
@@ -2265,8 +2264,7 @@ relock: | |||
2265 | break; /* will return 0 */ | 2264 | break; /* will return 0 */ |
2266 | 2265 | ||
2267 | if (unlikely(current->ptrace) && signr != SIGKILL) { | 2266 | if (unlikely(current->ptrace) && signr != SIGKILL) { |
2268 | signr = ptrace_signal(signr, info, | 2267 | signr = ptrace_signal(signr, info); |
2269 | regs, cookie); | ||
2270 | if (!signr) | 2268 | if (!signr) |
2271 | continue; | 2269 | continue; |
2272 | } | 2270 | } |