diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-05 19:06:22 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-29 06:01:24 +0100 |
| commit | b7f9591c44505ee16ed4561cfeb3642798bdd132 (patch) | |
| tree | d7e0ac4a0f36440fffe487c71130a844df566878 | |
| parent | new helper: signal_pt_regs() (diff) | |
| download | linux-b7f9591c44505ee16ed4561cfeb3642798bdd132.tar.xz linux-b7f9591c44505ee16ed4561cfeb3642798bdd132.zip | |
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>
| -rw-r--r-- | arch/m68k/include/asm/signal.h | 3 | ||||
| -rw-r--r-- | arch/m68k/kernel/signal.c | 3 | ||||
| -rw-r--r-- | include/linux/ptrace.h | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 2 |
4 files changed, 5 insertions, 5 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) #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/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) 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/include/linux/ptrace.h b/include/linux/ptrace.h index b8e6dcec78ae..a89ff04bddd9 100644 --- a/include/linux/ptrace.h +++ b/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/kernel/signal.c b/kernel/signal.c index 0af8868525d6..17d4e17fd614 100644 --- a/kernel/signal.c +++ b/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 |