aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/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-mips/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-mips/signal.h')
-rw-r--r--include/asm-mips/signal.h9
1 files changed, 1 insertions, 8 deletions
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. */
108typedef 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
115struct sigaction { 108struct sigaction {
116 unsigned int sa_flags; 109 unsigned int sa_flags;