diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /include/asm-alpha/signal.h | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-alpha/signal.h')
| -rw-r--r-- | include/asm-alpha/signal.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-alpha/signal.h b/include/asm-alpha/signal.h index 4e0842b415aa..1a2c52a056fb 100644 --- a/include/asm-alpha/signal.h +++ b/include/asm-alpha/signal.h | |||
| @@ -113,16 +113,7 @@ typedef unsigned long sigset_t; | |||
| 113 | #define SIG_UNBLOCK 2 /* for unblocking signals */ | 113 | #define SIG_UNBLOCK 2 /* for unblocking signals */ |
| 114 | #define SIG_SETMASK 3 /* for setting the signal mask */ | 114 | #define SIG_SETMASK 3 /* for setting the signal mask */ |
| 115 | 115 | ||
| 116 | /* Type of a signal handler. */ | 116 | #include <asm-generic/signal.h> |
| 117 | typedef void __signalfn_t(int); | ||
| 118 | typedef __signalfn_t __user *__sighandler_t; | ||
| 119 | |||
| 120 | typedef void __restorefn_t(void); | ||
| 121 | typedef __restorefn_t __user *__sigrestore_t; | ||
| 122 | |||
| 123 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
| 124 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
| 125 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
| 126 | 117 | ||
| 127 | #ifdef __KERNEL__ | 118 | #ifdef __KERNEL__ |
| 128 | struct osf_sigaction { | 119 | struct osf_sigaction { |