From 9b3cb73a0ac1c71567123c826ffdf7a75830eb5a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 5 Nov 2012 13:08:06 -0500 Subject: [PATCH] --- yaml --- r: 340361 b: refs/heads/master c: 94eb22d5056b5eca10c587bf064e0e6db0ae6161 h: refs/heads/master i: 340359: a6a6de689cd246d634c74f3e6e7fcc0ca8827e9f v: v3 --- [refs] | 2 +- trunk/kernel/signal.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 721eab2efe1c..80cd3a1fbb78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7f9591c44505ee16ed4561cfeb3642798bdd132 +refs/heads/master: 94eb22d5056b5eca10c587bf064e0e6db0ae6161 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 17d4e17fd614..421d5b6bcdbc 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -2138,8 +2138,7 @@ static void do_jobctl_trap(void) } } -static int ptrace_signal(int signr, siginfo_t *info, - struct pt_regs *regs, void *cookie) +static int ptrace_signal(int signr, siginfo_t *info) { ptrace_signal_deliver(); /* @@ -2265,8 +2264,7 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, break; /* will return 0 */ if (unlikely(current->ptrace) && signr != SIGKILL) { - signr = ptrace_signal(signr, info, - regs, cookie); + signr = ptrace_signal(signr, info); if (!signr) continue; }