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>

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 966a1176a7ce080165a72c4950c99f9273b79d4e..3decf180107d1a63a5014a03b826d4bb2db7dd5c 100644 (file)
--- 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 0b8e4bb47d25b30b8dc4592073e60fca30a76fb8..a477bea0c2a12d6dd81e356470d467fb77c7ee4e 100644 (file)
--- 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 (file)
index fe18f98..0000000
--- 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 (file)
index d09a1e6..0000000
--- 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