History

consolidate kernel-side struct sigaction declarations

Al Viro committed 13 years ago

Commit 574c4861 parent 92a3ce426 files · +48 −81Browse files

Unified · Split

26 files
  1. arch/alpha/include/asm/signal.h +0 −6
  2. arch/arm/include/asm/signal.h +1 −6
  3. arch/avr32/include/asm/signal.h +1 −6
  4. arch/cris/include/asm/signal.h +1 −6
  5. arch/h8300/include/asm/signal.h +1 −6
  6. arch/ia64/include/asm/signal.h +0 −6
  7. arch/ia64/include/asm/unistd.h +0 −1
  8. arch/m32r/include/asm/signal.h +1 −7
  9. arch/m68k/include/asm/signal.h +1 −6
  10. arch/mips/include/asm/signal.h +2 −0
  11. arch/mips/include/uapi/asm/signal.h +2 −0
  12. arch/mn10300/include/asm/signal.h +1 −6
  13. arch/parisc/include/asm/signal.h +2 −0
  14. arch/powerpc/include/asm/signal.h +1 −0
  15. arch/powerpc/include/asm/syscalls.h +0 −1
  16. arch/powerpc/include/uapi/asm/signal.h +2 −0
  17. arch/s390/include/asm/signal.h +1 −7
  18. arch/sparc/include/asm/signal.h +1 −0
  19. arch/sparc/include/uapi/asm/signal.h +2 −0
  20. arch/sparc/kernel/systbls.h +1 −1
  21. arch/x86/include/asm/signal.h +3 −7
  22. arch/x86/include/uapi/asm/signal.h +2 −2
  23. arch/xtensa/include/asm/signal.h +1 −6
  24. include/linux/signal.h +14 −0
  25. include/linux/syscalls.h +1 −1
  26. include/uapi/asm-generic/signal.h +6 −0
