diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 15:12:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 15:12:52 -0700 |
| commit | 241e5e6f0497769d37240215047b9473ae3ae3f0 (patch) | |
| tree | e39ac4cd67277804a83ca48749a03a6b2765d52d /include/linux/ptrace.h | |
| parent | 7a69f9c60b49699579f5bfb71f928cceba0afe1a (diff) | |
| parent | 204a2be30a7a8a8d12642f23f3fbdc8b9923b500 (diff) | |
| download | lwn-241e5e6f0497769d37240215047b9473ae3ae3f0.tar.gz lwn-241e5e6f0497769d37240215047b9473ae3ae3f0.zip | |
Merge tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- NuBus improvements and cleanups
- defconfig updates
- Fix debugger syscall restart interactions, leading to the global
removal of ptrace_signal_deliver()
* tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove ptrace_signal_deliver
m68k/defconfig: Update defconfigs for v4.12-rc1
nubus: Fix pointer validation
nubus: Remove slot zero probe
Diffstat (limited to 'include/linux/ptrace.h')
| -rw-r--r-- | include/linux/ptrace.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index ef3eb8bbfee4..0e5fcc11b1b8 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -391,10 +391,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 |