diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-alpha/signal.h | 11 | ||||
-rw-r--r-- | include/asm-arm/signal.h | 15 | ||||
-rw-r--r-- | include/asm-arm26/signal.h | 11 | ||||
-rw-r--r-- | include/asm-cris/signal.h | 11 | ||||
-rw-r--r-- | include/asm-frv/signal.h | 11 | ||||
-rw-r--r-- | include/asm-generic/signal.h | 21 | ||||
-rw-r--r-- | include/asm-h8300/signal.h | 11 | ||||
-rw-r--r-- | include/asm-i386/signal.h | 15 | ||||
-rw-r--r-- | include/asm-ia64/signal.h | 11 | ||||
-rw-r--r-- | include/asm-m32r/signal.h | 15 | ||||
-rw-r--r-- | include/asm-m68k/signal.h | 15 | ||||
-rw-r--r-- | include/asm-m68knommu/signal.h | 11 | ||||
-rw-r--r-- | include/asm-mips/signal.h | 9 | ||||
-rw-r--r-- | include/asm-ppc/signal.h | 15 | ||||
-rw-r--r-- | include/asm-ppc64/signal.h | 20 | ||||
-rw-r--r-- | include/asm-s390/signal.h | 11 | ||||
-rw-r--r-- | include/asm-sh/signal.h | 11 | ||||
-rw-r--r-- | include/asm-sh64/signal.h | 11 | ||||
-rw-r--r-- | include/asm-sparc/signal.h | 11 | ||||
-rw-r--r-- | include/asm-sparc64/signal.h | 16 | ||||
-rw-r--r-- | include/asm-v850/signal.h | 12 | ||||
-rw-r--r-- | include/asm-x86_64/signal.h | 14 |
22 files changed, 46 insertions, 242 deletions
diff --git a/include/asm-alpha/signal.h b/include/asm-alpha/signal.h index 4e0842b415aa..1a2c52a056fb 100644 --- a/include/asm-alpha/signal.h +++ b/include/asm-alpha/signal.h | |||
@@ -113,16 +113,7 @@ typedef unsigned long sigset_t; | |||
113 | #define SIG_UNBLOCK 2 /* for unblocking signals */ | 113 | #define SIG_UNBLOCK 2 /* for unblocking signals */ |
114 | #define SIG_SETMASK 3 /* for setting the signal mask */ | 114 | #define SIG_SETMASK 3 /* for setting the signal mask */ |
115 | 115 | ||
116 | /* Type of a signal handler. */ | 116 | #include <asm-generic/signal.h> |
117 | typedef void __signalfn_t(int); | ||
118 | typedef __signalfn_t __user *__sighandler_t; | ||
119 | |||
120 | typedef void __restorefn_t(void); | ||
121 | typedef __restorefn_t __user *__sigrestore_t; | ||
122 | |||
123 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
124 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
125 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
126 | 117 | ||
127 | #ifdef __KERNEL__ | 118 | #ifdef __KERNEL__ |
128 | struct osf_sigaction { | 119 | struct osf_sigaction { |
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h index b860dc3c5dc7..46e69ae395af 100644 --- a/include/asm-arm/signal.h +++ b/include/asm-arm/signal.h | |||
@@ -117,20 +117,7 @@ typedef unsigned long sigset_t; | |||
117 | #define SA_IRQNOMASK 0x08000000 | 117 | #define SA_IRQNOMASK 0x08000000 |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | #define SIG_BLOCK 0 /* for blocking signals */ | 120 | #include <asm-generic/signal.h> |
121 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
122 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
123 | |||
124 | /* Type of a signal handler. */ | ||
125 | typedef void __signalfn_t(int); | ||
126 | typedef __signalfn_t __user *__sighandler_t; | ||
127 | |||
128 | typedef void __restorefn_t(void); | ||
129 | typedef __restorefn_t __user *__sigrestore_t; | ||
130 | |||
131 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
132 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
133 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
134 | 121 | ||
135 | #ifdef __KERNEL__ | 122 | #ifdef __KERNEL__ |
136 | struct old_sigaction { | 123 | struct old_sigaction { |
diff --git a/include/asm-arm26/signal.h b/include/asm-arm26/signal.h index a1aacefa6562..dedb29280303 100644 --- a/include/asm-arm26/signal.h +++ b/include/asm-arm26/signal.h | |||
@@ -117,16 +117,7 @@ typedef unsigned long sigset_t; | |||
117 | #define SA_IRQNOMASK 0x08000000 | 117 | #define SA_IRQNOMASK 0x08000000 |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | #define SIG_BLOCK 0 /* for blocking signals */ | 120 | #include <asm-generic/signal.h> |
121 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
122 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
123 | |||
124 | /* Type of a signal handler. */ | ||
125 | typedef void (*__sighandler_t)(int); | ||
126 | |||
127 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
128 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
129 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
130 | 121 | ||
131 | #ifdef __KERNEL__ | 122 | #ifdef __KERNEL__ |
132 | struct old_sigaction { | 123 | struct old_sigaction { |
diff --git a/include/asm-cris/signal.h b/include/asm-cris/signal.h index 2330769ba55d..dfe039593a78 100644 --- a/include/asm-cris/signal.h +++ b/include/asm-cris/signal.h | |||
@@ -108,16 +108,7 @@ typedef unsigned long sigset_t; | |||
108 | #define MINSIGSTKSZ 2048 | 108 | #define MINSIGSTKSZ 2048 |
109 | #define SIGSTKSZ 8192 | 109 | #define SIGSTKSZ 8192 |
110 | 110 | ||
111 | #define SIG_BLOCK 0 /* for blocking signals */ | 111 | #include <asm-generic/signal.h> |
112 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
113 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
114 | |||
115 | /* Type of a signal handler. */ | ||
116 | typedef void (*__sighandler_t)(int); | ||
117 | |||
118 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
119 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
120 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
121 | 112 | ||
122 | #ifdef __KERNEL__ | 113 | #ifdef __KERNEL__ |
123 | struct old_sigaction { | 114 | struct old_sigaction { |
diff --git a/include/asm-frv/signal.h b/include/asm-frv/signal.h index c930bb176875..d407bde57eca 100644 --- a/include/asm-frv/signal.h +++ b/include/asm-frv/signal.h | |||
@@ -107,16 +107,7 @@ typedef unsigned long sigset_t; | |||
107 | #define MINSIGSTKSZ 2048 | 107 | #define MINSIGSTKSZ 2048 |
108 | #define SIGSTKSZ 8192 | 108 | #define SIGSTKSZ 8192 |
109 | 109 | ||
110 | #define SIG_BLOCK 0 /* for blocking signals */ | 110 | #include <asm-generic/signal.h> |
111 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
112 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
113 | |||
114 | /* Type of a signal handler. */ | ||
115 | typedef void (*__sighandler_t)(int); | ||
116 | |||
117 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
118 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
119 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
120 | 111 | ||
121 | #ifdef __KERNEL__ | 112 | #ifdef __KERNEL__ |
122 | struct old_sigaction { | 113 | struct old_sigaction { |
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h new file mode 100644 index 000000000000..9418d6e9b8cd --- /dev/null +++ b/include/asm-generic/signal.h | |||
@@ -0,0 +1,21 @@ | |||
1 | #ifndef SIG_BLOCK | ||
2 | #define SIG_BLOCK 0 /* for blocking signals */ | ||
3 | #endif | ||
4 | #ifndef SIG_UNBLOCK | ||
5 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
6 | #endif | ||
7 | #ifndef SIG_SETMASK | ||
8 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
9 | #endif | ||
10 | |||
11 | #ifndef __ASSEMBLY__ | ||
12 | typedef void __signalfn_t(int); | ||
13 | typedef __signalfn_t __user *__sighandler_t; | ||
14 | |||
15 | typedef void __restorefn_t(void); | ||
16 | typedef __restorefn_t __user *__sigrestore_t; | ||
17 | |||
18 | #define SIG_DFL ((__force __sighandler_t)0) /* default signal handling */ | ||
19 | #define SIG_IGN ((__force __sighandler_t)1) /* ignore signal */ | ||
20 | #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ | ||
21 | #endif | ||
diff --git a/include/asm-h8300/signal.h b/include/asm-h8300/signal.h index ac3e01bd6396..8eccdc176163 100644 --- a/include/asm-h8300/signal.h +++ b/include/asm-h8300/signal.h | |||
@@ -107,16 +107,7 @@ typedef unsigned long sigset_t; | |||
107 | #define MINSIGSTKSZ 2048 | 107 | #define MINSIGSTKSZ 2048 |
108 | #define SIGSTKSZ 8192 | 108 | #define SIGSTKSZ 8192 |
109 | 109 | ||
110 | #define SIG_BLOCK 0 /* for blocking signals */ | 110 | #include <asm-generic/signal.h> |
111 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
112 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
113 | |||
114 | /* Type of a signal handler. */ | ||
115 | typedef void (*__sighandler_t)(int); | ||
116 | |||
117 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
118 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
119 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
120 | 111 | ||
121 | #ifdef __KERNEL__ | 112 | #ifdef __KERNEL__ |
122 | struct old_sigaction { | 113 | struct old_sigaction { |
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h index 0f082bd1c455..cbb47d34aa31 100644 --- a/include/asm-i386/signal.h +++ b/include/asm-i386/signal.h | |||
@@ -110,20 +110,7 @@ typedef unsigned long sigset_t; | |||
110 | #define MINSIGSTKSZ 2048 | 110 | #define MINSIGSTKSZ 2048 |
111 | #define SIGSTKSZ 8192 | 111 | #define SIGSTKSZ 8192 |
112 | 112 | ||
113 | #define SIG_BLOCK 0 /* for blocking signals */ | 113 | #include <asm-generic/signal.h> |
114 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
115 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
116 | |||
117 | /* Type of a signal handler. */ | ||
118 | typedef void __signalfn_t(int); | ||
119 | typedef __signalfn_t __user *__sighandler_t; | ||
120 | |||
121 | typedef void __restorefn_t(void); | ||
122 | typedef __restorefn_t __user *__sigrestore_t; | ||
123 | |||
124 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
125 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
126 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
127 | 114 | ||
128 | #ifdef __KERNEL__ | 115 | #ifdef __KERNEL__ |
129 | struct old_sigaction { | 116 | struct old_sigaction { |
diff --git a/include/asm-ia64/signal.h b/include/asm-ia64/signal.h index 85a577ae9146..608168d713d3 100644 --- a/include/asm-ia64/signal.h +++ b/include/asm-ia64/signal.h | |||
@@ -118,13 +118,7 @@ | |||
118 | 118 | ||
119 | #endif /* __KERNEL__ */ | 119 | #endif /* __KERNEL__ */ |
120 | 120 | ||
121 | #define SIG_BLOCK 0 /* for blocking signals */ | 121 | #include <asm-generic/signal.h> |
122 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
123 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
124 | |||
125 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
126 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
127 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
128 | 122 | ||
129 | # ifndef __ASSEMBLY__ | 123 | # ifndef __ASSEMBLY__ |
130 | 124 | ||
@@ -133,9 +127,6 @@ | |||
133 | /* Avoid too many header ordering problems. */ | 127 | /* Avoid too many header ordering problems. */ |
134 | struct siginfo; | 128 | struct siginfo; |
135 | 129 | ||
136 | /* Type of a signal handler. */ | ||
137 | typedef void __user (*__sighandler_t)(int); | ||
138 | |||
139 | typedef struct sigaltstack { | 130 | typedef struct sigaltstack { |
140 | void __user *ss_sp; | 131 | void __user *ss_sp; |
141 | int ss_flags; | 132 | int ss_flags; |
diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h index 6e55fd421883..95f69b191953 100644 --- a/include/asm-m32r/signal.h +++ b/include/asm-m32r/signal.h | |||
@@ -114,20 +114,7 @@ typedef unsigned long sigset_t; | |||
114 | #define MINSIGSTKSZ 2048 | 114 | #define MINSIGSTKSZ 2048 |
115 | #define SIGSTKSZ 8192 | 115 | #define SIGSTKSZ 8192 |
116 | 116 | ||
117 | #define SIG_BLOCK 0 /* for blocking signals */ | 117 | #include <asm-generic/signal.h> |
118 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
119 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
120 | |||
121 | /* Type of a signal handler. */ | ||
122 | typedef void __signalfn_t(int); | ||
123 | typedef __signalfn_t __user *__sighandler_t; | ||
124 | |||
125 | typedef void __restorefn_t(void); | ||
126 | typedef __restorefn_t __user *__sigrestore_t; | ||
127 | |||
128 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
129 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
130 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
131 | 118 | ||
132 | #ifdef __KERNEL__ | 119 | #ifdef __KERNEL__ |
133 | struct old_sigaction { | 120 | struct old_sigaction { |
diff --git a/include/asm-m68k/signal.h b/include/asm-m68k/signal.h index 1d016e9f19bf..a0cdf9082372 100644 --- a/include/asm-m68k/signal.h +++ b/include/asm-m68k/signal.h | |||
@@ -105,29 +105,20 @@ typedef unsigned long sigset_t; | |||
105 | #define MINSIGSTKSZ 2048 | 105 | #define MINSIGSTKSZ 2048 |
106 | #define SIGSTKSZ 8192 | 106 | #define SIGSTKSZ 8192 |
107 | 107 | ||
108 | #define SIG_BLOCK 0 /* for blocking signals */ | 108 | #include <asm-generic/signal.h> |
109 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
110 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
111 | |||
112 | /* Type of a signal handler. */ | ||
113 | typedef void (*__sighandler_t)(int); | ||
114 | |||
115 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
116 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
117 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
118 | 109 | ||
119 | #ifdef __KERNEL__ | 110 | #ifdef __KERNEL__ |
120 | struct old_sigaction { | 111 | struct old_sigaction { |
121 | __sighandler_t sa_handler; | 112 | __sighandler_t sa_handler; |
122 | old_sigset_t sa_mask; | 113 | old_sigset_t sa_mask; |
123 | unsigned long sa_flags; | 114 | unsigned long sa_flags; |
124 | void (*sa_restorer)(void); | 115 | __sigrestore_t sa_restorer; |
125 | }; | 116 | }; |
126 | 117 | ||
127 | struct sigaction { | 118 | struct sigaction { |
128 | __sighandler_t sa_handler; | 119 | __sighandler_t sa_handler; |
129 | unsigned long sa_flags; | 120 | unsigned long sa_flags; |
130 | void (*sa_restorer)(void); | 121 | __sigrestore_t sa_restorer; |
131 | sigset_t sa_mask; /* mask last for extensibility */ | 122 | sigset_t sa_mask; /* mask last for extensibility */ |
132 | }; | 123 | }; |
133 | 124 | ||
diff --git a/include/asm-m68knommu/signal.h b/include/asm-m68knommu/signal.h index 37c9c8a024ba..1d13187f6062 100644 --- a/include/asm-m68knommu/signal.h +++ b/include/asm-m68knommu/signal.h | |||
@@ -105,16 +105,7 @@ typedef unsigned long sigset_t; | |||
105 | #define MINSIGSTKSZ 2048 | 105 | #define MINSIGSTKSZ 2048 |
106 | #define SIGSTKSZ 8192 | 106 | #define SIGSTKSZ 8192 |
107 | 107 | ||
108 | #define SIG_BLOCK 0 /* for blocking signals */ | 108 | #include <asm-generic/signal.h> |
109 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
110 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
111 | |||
112 | /* Type of a signal handler. */ | ||
113 | typedef void (*__sighandler_t)(int); | ||
114 | |||
115 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
116 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
117 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
118 | 109 | ||
119 | #ifdef __KERNEL__ | 110 | #ifdef __KERNEL__ |
120 | struct old_sigaction { | 111 | struct old_sigaction { |
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h index d81356731eb6..f2c470f1d369 100644 --- a/include/asm-mips/signal.h +++ b/include/asm-mips/signal.h | |||
@@ -103,14 +103,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ | |||
103 | #define SIG_SETMASK 3 /* for setting the signal mask */ | 103 | #define SIG_SETMASK 3 /* for setting the signal mask */ |
104 | #define SIG_SETMASK32 256 /* Goodie from SGI for BSD compatibility: | 104 | #define SIG_SETMASK32 256 /* Goodie from SGI for BSD compatibility: |
105 | set only the low 32 bit of the sigset. */ | 105 | set only the low 32 bit of the sigset. */ |
106 | 106 | #include <asm-generic/signal.h> | |
107 | /* Type of a signal handler. */ | ||
108 | typedef void (*__sighandler_t)(int); | ||
109 | |||
110 | /* Fake signal functions */ | ||
111 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
112 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
113 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
114 | 107 | ||
115 | struct sigaction { | 108 | struct sigaction { |
116 | unsigned int sa_flags; | 109 | unsigned int sa_flags; |
diff --git a/include/asm-ppc/signal.h b/include/asm-ppc/signal.h index d890dabd5a69..caf6ede3710f 100644 --- a/include/asm-ppc/signal.h +++ b/include/asm-ppc/signal.h | |||
@@ -100,20 +100,7 @@ typedef struct { | |||
100 | #define MINSIGSTKSZ 2048 | 100 | #define MINSIGSTKSZ 2048 |
101 | #define SIGSTKSZ 8192 | 101 | #define SIGSTKSZ 8192 |
102 | 102 | ||
103 | #define SIG_BLOCK 0 /* for blocking signals */ | 103 | #include <asm-generic/signal.h> |
104 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
105 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
106 | |||
107 | /* Type of a signal handler. */ | ||
108 | typedef void __signalfn_t(int); | ||
109 | typedef __signalfn_t __user *__sighandler_t; | ||
110 | |||
111 | typedef void __restorefn_t(void); | ||
112 | typedef __restorefn_t __user *__sigrestore_t; | ||
113 | |||
114 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
115 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
116 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
117 | 104 | ||
118 | struct old_sigaction { | 105 | struct old_sigaction { |
119 | __sighandler_t sa_handler; | 106 | __sighandler_t sa_handler; |
diff --git a/include/asm-ppc64/signal.h b/include/asm-ppc64/signal.h index a2d7bbb4befd..432df7dd355d 100644 --- a/include/asm-ppc64/signal.h +++ b/include/asm-ppc64/signal.h | |||
@@ -97,33 +97,19 @@ typedef struct { | |||
97 | #define MINSIGSTKSZ 2048 | 97 | #define MINSIGSTKSZ 2048 |
98 | #define SIGSTKSZ 8192 | 98 | #define SIGSTKSZ 8192 |
99 | 99 | ||
100 | #define SIG_BLOCK 0 /* for blocking signals */ | 100 | #include <asm-generic/signal.h> |
101 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
102 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
103 | |||
104 | /* Type of a signal handler. */ | ||
105 | typedef void __sigfunction(int); | ||
106 | typedef __sigfunction __user * __sighandler_t; | ||
107 | |||
108 | /* Type of the restorer function */ | ||
109 | typedef void __sigrestorer(void); | ||
110 | typedef __sigrestorer __user * __sigrestorer_t; | ||
111 | |||
112 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
113 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
114 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
115 | 101 | ||
116 | struct old_sigaction { | 102 | struct old_sigaction { |
117 | __sighandler_t sa_handler; | 103 | __sighandler_t sa_handler; |
118 | old_sigset_t sa_mask; | 104 | old_sigset_t sa_mask; |
119 | unsigned long sa_flags; | 105 | unsigned long sa_flags; |
120 | __sigrestorer_t sa_restorer; | 106 | __sigrestore_t sa_restorer; |
121 | }; | 107 | }; |
122 | 108 | ||
123 | struct sigaction { | 109 | struct sigaction { |
124 | __sighandler_t sa_handler; | 110 | __sighandler_t sa_handler; |
125 | unsigned long sa_flags; | 111 | unsigned long sa_flags; |
126 | __sigrestorer_t sa_restorer; | 112 | __sigrestore_t sa_restorer; |
127 | sigset_t sa_mask; /* mask last for extensibility */ | 113 | sigset_t sa_mask; /* mask last for extensibility */ |
128 | }; | 114 | }; |
129 | 115 | ||
diff --git a/include/asm-s390/signal.h b/include/asm-s390/signal.h index bfed83a818cc..3d6e11c6c1fd 100644 --- a/include/asm-s390/signal.h +++ b/include/asm-s390/signal.h | |||
@@ -117,16 +117,7 @@ typedef unsigned long sigset_t; | |||
117 | #define MINSIGSTKSZ 2048 | 117 | #define MINSIGSTKSZ 2048 |
118 | #define SIGSTKSZ 8192 | 118 | #define SIGSTKSZ 8192 |
119 | 119 | ||
120 | #define SIG_BLOCK 0 /* for blocking signals */ | 120 | #include <asm-generic/signal.h> |
121 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
122 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
123 | |||
124 | /* Type of a signal handler. */ | ||
125 | typedef void (*__sighandler_t)(int); | ||
126 | |||
127 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
128 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
129 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
130 | 121 | ||
131 | #ifdef __KERNEL__ | 122 | #ifdef __KERNEL__ |
132 | struct old_sigaction { | 123 | struct old_sigaction { |
diff --git a/include/asm-sh/signal.h b/include/asm-sh/signal.h index 29f1ac1bf4df..d6e8eb0e65c7 100644 --- a/include/asm-sh/signal.h +++ b/include/asm-sh/signal.h | |||
@@ -108,16 +108,7 @@ typedef unsigned long sigset_t; | |||
108 | #define MINSIGSTKSZ 2048 | 108 | #define MINSIGSTKSZ 2048 |
109 | #define SIGSTKSZ 8192 | 109 | #define SIGSTKSZ 8192 |
110 | 110 | ||
111 | #define SIG_BLOCK 0 /* for blocking signals */ | 111 | #include <asm-generic/signal.h> |
112 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
113 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
114 | |||
115 | /* Type of a signal handler. */ | ||
116 | typedef void (*__sighandler_t)(int); | ||
117 | |||
118 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
119 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
120 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
121 | 112 | ||
122 | #ifdef __KERNEL__ | 113 | #ifdef __KERNEL__ |
123 | struct old_sigaction { | 114 | struct old_sigaction { |
diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h index 864c94ecc98c..2400dc688a65 100644 --- a/include/asm-sh64/signal.h +++ b/include/asm-sh64/signal.h | |||
@@ -107,16 +107,7 @@ typedef struct { | |||
107 | #define MINSIGSTKSZ 2048 | 107 | #define MINSIGSTKSZ 2048 |
108 | #define SIGSTKSZ THREAD_SIZE | 108 | #define SIGSTKSZ THREAD_SIZE |
109 | 109 | ||
110 | #define SIG_BLOCK 0 /* for blocking signals */ | 110 | #include <asm-generic/signal.h> |
111 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
112 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
113 | |||
114 | /* Type of a signal handler. */ | ||
115 | typedef void (*__sighandler_t)(int); | ||
116 | |||
117 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
118 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
119 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
120 | 111 | ||
121 | #ifdef __KERNEL__ | 112 | #ifdef __KERNEL__ |
122 | struct old_sigaction { | 113 | struct old_sigaction { |
diff --git a/include/asm-sparc/signal.h b/include/asm-sparc/signal.h index f792e10e704f..aa9960ad0ca9 100644 --- a/include/asm-sparc/signal.h +++ b/include/asm-sparc/signal.h | |||
@@ -174,16 +174,7 @@ struct sigstack { | |||
174 | #define SA_STATIC_ALLOC 0x80 | 174 | #define SA_STATIC_ALLOC 0x80 |
175 | #endif | 175 | #endif |
176 | 176 | ||
177 | /* Type of a signal handler. */ | 177 | #include <asm-generic/signal.h> |
178 | #ifdef __KERNEL__ | ||
179 | typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *); | ||
180 | #else | ||
181 | typedef void (*__sighandler_t)(int); | ||
182 | #endif | ||
183 | |||
184 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
185 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
186 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
187 | 178 | ||
188 | #ifdef __KERNEL__ | 179 | #ifdef __KERNEL__ |
189 | struct __new_sigaction { | 180 | struct __new_sigaction { |
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h index 466d021d7038..becdf1bc5924 100644 --- a/include/asm-sparc64/signal.h +++ b/include/asm-sparc64/signal.h | |||
@@ -177,21 +177,7 @@ struct sigstack { | |||
177 | #define SA_STATIC_ALLOC 0x80 | 177 | #define SA_STATIC_ALLOC 0x80 |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | /* Type of a signal handler. */ | 180 | #include <asm-generic/signal.h> |
181 | #ifdef __KERNEL__ | ||
182 | typedef void __signalfn_t(int); | ||
183 | typedef __signalfn_t __user *__sighandler_t; | ||
184 | |||
185 | typedef void __restorefn_t(void); | ||
186 | typedef __restorefn_t __user *__sigrestore_t; | ||
187 | #else | ||
188 | typedef void (*__sighandler_t)(int); | ||
189 | typedef void (*__sigrestore_t)(void); | ||
190 | #endif | ||
191 | |||
192 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
193 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
194 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
195 | 181 | ||
196 | struct __new_sigaction { | 182 | struct __new_sigaction { |
197 | __sighandler_t sa_handler; | 183 | __sighandler_t sa_handler; |
diff --git a/include/asm-v850/signal.h b/include/asm-v850/signal.h index ec3566c875d9..cb52caa69925 100644 --- a/include/asm-v850/signal.h +++ b/include/asm-v850/signal.h | |||
@@ -110,17 +110,7 @@ typedef unsigned long sigset_t; | |||
110 | #define MINSIGSTKSZ 2048 | 110 | #define MINSIGSTKSZ 2048 |
111 | #define SIGSTKSZ 8192 | 111 | #define SIGSTKSZ 8192 |
112 | 112 | ||
113 | #define SIG_BLOCK 0 /* for blocking signals */ | 113 | #include <asm-generic/signal.h> |
114 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
115 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
116 | |||
117 | /* Type of a signal handler. */ | ||
118 | typedef void (*__sighandler_t)(int); | ||
119 | |||
120 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
121 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
122 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
123 | |||
124 | 114 | ||
125 | #ifdef __KERNEL__ | 115 | #ifdef __KERNEL__ |
126 | 116 | ||
diff --git a/include/asm-x86_64/signal.h b/include/asm-x86_64/signal.h index 4987ad8082ba..fe9b96d94815 100644 --- a/include/asm-x86_64/signal.h +++ b/include/asm-x86_64/signal.h | |||
@@ -116,21 +116,9 @@ typedef unsigned long sigset_t; | |||
116 | #define MINSIGSTKSZ 2048 | 116 | #define MINSIGSTKSZ 2048 |
117 | #define SIGSTKSZ 8192 | 117 | #define SIGSTKSZ 8192 |
118 | 118 | ||
119 | #define SIG_BLOCK 0 /* for blocking signals */ | 119 | #include <asm-generic/signal.h> |
120 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
121 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
122 | 120 | ||
123 | #ifndef __ASSEMBLY__ | 121 | #ifndef __ASSEMBLY__ |
124 | /* Type of a signal handler. */ | ||
125 | typedef void __signalfn_t(int); | ||
126 | typedef __signalfn_t __user *__sighandler_t; | ||
127 | |||
128 | typedef void __restorefn_t(void); | ||
129 | typedef __restorefn_t __user *__sigrestore_t; | ||
130 | |||
131 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
132 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
133 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
134 | 122 | ||
135 | struct sigaction { | 123 | struct sigaction { |
136 | __sighandler_t sa_handler; | 124 | __sighandler_t sa_handler; |