---

yaml --- r: 340361 b: refs/heads/master c: 94eb22d h: refs/heads/master i: 340359: a6a6de6 v: v3
git-mirror · Nov 29, 2012 · 9b3cb73 · 9b3cb73
1 parent c633500
commit 9b3cb73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;
 		}