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

Commit 204a2be3 authored by Andreas Schwab's avatar Andreas Schwab Committed by Geert Uytterhoeven
Browse files

m68k: Remove ptrace_signal_deliver 



This fixes debugger syscall restart interactions.  A debugger that
modifies the tracee's program counter is expected to set the orig_d0
pseudo register to -1, to disable a possible syscall restart.

This removes the last user of the ptrace_signal_deliver hook in the ptrace
signal handling, so remove that as well.

Signed-off-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 1072734a

arch/m68k/include/asm/signal.h

+0 −5
Original line number Diff line number Diff line
@@ -62,9 +62,4 @@ static inline int __gen_sigismember(sigset_t *set, int _sig) 


#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */



#ifndef __uClinux__

extern void ptrace_signal_deliver(void);

#define ptrace_signal_deliver ptrace_signal_deliver

#endif /* __uClinux__ */



#endif /* _M68K_SIGNAL_H */

arch/m68k/kernel/signal.c

+0 −16
Original line number Diff line number Diff line
@@ -109,22 +109,6 @@ int fixup_exception(struct pt_regs *regs) 
	return 1;

}



void ptrace_signal_deliver(void)

{

	struct pt_regs *regs = signal_pt_regs();

	if (regs->orig_d0 < 0)

		return;

	switch (regs->d0) {

	case -ERESTARTNOHAND:

	case -ERESTARTSYS:

	case -ERESTARTNOINTR:

		regs->d0 = regs->orig_d0;

		regs->orig_d0 = -1;

		regs->pc -= 2;

		break;

	}

}



static inline void push_cache (unsigned long vaddr)

{

	/*

include/linux/ptrace.h

+0 −4
Original line number Diff line number Diff line
@@ -388,10 +388,6 @@ static inline void user_single_step_siginfo(struct task_struct *tsk, 
#define current_pt_regs() task_pt_regs(current)

#endif



#ifndef ptrace_signal_deliver

#define ptrace_signal_deliver() ((void)0)

#endif



/*

 * unlike current_pt_regs(), this one is equal to task_pt_regs(current)

 * on *all* architectures; the only reason to have a per-arch definition

kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,6 @@ static void do_jobctl_trap(void) 


static int ptrace_signal(int signr, siginfo_t *info)

{

	ptrace_signal_deliver();

	/*

	 * We do not check sig_kernel_stop(signr) but set this marker

	 * unconditionally because we do not know whether debugger will