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-x86_64/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-x86_64/signal.h')
-rw-r--r-- | include/asm-x86_64/signal.h | 14 |
1 files changed, 1 insertions, 13 deletions
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; |