From c63350018d2ae23ab1b4a1ae7ac1ebcac8d574cc Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 5 Nov 2012 13:06:22 -0500
Subject: [PATCH] --- yaml --- r: 340360 b: refs/heads/master c:
 b7f9591c44505ee16ed4561cfeb3642798bdd132 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/m68k/include/asm/signal.h | 3 +--
 trunk/arch/m68k/kernel/signal.c      | 3 ++-
 trunk/include/linux/ptrace.h         | 2 +-
 trunk/kernel/signal.c                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9eb3f8b85ce6..721eab2efe1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22062a96300dabfef93368a28c34bdf35c9b8308
+refs/heads/master: b7f9591c44505ee16ed4561cfeb3642798bdd132
diff --git a/trunk/arch/m68k/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal.h
index eb51a5241187..9c8c46b06b0c 100644
--- a/trunk/arch/m68k/include/asm/signal.h
+++ b/trunk/arch/m68k/include/asm/signal.h
@@ -87,8 +87,7 @@ static inline int sigfindinword(unsigned long word)
 #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
 
 #ifndef __uClinux__
-struct pt_regs;
-extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
+extern void ptrace_signal_deliver(void);
 #define ptrace_signal_deliver ptrace_signal_deliver
 #endif /* __uClinux__ */
 
diff --git a/trunk/arch/m68k/kernel/signal.c b/trunk/arch/m68k/kernel/signal.c
index 710a528b928b..9a396cda3147 100644
--- a/trunk/arch/m68k/kernel/signal.c
+++ b/trunk/arch/m68k/kernel/signal.c
@@ -108,8 +108,9 @@ int handle_kernel_fault(struct pt_regs *regs)
 	return 1;
 }
 
-void ptrace_signal_deliver(struct pt_regs *regs, void *cookie)
+void ptrace_signal_deliver(void)
 {
+	struct pt_regs *regs = signal_pt_regs();
 	if (regs->orig_d0 < 0)
 		return;
 	switch (regs->d0) {
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
index b8e6dcec78ae..a89ff04bddd9 100644
--- a/trunk/include/linux/ptrace.h
+++ b/trunk/include/linux/ptrace.h
@@ -330,7 +330,7 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
 #endif
 
 #ifndef ptrace_signal_deliver
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+#define ptrace_signal_deliver() ((void)0)
 #endif
 
 /*
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 0af8868525d6..17d4e17fd614 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -2141,7 +2141,7 @@ static void do_jobctl_trap(void)
 static int ptrace_signal(int signr, siginfo_t *info,
 			 struct pt_regs *regs, void *cookie)
 {
-	ptrace_signal_deliver(regs, cookie);
+	ptrace_signal_deliver();
 	/*
 	 * We do not check sig_kernel_stop(signr) but set this marker
 	 * unconditionally because we do not know whether debugger will