Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4f4202fe5ae9a43e59303f20d700571f695d7b1b

Authored by Al Viro
1 parent e80d6661c3
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

unify default ptrace_signal_deliver 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 18 changed files with 6 additions and 42 deletions Side-by-side Diff

arch/alpha/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -164,9 +164,6 @@
164 164  
165 165 #ifdef __KERNEL__
166 166 #include <asm/sigcontext.h>
167   -
168   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
169   -
170 167 #endif
171 168  
172 169 #endif
arch/arm/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -35,6 +35,5 @@
35 35 };
36 36  
37 37 #include <asm/sigcontext.h>
38   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
39 38 #endif
arch/avr32/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -37,7 +37,5 @@
37 37 #include <asm/sigcontext.h>
38 38 #undef __HAVE_ARCH_SIG_BITOPS
39 39  
40   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
41   -
42 40 #endif
arch/cris/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -152,12 +152,6 @@
152 152  
153 153 #ifdef __KERNEL__
154 154 #include <asm/sigcontext.h>
155   -
156   -/* here we could define asm-optimized sigaddset, sigdelset etc. operations.
157   - * if we don't, generic ones are used from linux/signal.h
158   - */
159   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
160   -
161 155 #endif /* __KERNEL__ */
162 156  
163 157 #endif
arch/h8300/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -154,8 +154,6 @@
154 154 #include <asm/sigcontext.h>
155 155 #undef __HAVE_ARCH_SIG_BITOPS
156 156  
157   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
158   -
159 157 #endif /* __KERNEL__ */
160 158  
161 159 #endif /* _H8300_SIGNAL_H */
arch/ia64/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -38,8 +38,6 @@
38 38  
39 39 # include <asm/sigcontext.h>
40 40  
41   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
42   -
43 41 # endif /* !__ASSEMBLY__ */
44 42 #endif /* _ASM_IA64_SIGNAL_H */
arch/m32r/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -149,10 +149,6 @@
149 149  
150 150 #undef __HAVE_ARCH_SIG_BITOPS
151 151  
152   -struct pt_regs;
153   -
154   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
155   -
156 152 #endif /* __KERNEL__ */
157 153  
158 154 #endif /* _ASM_M32R_SIGNAL_H */
arch/m68k/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -86,11 +86,10 @@
86 86  
87 87 #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
88 88  
89   -#ifdef __uClinux__
90   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
91   -#else
  89 +#ifndef __uClinux__
92 90 struct pt_regs;
93 91 extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
  92 +#define ptrace_signal_deliver ptrace_signal_deliver
94 93 #endif /* __uClinux__ */
95 94  
96 95 #endif /* _M68K_SIGNAL_H */
arch/mips/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -21,7 +21,5 @@
21 21 #include <asm/sigcontext.h>
22 22 #include <asm/siginfo.h>
23 23  
24   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
25   -
26 24 #endif /* _ASM_SIGNAL_H */
arch/mn10300/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -45,9 +45,5 @@
45 45 };
46 46 #include <asm/sigcontext.h>
47 47  
48   -
49   -struct pt_regs;
50   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
51   -
52 48 #endif /* _ASM_SIGNAL_H */
arch/parisc/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -34,8 +34,6 @@
34 34 struct sigaction sa;
35 35 };
36 36  
37   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
38   -
39 37 #include <asm/sigcontext.h>
40 38  
41 39 #endif /* !__ASSEMBLY */
arch/powerpc/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -3,7 +3,5 @@
3 3  
4 4 #include <uapi/asm/signal.h>
5 5  
6   -struct pt_regs;
7   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
8 6 #endif /* _ASM_POWERPC_SIGNAL_H */
arch/s390/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -39,7 +39,5 @@
39 39 struct sigaction sa;
40 40 };
41 41  
42   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
43   -
44 42 #endif
arch/sparc/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -26,8 +26,6 @@
26 26 void __user *ka_restorer;
27 27 };
28 28  
29   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
30   -
31 29 #endif /* !(__ASSEMBLY__) */
32 30 #endif /* !(__SPARC_SIGNAL_H) */
arch/x86/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -260,8 +260,6 @@
260 260  
261 261 #endif /* !__i386__ */
262 262  
263   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
264   -
265 263 #endif /* __KERNEL__ */
266 264 #endif /* __ASSEMBLY__ */
267 265  
arch/xtensa/include/asm/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -27,7 +27,6 @@
27 27 };
28 28  
29 29 #include <asm/sigcontext.h>
30   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
31 30  
32 31 #endif /* __ASSEMBLY__ */
33 32 #endif /* _XTENSA_SIGNAL_H */
include/asm-generic/signal.h
Diff comments   View file @ 4f4202f
... ... @@ -10,8 +10,6 @@
10 10 #include <asm/sigcontext.h>
11 11 #undef __HAVE_ARCH_SIG_BITOPS
12 12  
13   -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
14   -
15 13 #endif /* __ASSEMBLY__ */
16 14 #endif /* _ASM_GENERIC_SIGNAL_H */
include/linux/ptrace.h
Diff comments   View file @ 4f4202f
... ... @@ -329,6 +329,10 @@
329 329 #define current_pt_regs() task_pt_regs(current)
330 330 #endif
331 331  
  332 +#ifndef ptrace_signal_deliver
  333 +#define ptrace_signal_deliver(regs, cookie) do { } while (0)
  334 +#endif
  335 +
332 336 extern int task_current_syscall(struct task_struct *target, long *callno,
333 337 unsigned long args[6], unsigned int maxargs,
334 338 unsigned long *sp, unsigned long *pc);