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-arm26/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-arm26/signal.h')
| -rw-r--r-- | include/asm-arm26/signal.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-arm26/signal.h b/include/asm-arm26/signal.h index a1aacefa656..dedb2928030 100644 --- a/include/asm-arm26/signal.h +++ b/include/asm-arm26/signal.h | |||
| @@ -117,16 +117,7 @@ typedef unsigned long sigset_t; | |||
| 117 | #define SA_IRQNOMASK 0x08000000 | 117 | #define SA_IRQNOMASK 0x08000000 |
| 118 | #endif | 118 | #endif |
| 119 | 119 | ||
| 120 | #define SIG_BLOCK 0 /* for blocking signals */ | 120 | #include <asm-generic/signal.h> |
| 121 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | ||
| 122 | #define SIG_SETMASK 2 /* for setting the signal mask */ | ||
| 123 | |||
| 124 | /* Type of a signal handler. */ | ||
| 125 | typedef void (*__sighandler_t)(int); | ||
| 126 | |||
| 127 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
| 128 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
| 129 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
| 130 | 121 | ||
| 131 | #ifdef __KERNEL__ | 122 | #ifdef __KERNEL__ |
| 132 | struct old_sigaction { | 123 | struct old_sigaction { |