summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-05 12:59:15 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-29 00:01:23 -0500
commit4f4202fe5ae9a43e59303f20d700571f695d7b1b (patch)
tree150e0dc8d1a8e0009c55fdca69981dd83e44aa1f /include
parente80d6661c3a5caa0cebec0853c6cb0db090fb506 (diff)
downloadlinux-stable-4f4202fe5ae9a43e59303f20d700571f695d7b1b.tar.gz
linux-stable-4f4202fe5ae9a43e59303f20d700571f695d7b1b.tar.bz2
linux-stable-4f4202fe5ae9a43e59303f20d700571f695d7b1b.zip
unify default ptrace_signal_deliver
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/signal.h2
-rw-r--r--include/linux/ptrace.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h
index 98caa306122a..d840c90a157a 100644
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal.h
@@ -10,7 +10,5 @@
#include <asm/sigcontext.h>
#undef __HAVE_ARCH_SIG_BITOPS
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
#endif /* __ASSEMBLY__ */
#endif /* _ASM_GENERIC_SIGNAL_H */
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index e0ff4689d35a..7aefbae2452e 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -329,6 +329,10 @@ 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(regs, cookie) do { } while (0)
+#endif
+
extern int task_current_syscall(struct task_struct *target, long *callno,
unsigned long args[6], unsigned int maxargs,
unsigned long *sp, unsigned long *pc);