diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-05-04 05:40:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:33:15 -0700 |
| commit | b1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68 (patch) | |
| tree | d34b412e61ff720926da836ff989d1c821b5ef1b /include/asm-i386/signal.h | |
| parent | 0555985d046348b39e44ff1da2719d73409d7981 (diff) | |
| download | op-kernel-dev-b1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68.zip op-kernel-dev-b1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68.tar.gz | |
[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-i386/signal.h')
| -rw-r--r-- | include/asm-i386/signal.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h index 0f082bd..cbb47d3 100644 --- a/include/asm-i386/signal.h +++ b/include/asm-i386/signal.h @@ -110,20 +110,7 @@ typedef unsigned long sigset_t; #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 -#define SIG_BLOCK 0 /* for blocking signals */ -#define SIG_UNBLOCK 1 /* for unblocking signals */ -#define SIG_SETMASK 2 /* for setting the signal mask */ - -/* Type of a signal handler. */ -typedef void __signalfn_t(int); -typedef __signalfn_t __user *__sighandler_t; - -typedef void __restorefn_t(void); -typedef __restorefn_t __user *__sigrestore_t; - -#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ +#include <asm-generic/signal.h> #ifdef __KERNEL__ struct old_sigaction { |
