diff options
| author | Richard Henderson <rth@are.twiddle.net> | 2002-11-01 21:47:10 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@are.twiddle.net> | 2002-11-01 21:47:10 -0800 |
| commit | 68c1e696e73158a85dad22ecae416f3599848be4 (patch) | |
| tree | 01caaf6e06fa20b93237d7e67d1df1dd13ded68d /include | |
| parent | 0630b89dac239da702086531e7706fd9fa1b80b8 (diff) | |
| parent | 31045ad22a434ebf6db3ec88535b811ae8d7a6d7 (diff) | |
Merge are.twiddle.net:/home/rth/BK/linus-2.5
into are.twiddle.net:/home/rth/BK/axp-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/siginfo.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/asm-alpha/siginfo.h b/include/asm-alpha/siginfo.h index 7f54a8019e10..86bcab59c52b 100644 --- a/include/asm-alpha/siginfo.h +++ b/include/asm-alpha/siginfo.h @@ -1,26 +1,11 @@ #ifndef _ALPHA_SIGINFO_H #define _ALPHA_SIGINFO_H -#define SI_PAD_SIZE ((SI_MAX_SIZE/sizeof(int)) - 4) +#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) +#define __ARCH_SI_TRAPNO -#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4) - -#define HAVE_ARCH_COPY_SIGINFO +#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4) #include <asm-generic/siginfo.h> -#ifdef __KERNEL__ -#include <linux/string.h> - -extern inline void copy_siginfo(siginfo_t *to, siginfo_t *from) -{ - if (from->si_code < 0) - memcpy(to, from, sizeof(siginfo_t)); - else - /* _sigchld is currently the largest know union member */ - memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld)); -} - -#endif /* __KERNEL__ */ - #endif |