Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7f9591c authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 22062a96

arch/m68k/include/asm/signal.h

+1 −2
Original line number Diff line number Diff line
@@ -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__ */

arch/m68k/kernel/signal.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

include/linux/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -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



/*

kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -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