arch/alpha/include/asm/signal.h+0−6
@@ -22,12 +22,6 @@ struct osf_sigaction { · 21 unmodified lines
2222 int sa_flags;
2323 };
2424
25−struct sigaction {
26− __sighandler_t sa_handler;
27− unsigned long sa_flags;
28− sigset_t sa_mask; /* mask last for extensibility */
29−};
30−
3125 #define __ARCH_HAS_KA_RESTORER
3226 #include <asm/sigcontext.h>
3327 #endif
arch/arm/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
2323 __sigrestore_t sa_restorer;
2424 };
2525
26−struct sigaction {
27− __sighandler_t sa_handler;
28− unsigned long sa_flags;
29− __sigrestore_t sa_restorer;
30− sigset_t sa_mask; /* mask last for extensibility */
31−};
26+#define __ARCH_HAS_SA_RESTORER
3227
3328 #include <asm/sigcontext.h>
3429 #endif
arch/avr32/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ typedef struct { · 22 unmodified lines
2323 unsigned long sig[_NSIG_WORDS];
2424 } sigset_t;
2525
26−struct sigaction {
27− __sighandler_t sa_handler;
28− unsigned long sa_flags;
29− __sigrestore_t sa_restorer;
30− sigset_t sa_mask; /* mask last for extensibility */
31−};
26+#define __ARCH_HAS_SA_RESTORER
3227
3328 #include <asm/sigcontext.h>
3429 #undef __HAVE_ARCH_SIG_BITOPS
arch/cris/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
2323 void (*sa_restorer)(void);
2424 };
2525
26−struct sigaction {
27− __sighandler_t sa_handler;
28− unsigned long sa_flags;
29− void (*sa_restorer)(void);
30− sigset_t sa_mask; /* mask last for extensibility */
31−};
26+#define __ARCH_HAS_SA_RESTORER
3227
3328 #include <asm/sigcontext.h>
3429
arch/h8300/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
2323 void (*sa_restorer)(void);
2424 };
2525
26−struct sigaction {
27− __sighandler_t sa_handler;
28− unsigned long sa_flags;
29− void (*sa_restorer)(void);
30− sigset_t sa_mask; /* mask last for extensibility */
31−};
26+#define __ARCH_HAS_SA_RESTORER
3227
3328 #include <asm/sigcontext.h>
3429 #undef __HAVE_ARCH_SIG_BITOPS
arch/ia64/include/asm/signal.h+0−6
@@ -26,12 +26,6 @@ typedef struct { · 25 unmodified lines
2626 unsigned long sig[_NSIG_WORDS];
2727 } sigset_t;
2828
29−struct sigaction {
30− __sighandler_t sa_handler;
31− unsigned long sa_flags;
32− sigset_t sa_mask; /* mask last for extensibility */
33−};
34−
3529 # include <asm/sigcontext.h>
3630
3731 # endif /* !__ASSEMBLY__ */
arch/ia64/include/asm/unistd.h+0−1
@@ -47,7 +47,6 @@ asmlinkage unsigned long sys_mmap2( · 46 unmodified lines
4747 int prot, int flags,
4848 int fd, long pgoff);
4949 struct pt_regs;
50−struct sigaction;
5150 asmlinkage long sys_ia64_pipe(void);
5251
5352 /*
arch/m32r/include/asm/signal.h+1−7
@@ -16,13 +16,7 @@ typedef struct { · 15 unmodified lines
1616 unsigned long sig[_NSIG_WORDS];
1717 } sigset_t;
1818
19−struct sigaction {
20− __sighandler_t sa_handler;
21− unsigned long sa_flags;
22− __sigrestore_t sa_restorer;
23− sigset_t sa_mask; /* mask last for extensibility */
24−};
25−
19+#define __ARCH_HAS_SA_RESTORER
2620 #include <asm/sigcontext.h>
2721
2822 #undef __HAVE_ARCH_SIG_BITOPS
arch/m68k/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
2323 __sigrestore_t sa_restorer;
2424 };
2525
26−struct sigaction {
27− __sighandler_t sa_handler;
28− unsigned long sa_flags;
29− __sigrestore_t sa_restorer;
30− sigset_t sa_mask; /* mask last for extensibility */
31−};
26+#define __ARCH_HAS_SA_RESTORER
3227
3328 #include <asm/sigcontext.h>
3429
arch/mips/include/asm/signal.h+2−0
@@ -21,4 +21,6 @@ · 20 unmodified lines
2121 #include <asm/sigcontext.h>
2222 #include <asm/siginfo.h>
2323
24+#define __ARCH_HAS_ODD_SIGACTION
25+
2426 #endif /* _ASM_SIGNAL_H */
arch/mips/include/uapi/asm/signal.h+2−0
@@ -96,11 +96,13 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ · 95 unmodified lines
9696
9797 #include <asm-generic/signal-defs.h>
9898
99+#ifndef __KERNEL__
99100 struct sigaction {
100101 unsigned int sa_flags;
101102 __sighandler_t sa_handler;
102103 sigset_t sa_mask;
103104 };
105+#endif
104106
105107 /* IRIX compatible stack_t */
106108 typedef struct sigaltstack {
arch/mn10300/include/asm/signal.h+1−6
@@ -33,12 +33,7 @@ struct old_sigaction { · 32 unmodified lines
3333 __sigrestore_t sa_restorer;
3434 };
3535
36−struct sigaction {
37− __sighandler_t sa_handler;
38− unsigned long sa_flags;
39− __sigrestore_t sa_restorer;
40− sigset_t sa_mask; /* mask last for extensibility */
41−};
36+#define __ARCH_HAS_SA_RESTORER
4237
4338 #include <asm/sigcontext.h>
4439
arch/parisc/include/asm/signal.h+2−0
@@ -24,11 +24,13 @@ typedef struct { · 23 unmodified lines
2424 unsigned long sig[_NSIG_WORDS];
2525 } sigset_t;
2626
27+#ifndef __KERNEL__
2728 struct sigaction {
2829 __sighandler_t sa_handler;
2930 unsigned long sa_flags;
3031 sigset_t sa_mask; /* mask last for extensibility */
3132 };
33+#endif
3234
3335 #include <asm/sigcontext.h>
3436
arch/powerpc/include/asm/signal.h+1−0
@@ -1,6 +1,7 @@
11 #ifndef _ASM_POWERPC_SIGNAL_H
22 #define _ASM_POWERPC_SIGNAL_H
33
4+#define __ARCH_HAS_SA_RESTORER
45 #include <uapi/asm/signal.h>
56
67 #endif /* _ASM_POWERPC_SIGNAL_H */
arch/powerpc/include/asm/syscalls.h+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
99
1010 struct pt_regs;
1111 struct rtas_args;
12−struct sigaction;
1312
1413 asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,
1514 unsigned long prot, unsigned long flags,
arch/powerpc/include/uapi/asm/signal.h+2−0
@@ -97,12 +97,14 @@ struct old_sigaction { · 96 unmodified lines
9797 __sigrestore_t sa_restorer;
9898 };
9999
100+#ifndef __KERNEL__
100101 struct sigaction {
101102 __sighandler_t sa_handler;
102103 unsigned long sa_flags;
103104 __sigrestore_t sa_restorer;
104105 sigset_t sa_mask; /* mask last for extensibility */
105106 };
107+#endif
106108
107109 typedef struct sigaltstack {
108110 void __user *ss_sp;
arch/s390/include/asm/signal.h+1−7
@@ -28,11 +28,5 @@ struct old_sigaction { · 27 unmodified lines
2828 void (*sa_restorer)(void);
2929 };
3030
31−struct sigaction {
32− __sighandler_t sa_handler;
33− unsigned long sa_flags;
34− void (*sa_restorer)(void);
35− sigset_t sa_mask; /* mask last for extensibility */
36−};
37−
31+#define __ARCH_HAS_SA_RESTORER
3832 #endif
arch/sparc/include/asm/signal.h+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #define SA_STATIC_ALLOC 0x8000
2323
2424 #define __ARCH_HAS_KA_RESTORER
25+#define __ARCH_HAS_SA_RESTORER
2526
2627 #endif /* !(__ASSEMBLY__) */
2728 #endif /* !(__SPARC_SIGNAL_H) */
arch/sparc/include/uapi/asm/signal.h+2−0
@@ -153,12 +153,14 @@ struct sigstack { · 152 unmodified lines
153153
154154 #include <asm-generic/signal-defs.h>
155155
156+#ifndef __KERNEL__
156157 struct __new_sigaction {
157158 __sighandler_t sa_handler;
158159 unsigned long sa_flags;
159160 __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */
160161 __new_sigset_t sa_mask;
161162 };
163+#endif
162164
163165 struct __old_sigaction {
164166 __sighandler_t sa_handler;
arch/sparc/kernel/systbls.h+1−1
@@ -3,8 +3,8 @@ · 2 unmodified lines
33
44 #include <linux/kernel.h>
55 #include <linux/types.h>
6+#include <linux/signal.h>
67 #include <asm/utrap.h>
7−#include <asm/signal.h>
88
99 extern asmlinkage unsigned long sys_getpagesize(void);
1010 extern asmlinkage long sparc_pipe(struct pt_regs *regs);
arch/x86/include/asm/signal.h+3−7
@@ -31,6 +31,9 @@ typedef sigset_t compat_sigset_t; · 30 unmodified lines
3131 #include <uapi/asm/signal.h>
3232 #ifndef __ASSEMBLY__
3333 extern void do_notify_resume(struct pt_regs *, void *, __u32);
34+
35+#define __ARCH_HAS_SA_RESTORER
36+
3437 #ifdef __i386__
3538 struct old_sigaction {
3639 __sighandler_t sa_handler;
@@ -39,13 +42,6 @@ struct old_sigaction { · 2 unmodified lines
3942 __sigrestore_t sa_restorer;
4043 };
4144
42−struct sigaction {
43− __sighandler_t sa_handler;
44− unsigned long sa_flags;
45− __sigrestore_t sa_restorer;
46− sigset_t sa_mask; /* mask last for extensibility */
47−};
48−
4945 #endif /* !__i386__ */
5046 #include <asm/sigcontext.h>
5147
arch/x86/include/uapi/asm/signal.h+2−2
@@ -95,9 +95,9 @@ typedef unsigned long sigset_t; · 94 unmodified lines
9595 #ifndef __ASSEMBLY__
9696
9797
98−#ifdef __i386__
9998 # ifndef __KERNEL__
10099 /* Here we must cater to libcs that poke about in kernel headers. */
100+#ifdef __i386__
101101
102102 struct sigaction {
103103 union {
@@ -112,7 +112,6 @@ struct sigaction { · 8 unmodified lines
112112 #define sa_handler _u._sa_handler
113113 #define sa_sigaction _u._sa_sigaction
114114
115−# endif /* ! __KERNEL__ */
116115 #else /* __i386__ */
117116
118117 struct sigaction {
@@ -123,6 +122,7 @@ struct sigaction { · 4 unmodified lines
123122 };
124123
125124 #endif /* !__i386__ */
125+# endif /* ! __KERNEL__ */
126126
127127 typedef struct sigaltstack {
128128 void __user *ss_sp;
arch/xtensa/include/asm/signal.h+1−6
@@ -15,12 +15,7 @@ · 14 unmodified lines
1515 #include <uapi/asm/signal.h>
1616
1717 #ifndef __ASSEMBLY__
18−struct sigaction {
19− __sighandler_t sa_handler;
20− unsigned long sa_flags;
21− void (*sa_restorer)(void);
22− sigset_t sa_mask; /* mask last for extensibility */
23−};
18+#define __ARCH_HAS_SA_RESTORER
2419
2520 #include <asm/sigcontext.h>
2621
include/linux/signal.h+14−0
@@ -249,6 +249,20 @@ extern void __set_current_blocked(const sigset_t *); · 248 unmodified lines
249249 extern int show_unhandled_signals;
250250 extern int sigsuspend(sigset_t *);
251251
252+struct sigaction {
253+#ifndef __ARCH_HAS_ODD_SIGACTION
254+ __sighandler_t sa_handler;
255+ unsigned long sa_flags;
256+#else
257+ unsigned long sa_flags;
258+ __sighandler_t sa_handler;
259+#endif
260+#ifdef __ARCH_HAS_SA_RESTORER
261+ __sigrestore_t sa_restorer;
262+#endif
263+ sigset_t sa_mask; /* mask last for extensibility */
264+};
265+
252266 struct k_sigaction {
253267 struct sigaction sa;
254268 #ifdef __ARCH_HAS_KA_RESTORER
include/linux/syscalls.h+1−1
@@ -68,11 +68,11 @@ struct sigaltstack; · 67 unmodified lines
6868 #include <linux/types.h>
6969 #include <linux/aio_abi.h>
7070 #include <linux/capability.h>
71+#include <linux/signal.h>
7172 #include <linux/list.h>
7273 #include <linux/bug.h>
7374 #include <linux/sem.h>
7475 #include <asm/siginfo.h>
75−#include <asm/signal.h>
7676 #include <linux/unistd.h>
7777 #include <linux/quota.h>
7878 #include <linux/key.h>
include/uapi/asm-generic/signal.h+6−0
@@ -93,6 +93,11 @@ typedef unsigned long old_sigset_t; · 92 unmodified lines
9393
9494 #include <asm-generic/signal-defs.h>
9595
96+#ifdef SA_RESTORER
97+#define __ARCH_HAS_SA_RESTORER
98+#endif
99+
100+#ifndef __KERNEL__
96101 struct sigaction {
97102 __sighandler_t sa_handler;
98103 unsigned long sa_flags;
@@ -101,6 +106,7 @@ struct sigaction { · 2 unmodified lines
101106 #endif
102107 sigset_t sa_mask; /* mask last for extensibility */
103108 };
109+#endif
104110
105111 typedef struct sigaltstack {
106112 void __user *ss_sp;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t