diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-05 12:59:15 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-29 00:01:23 -0500 |
commit | 4f4202fe5ae9a43e59303f20d700571f695d7b1b (patch) | |
tree | 150e0dc8d1a8e0009c55fdca69981dd83e44aa1f /include | |
parent | e80d6661c3a5caa0cebec0853c6cb0db090fb506 (diff) |
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.h | 2 | ||||
-rw-r--r-- | include/linux/ptrace.h | 4 |
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 @@ | |||
10 | #include <asm/sigcontext.h> | 10 | #include <asm/sigcontext.h> |
11 | #undef __HAVE_ARCH_SIG_BITOPS | 11 | #undef __HAVE_ARCH_SIG_BITOPS |
12 | 12 | ||
13 | #define ptrace_signal_deliver(regs, cookie) do { } while (0) | ||
14 | |||
15 | #endif /* __ASSEMBLY__ */ | 13 | #endif /* __ASSEMBLY__ */ |
16 | #endif /* _ASM_GENERIC_SIGNAL_H */ | 14 | #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, | |||
329 | #define current_pt_regs() task_pt_regs(current) | 329 | #define current_pt_regs() task_pt_regs(current) |
330 | #endif | 330 | #endif |
331 | 331 | ||
332 | #ifndef ptrace_signal_deliver | ||
333 | #define ptrace_signal_deliver(regs, cookie) do { } while (0) | ||
334 | #endif | ||
335 | |||
332 | extern int task_current_syscall(struct task_struct *target, long *callno, | 336 | extern int task_current_syscall(struct task_struct *target, long *callno, |
333 | unsigned long args[6], unsigned int maxargs, | 337 | unsigned long args[6], unsigned int maxargs, |
334 | unsigned long *sp, unsigned long *pc); | 338 | unsigned long *sp, unsigned long *pc); |