iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of ptrace_signal_deliver() arguments

Browse Source 
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>
This commit is contained in:
Al Viro 2012-11-05 13:06:22 -05:00
parent 22062a9630
commit b7f9591c44
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/include/asm/signal.h
View File

@ -87,8 +87,7 @@ static inline int sigfindinword(unsigned long word)
#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */ #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
#ifndef __uClinux__ #ifndef __uClinux__
struct pt_regs; extern void ptrace_signal_deliver(void);
extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
#define ptrace_signal_deliver ptrace_signal_deliver #define ptrace_signal_deliver ptrace_signal_deliver
#endif /* __uClinux__ */ #endif /* __uClinux__ */

3
arch/m68k/kernel/signal.c
View File

@ -108,8 +108,9 @@ int handle_kernel_fault(struct pt_regs *regs)
return 1; 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) if (regs->orig_d0 < 0)
return; return;
switch (regs->d0) { switch (regs->d0) {

2
include/linux/ptrace.h
View File

@ -330,7 +330,7 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
#endif #endif
#ifndef ptrace_signal_deliver #ifndef ptrace_signal_deliver
#define ptrace_signal_deliver(regs, cookie) do { } while (0) #define ptrace_signal_deliver() ((void)0)
#endif #endif
/* /*

2
kernel/signal.c
View File

@ -2141,7 +2141,7 @@ static void do_jobctl_trap(void)
static int ptrace_signal(int signr, siginfo_t *info, static int ptrace_signal(int signr, siginfo_t *info,
struct pt_regs *regs, void *cookie) 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 * We do not check sig_kernel_stop(signr) but set this marker
* unconditionally because we do not know whether debugger will * unconditionally because we do not know whether debugger will