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>
git-mirror · Oct 17, 2007 · f16ee28 · f16ee28
1 parent 68fdc55
commit f16ee28
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git 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
@@ -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
diff --git a/include/asm-x86/siginfo_64.h b/include/asm-x86/siginfo_64.h