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-sparc/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-sparc/signal.h')
| -rw-r--r-- | include/asm-sparc/signal.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-sparc/signal.h b/include/asm-sparc/signal.h index f792e10e704f..aa9960ad0ca9 100644 --- a/include/asm-sparc/signal.h +++ b/include/asm-sparc/signal.h | |||
| @@ -174,16 +174,7 @@ struct sigstack { | |||
| 174 | #define SA_STATIC_ALLOC 0x80 | 174 | #define SA_STATIC_ALLOC 0x80 |
| 175 | #endif | 175 | #endif |
| 176 | 176 | ||
| 177 | /* Type of a signal handler. */ | 177 | #include <asm-generic/signal.h> |
| 178 | #ifdef __KERNEL__ | ||
| 179 | typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *); | ||
| 180 | #else | ||
| 181 | typedef void (*__sighandler_t)(int); | ||
| 182 | #endif | ||
| 183 | |||
| 184 | #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ | ||
| 185 | #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ | ||
| 186 | #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ | ||
| 187 | 178 | ||
| 188 | #ifdef __KERNEL__ | 179 | #ifdef __KERNEL__ |
| 189 | struct __new_sigaction { | 180 | struct __new_sigaction { |