diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-05-04 00:40:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:33:15 -0400 |
commit | b1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68 (patch) | |
tree | d34b412e61ff720926da836ff989d1c821b5ef1b /include/asm-sparc/signal.h | |
parent | 0555985d046348b39e44ff1da2719d73409d7981 (diff) |
[PATCH] asm/signal.h unification
New file - asm-generic/signal.h. Contains declarations of
__sighandler_t, __sigrestore_t, SIG_DFL, SIG_IGN, SIG_ERR and default
definitions of SIG_BLOCK, SIG_UNBLOCK and SIG_SETMASK.
asm-*/signal.h switched to including it. The only exception is
asm-parisc/signal.h that wants its own declaration of __sighandler_t;
that one is left as-is.
asm-ppc64/signal.h required one more thing - unlike everybody else it
used __sigrestorer_t instead of usual __sigrestore_t. PPC64 switched to
common spelling.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sparc/signal.h')
-rw-r--r-- | include/asm-sparc/signal.h | 11 |
1 files changed, 1 insertions, 10 deletions
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 { |