diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-x86_64/siginfo.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/siginfo.h')
| -rw-r--r-- | include/asm-x86_64/siginfo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/siginfo.h b/include/asm-x86_64/siginfo.h index 7bc15985f124..d09a1e6e7246 100644 --- a/include/asm-x86_64/siginfo.h +++ b/include/asm-x86_64/siginfo.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) | 4 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) |
| 5 | 5 | ||
| 6 | #define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4) | ||
| 7 | |||
| 8 | #include <asm-generic/siginfo.h> | 6 | #include <asm-generic/siginfo.h> |
| 9 | 7 | ||
| 10 | #endif | 8 | #endif |