aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-05 13:06:22 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-29 00:01:24 -0500
commitb7f9591c44505ee16ed4561cfeb3642798bdd132 (patch)
treed7e0ac4a0f36440fffe487c71130a844df566878 /arch
parent22062a96300dabfef93368a28c34bdf35c9b8308 (diff)
get rid of ptrace_signal_deliver() arguments
the first one is equal to signal_pt_regs(), the second is never used (and always NULL, while we are at it). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/include/asm/signal.h3
-rw-r--r--arch/m68k/kernel/signal.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index eb51a5241187..9c8c46b06b0c 100644
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -87,8 +87,7 @@ static inline int sigfindinword(unsigned long word)
87#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */ 87#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
88 88
89#ifndef __uClinux__ 89#ifndef __uClinux__
90struct pt_regs; 90extern void ptrace_signal_deliver(void);
91extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
92#define ptrace_signal_deliver ptrace_signal_deliver 91#define ptrace_signal_deliver ptrace_signal_deliver
93#endif /* __uClinux__ */ 92#endif /* __uClinux__ */
94 93
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 710a528b928b..9a396cda3147 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -108,8 +108,9 @@ int handle_kernel_fault(struct pt_regs *regs)
108 return 1; 108 return 1;
109} 109}
110 110
111void ptrace_signal_deliver(struct pt_regs *regs, void *cookie) 111void ptrace_signal_deliver(void)
112{ 112{
113 struct pt_regs *regs = signal_pt_regs();
113 if (regs->orig_d0 < 0) 114 if (regs->orig_d0 < 0)
114 return; 115 return;
115 switch (regs->d0) { 116 switch (regs->d0) {