---

yaml --- r: 71044 b: refs/heads/master c: f16ee28 h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · bb98065 · bb98065
1 parent 9677215
commit bb98065
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68fdc55c48fd2e8f4938a1e815216c25baf8a17e
+refs/heads/master: f16ee288545be36cdcc404e9b7c505eb0fe2633c
diff --git a/trunk/include/asm-x86/Kbuild b/trunk/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/trunk/include/asm-x86/siginfo.h b/trunk/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/trunk/include/asm-x86/siginfo_32.h b/trunk/include/asm-x86/siginfo_32.h
diff --git a/trunk/include/asm-x86/siginfo_64.h b/trunk/include/asm-x86/siginfo_64.h