openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

unify default ptrace_signal_deliver 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-11-05 12:59:15 -05:00
parent e80d6661c3
commit 4f4202fe5a
18 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/alpha/include/asm/signal.h
View File

@ -164,9 +164,6 @@ struct sigstack {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif #endif
#endif #endif

1
arch/arm/include/asm/signal.h
View File

@ -35,5 +35,4 @@ struct k_sigaction {
}; };
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif #endif

2
arch/avr32/include/asm/signal.h
View File

@ -37,6 +37,4 @@ struct k_sigaction {
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#undef __HAVE_ARCH_SIG_BITOPS #undef __HAVE_ARCH_SIG_BITOPS
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif #endif

6
arch/cris/include/asm/signal.h
View File

@ -152,12 +152,6 @@ typedef struct sigaltstack {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
/* here we could define asm-optimized sigaddset, sigdelset etc. operations.
* if we don't, generic ones are used from linux/signal.h
*/
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif

2
arch/h8300/include/asm/signal.h
View File

@ -154,8 +154,6 @@ typedef struct sigaltstack {
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#undef __HAVE_ARCH_SIG_BITOPS #undef __HAVE_ARCH_SIG_BITOPS
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _H8300_SIGNAL_H */ #endif /* _H8300_SIGNAL_H */

2
arch/ia64/include/asm/signal.h
View File

@ -38,7 +38,5 @@ struct k_sigaction {
# include <asm/sigcontext.h> # include <asm/sigcontext.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
# endif /* !__ASSEMBLY__ */ # endif /* !__ASSEMBLY__ */
#endif /* _ASM_IA64_SIGNAL_H */ #endif /* _ASM_IA64_SIGNAL_H */

4
arch/m32r/include/asm/signal.h
View File

@ -149,10 +149,6 @@ typedef struct sigaltstack {
#undef __HAVE_ARCH_SIG_BITOPS #undef __HAVE_ARCH_SIG_BITOPS
struct pt_regs;
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_M32R_SIGNAL_H */ #endif /* _ASM_M32R_SIGNAL_H */

5
arch/m68k/include/asm/signal.h
View File

@ -86,11 +86,10 @@ static inline int sigfindinword(unsigned long word)
#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */ #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
#ifdef __uClinux__ #ifndef __uClinux__
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#else
struct pt_regs; struct pt_regs;
extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie); extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
#define ptrace_signal_deliver ptrace_signal_deliver
#endif /* __uClinux__ */ #endif /* __uClinux__ */
#endif /* _M68K_SIGNAL_H */ #endif /* _M68K_SIGNAL_H */

2
arch/mips/include/asm/signal.h
View File

@ -21,6 +21,4 @@
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <asm/siginfo.h> #include <asm/siginfo.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* _ASM_SIGNAL_H */ #endif /* _ASM_SIGNAL_H */

4
arch/mn10300/include/asm/signal.h
View File

@ -45,8 +45,4 @@ struct k_sigaction {
}; };
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
struct pt_regs;
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* _ASM_SIGNAL_H */ #endif /* _ASM_SIGNAL_H */

2
arch/parisc/include/asm/signal.h
View File

@ -34,8 +34,6 @@ struct k_sigaction {
struct sigaction sa; struct sigaction sa;
}; };
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#endif /* !__ASSEMBLY */ #endif /* !__ASSEMBLY */

2
arch/powerpc/include/asm/signal.h
View File

@ -3,6 +3,4 @@
#include <uapi/asm/signal.h> #include <uapi/asm/signal.h>
struct pt_regs;
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* _ASM_POWERPC_SIGNAL_H */ #endif /* _ASM_POWERPC_SIGNAL_H */

2
arch/s390/include/asm/signal.h
View File

@ -39,6 +39,4 @@ struct k_sigaction {
struct sigaction sa; struct sigaction sa;
}; };
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif #endif

2
arch/sparc/include/asm/signal.h
View File

@ -26,7 +26,5 @@ struct k_sigaction {
void __user *ka_restorer; void __user *ka_restorer;
}; };
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLY__) */
#endif /* !(__SPARC_SIGNAL_H) */ #endif /* !(__SPARC_SIGNAL_H) */

2
arch/x86/include/asm/signal.h
View File

@ -260,8 +260,6 @@ struct pt_regs;
#endif /* !__i386__ */ #endif /* !__i386__ */
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

1
arch/xtensa/include/asm/signal.h
View File

@ -27,7 +27,6 @@ struct k_sigaction {
}; };
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _XTENSA_SIGNAL_H */ #endif /* _XTENSA_SIGNAL_H */

2
include/asm-generic/signal.h
View File

@ -10,7 +10,5 @@
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#undef __HAVE_ARCH_SIG_BITOPS #undef __HAVE_ARCH_SIG_BITOPS
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_GENERIC_SIGNAL_H */ #endif /* _ASM_GENERIC_SIGNAL_H */

4
include/linux/ptrace.h
View File

@ -329,6 +329,10 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
#define current_pt_regs() task_pt_regs(current) #define current_pt_regs() task_pt_regs(current)
#endif #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, extern int task_current_syscall(struct task_struct *target, long *callno,
unsigned long args[6], unsigned int maxargs, unsigned long args[6], unsigned int maxargs,
unsigned long *sp, unsigned long *pc); unsigned long *sp, unsigned long *pc);