diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 23:28:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:26:17 +0200 |
| commit | f16ee288545be36cdcc404e9b7c505eb0fe2633c (patch) | |
| tree | b722c16131b0d9dcfdc58f119804c7c18d2558f2 | |
| parent | 68fdc55c48fd2e8f4938a1e815216c25baf8a17e (diff) | |
x86: unify include/asm/siginfo_32/64.h
Same file, except for the 64bit PREAMBLE_SIZE define.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/Kbuild | 2 | ||||
| -rw-r--r-- | include/asm-x86/siginfo.h | 21 | ||||
| -rw-r--r-- | include/asm-x86/siginfo_32.h | 6 | ||||
| -rw-r--r-- | include/asm-x86/siginfo_64.h | 8 |
4 files changed, 9 insertions, 28 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 966a1176a7ce..3decf180107d 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild @@ -39,8 +39,6 @@ unifdef-y += shmbuf_32.h unifdef-y += shmbuf_64.h unifdef-y += sigcontext_32.h unifdef-y += sigcontext_64.h -unifdef-y += siginfo_32.h -unifdef-y += siginfo_64.h unifdef-y += signal_32.h unifdef-y += signal_64.h unifdef-y += stat_32.h diff --git a/include/asm-x86/siginfo.h b/include/asm-x86/siginfo.h index 0b8e4bb47d25..a477bea0c2a1 100644 --- a/include/asm-x86/siginfo.h +++ b/include/asm-x86/siginfo.h @@ -1,13 +1,10 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "siginfo_32.h" -# else -# include "siginfo_64.h" -# endif -#else -# ifdef __i386__ -# include "siginfo_32.h" -# else -# include "siginfo_64.h" -# endif +#ifndef _ASM_X86_SIGINFO_H +#define _ASM_X86_SIGINFO_H + +#ifdef __x86_64__ +# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) +#endif + +#include <asm-generic/siginfo.h> + #endif diff --git a/include/asm-x86/siginfo_32.h b/include/asm-x86/siginfo_32.h deleted file mode 100644 index fe18f98fccfa..000000000000 --- a/include/asm-x86/siginfo_32.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _I386_SIGINFO_H -#define _I386_SIGINFO_H - -#include <asm-generic/siginfo.h> - -#endif diff --git a/include/asm-x86/siginfo_64.h b/include/asm-x86/siginfo_64.h deleted file mode 100644 index d09a1e6e7246..000000000000 --- a/include/asm-x86/siginfo_64.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _X8664_SIGINFO_H -#define _X8664_SIGINFO_H - -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) - -#include <asm-generic/siginfo.h> - -#endif |