summaryrefslogtreecommitdiff
path: root/arch/m68k/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-04 01:12:52 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-04 01:12:52 +0300
commit241e5e6f0497769d37240215047b9473ae3ae3f0 (patch)
treee39ac4cd67277804a83ca48749a03a6b2765d52d /arch/m68k/include
parent7a69f9c60b49699579f5bfb71f928cceba0afe1a (diff)
parent204a2be30a7a8a8d12642f23f3fbdc8b9923b500 (diff)
downloadlinux-241e5e6f0497769d37240215047b9473ae3ae3f0.tar.xz
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 'arch/m68k/include')
-rw-r--r--arch/m68k/include/asm/signal.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index 8c8ce5e1ee0e..3bc64d02ba5f 100644
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -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 */