From f16ee288545be36cdcc404e9b7c505eb0fe2633c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Mon, 15 Oct 2007 23:28:21 +0200 Subject: [PATCH] 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> --- include/asm-x86/Kbuild | 2 -- include/asm-x86/siginfo.h | 21 +++++++++------------ include/asm-x86/siginfo_32.h | 6 ------ include/asm-x86/siginfo_64.h | 8 -------- 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 include/asm-x86/siginfo_32.h delete mode 100644 include/asm-x86/siginfo_64.h diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 966a1176a7ce0..3decf180107d1 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 0b8e4bb47d25b..a477bea0c2a12 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 fe18f98fccfa8..0000000000000 --- 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 d09a1e6e72462..0000000000000 --- 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 -- GitLab