diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 15:48:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 15:48:52 -0800 |
| commit | 7a280cf512053137a37da2801eac73a8842fa50d (patch) | |
| tree | 54d601bb7c72462a59f7ab284418f5046d0542c4 /arch/x86/include/uapi/asm/siginfo.h | |
| parent | 4939e27d46fee2609f2112f85f7f7cbd952075dc (diff) | |
| parent | af170c5061dd78512c469e6e2d211980cdb2c193 (diff) | |
Merge tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux-headers
Pull x86 UAPI disintegration from David Howells.
This is the scripted disintegration of the uapi headers for x86, now
that most of the x86 updates for 3.8 are hopefully merged.
* tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Diffstat (limited to 'arch/x86/include/uapi/asm/siginfo.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/siginfo.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/siginfo.h b/arch/x86/include/uapi/asm/siginfo.h new file mode 100644 index 00000000000..34c47b3341c --- /dev/null +++ b/arch/x86/include/uapi/asm/siginfo.h @@ -0,0 +1,16 @@ +#ifndef _ASM_X86_SIGINFO_H +#define _ASM_X86_SIGINFO_H + +#ifdef __x86_64__ +# ifdef __ILP32__ /* x32 */ +typedef long long __kernel_si_clock_t __attribute__((aligned(4))); +# define __ARCH_SI_CLOCK_T __kernel_si_clock_t +# define __ARCH_SI_ATTRIBUTES __attribute__((aligned(8))) +# else /* x86-64 */ +# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) +# endif +#endif + +#include <asm-generic/siginfo.h> + +#endif /* _ASM_X86_SIGINFO_H */ |