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