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 Andreas Schwab <[email protected]>

---
 arch/m68k/include/asm/signal.h |  5 -----
 arch/m68k/kernel/signal.c      | 16 ----------------
 include/linux/ptrace.h         |  4 ----
 kernel/signal.c                |  1 -
 4 files changed, 26 deletions(-)

arch/m68k/include/asm/signal.h +0 -5

index 8c8ce5e1ee..3bc64d02ba 100644
@@ -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

index 093b7c42fb..098fa7185b 100644
@@ -109,22 +109,6 @@ int handle_kernel_fault(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

index 422bc2e4cb..9a2e04be06 100644
@@ -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 -2

index 7e59ebc2c2..742c08b409 100644
@@ -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
--

2.13.1

If you don't mind, I plan to queue this up in the m68k tree for v4.13. There are no conflicts with current linux-next.

If you prefer to take this through a signal tree with my

Acked-by Geert Uytterhoeven <[email protected]>

please let me know.

Thanks!

Quoted 8 lines · Andreas Schwab

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 Andreas Schwab <[email protected]>