From bb98065f3b59a7a362172a7b6de3dd92fcfa3f68 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 23:28:21 +0200
Subject: [PATCH] --- yaml --- r: 71044 b: refs/heads/master c:
 f16ee288545be36cdcc404e9b7c505eb0fe2633c h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-x86/Kbuild       |  2 --
 trunk/include/asm-x86/siginfo.h    | 21 +++++++++------------
 trunk/include/asm-x86/siginfo_32.h |  6 ------
 trunk/include/asm-x86/siginfo_64.h |  8 --------
 5 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 trunk/include/asm-x86/siginfo_32.h
 delete mode 100644 trunk/include/asm-x86/siginfo_64.h

diff --git a/[refs] b/[refs]
index 3eac0bb268b1..c44878303304 100644
--- 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
index 966a1176a7ce..3decf180107d 100644
--- 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
index 0b8e4bb47d25..a477bea0c2a1 100644
--- 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
deleted file mode 100644
index fe18f98fccfa..000000000000
--- a/trunk/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/trunk/include/asm-x86/siginfo_64.h b/trunk/include/asm-x86/siginfo_64.h
deleted file mode 100644
index d09a1e6e7246..000000000000
--- a/trunk/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