aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/signal.h
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-05-04 00:40:12 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 10:33:15 -0400
commitb1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68 (patch)
treed34b412e61ff720926da836ff989d1c821b5ef1b /include/asm-sparc64/signal.h
parent0555985d046348b39e44ff1da2719d73409d7981 (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-sparc64/signal.h')
-rw-r--r--include/asm-sparc64/signal.h16
1 files changed, 1 insertions, 15 deletions
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__
182typedef void __signalfn_t(int);
183typedef __signalfn_t __user *__sighandler_t;
184
185typedef void __restorefn_t(void);
186typedef __restorefn_t __user *__sigrestore_t;
187#else
188typedef void (*__sighandler_t)(int);
189typedef 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
196struct __new_sigaction { 182struct __new_sigaction {
197 __sighandler_t sa_handler; 183 __sighandler_t sa_handler;